Merge remote-tracking branch 'codemann/OWMain' into GKNew

This commit is contained in:
2025-12-12 18:16:07 -06:00
37 changed files with 1366 additions and 630 deletions

View File

@@ -182,11 +182,6 @@ incsrc dungeonmap.asm
incsrc hextodec.asm
incsrc multiworld.asm
incsrc textrenderer.asm
incsrc crystalswitchbook.asm
incsrc mimicdash.asm
incsrc gloom.asm
incsrc special_weapons.asm
incsrc variable_ganon_vulnerability.asm
warnpc $A58000
org $A28000
@@ -206,6 +201,14 @@ incsrc inventory.asm
incsrc menu/hudalpha.asm
warnpc $A38000
org $B98000
incsrc crystalswitchbook.asm
incsrc mimicdash.asm
incsrc gloom.asm
incsrc special_weapons.asm
incsrc variable_ganon_vulnerability.asm
warnpc $BA8000
org $A38000
incsrc stats/credits.asm ; Statically mapped
incsrc stats/main.asm
@@ -358,6 +361,7 @@ warnpc $B08000
;$33 Graphics Bank
;$36 reserved for Enemizer
;$37 Room data if needed for DR/Pottery/Enemizer
;$39 GwaaKiwi Code Bank
;$3A reserved for downstream use
;$3B reserved for downstream use
;$3F reserved for internal debugging