scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move custom_gfx.asm to overworld expanded space

Browse Source
This commit is contained in:
scawful
2024-09-29 16:59:22 -04:00
parent b28e967a18
commit d0fe5ad320
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Oracle_main.asm
View File

@@ -81,10 +81,6 @@ Seashells = $7EF391
Honeycomb = $7EF393 Honeycomb = $7EF393
DekuSticks = $7EF395 DekuSticks = $7EF395
; TODO: Move to Oracle namespace, free up the bank.
incsrc "Overworld/custom_gfx.asm"
print "End of custom_gfx.asm ", pc
; ZSCustomOverworld version ; ZSCustomOverworld version
; Kept in case of serious issues which impedes progress ; Kept in case of serious issues which impedes progress
ZS_CUSTOM_OW_V2 = 1 ZS_CUSTOM_OW_V2 = 1

6
Overworld/ZCustomOverworld2.asm
View File

@@ -1024,7 +1024,7 @@ PreOverworld_LoadProperties_LoadMain:
.no_music_load_needed .no_music_load_needed
; PLACE CUSTOM GFX LOAD HERE! ; PLACE CUSTOM GFX LOAD HERE!
JSL CheckForChangeGraphicsNormalLoadBoat JSL Oracle_CheckForChangeGraphicsNormalLoadBoat
RTS RTS
} }
@@ -2211,7 +2211,7 @@ CheckForChangeGraphicsNormalLoad:
;JSL DecompOwAnimatedTiles ;JSL DecompOwAnimatedTiles
; PLACE CUSTOM GFX LOAD HERE! ; PLACE CUSTOM GFX LOAD HERE!
JSL CheckForChangeGraphicsNormalLoadBoat JSL Oracle_CheckForChangeGraphicsNormalLoadBoat
PLB PLB
@@ -2262,7 +2262,7 @@ Func0AB8F5:
STX.w $012C STX.w $012C
; PLACE CUSTOM GFX LOAD HERE! ; PLACE CUSTOM GFX LOAD HERE!
JSL CheckForChangeGraphicsNormalLoadBoat JSL Oracle_CheckForChangeGraphicsNormalLoadBoat
RTL RTL
} }

5
Overworld/custom_gfx.asm
View File

@@ -1,5 +1,4 @@
org $3F8000
CheckForChangeGraphicsNormalLoadBoat: CheckForChangeGraphicsNormalLoadBoat:
{ {
LDA $8A : CMP.b #$30 : BNE .boat_area LDA $8A : CMP.b #$30 : BNE .boat_area
@@ -12,8 +11,6 @@ CheckForChangeGraphicsNormalLoadBoat:
RTL RTL
} }
; ==============================================================================
ApplyGraphics1: ApplyGraphics1:
{ {
REP #$20 ; A = 16, XY = 8 REP #$20 ; A = 16, XY = 8
@@ -54,8 +51,6 @@ ApplyGraphics2:
incbin gfx/boat2.bin incbin gfx/boat2.bin
} }
; ==============================================================================
ApplyKorokSpriteSheets: ApplyKorokSpriteSheets:
{ {
REP #$20 ; A = 16, XY = 8 REP #$20 ; A = 16, XY = 8

3
Overworld/overworld.asm
View File

@@ -58,6 +58,9 @@ print "End of Overworld/time_system.asm ", pc
incsrc "Overworld/overlays.asm" incsrc "Overworld/overlays.asm"
print "End of Overworld/overlays.asm ", pc print "End of Overworld/overlays.asm ", pc
incsrc "Overworld/custom_gfx.asm"
print "End of Overworld/custom_gfx.asm ", pc
pushpc pushpc
incsrc "Overworld/world_map.asm" incsrc "Overworld/world_map.asm"