Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara

2022-02-11 13:36:00 -08:00
parent 8dfdd3ee87 e01e8569d7
commit 7da5e6257a
14 changed files with 928 additions and 1034 deletions
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -362,7 +362,11 @@ endif

 org $328000
 Extra_Text_Table:
-incsrc itemtext.asm
+if !FEATURE_NEW_TEXT
+    incsrc itemtext_lower.asm
+else
+    incsrc itemtext.asm
+endif  
 warnpc $32E000

 org $32DFD0	; PC 0x195FD0
@@ -555,6 +559,9 @@ LoadGearPalettes_variable:
 org $02FEAB
 Filter_Majorly_Whiten_Color:

+org $04E780
+Overworld_MemorizeMap16Change:
+
 org $05A51D
 Sprite_SpawnFallingItem: