Merge branch 'main' into overworld_kara

2022-01-24 14:07:50 -08:00
parent ede8760b5c c515beb853
commit 8dfdd3ee87
14 changed files with 1006 additions and 113 deletions
--- a/flipperkill.asm
+++ b/flipperkill.asm
@@ -151,4 +151,4 @@ FlipperScrollWarp:
 			RTL
 		+ LDA $7EC184
 		STA $20
-RTL
+RTL