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

bank organization n cleanup

Browse Source
This commit is contained in:
scawful
2024-07-09 13:49:28 -04:00
parent 0a5f006031
commit 5c3e66bc7d
5 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/symbols.asm
View File

@@ -597,13 +597,13 @@ FallTimer = $5C
; LinkState_Pits : 0x01 ; LinkState_Pits : 0x01
; LinkState_Recoil : 0x02 ; LinkState_Recoil : 0x02
; LinkState_SpinAttack : 0x03 ; LinkState_SpinAttack : 0x03
; LinkState_Swimming : 0x04 ; LinkState_Swimming : 0x04 (ZoraDive)
; LinkState_OnIce : 0x05 ; LinkState_OnIce : 0x05
; LinkState_Recoil : 0x06 ; LinkState_Recoil : 0x06
; LinkState_Zapped : 0x07 ; LinkState_Zapped : 0x07
; LinkState_UsingEther : 0x08 ; LinkState_UsingEther : 0x08
; LinkState_UsingBombos : 0x09 ; LinkState_UsingBombos : 0x09
; LinkState_UsingQuake : 0x0A ; LinkState_UsingQuake : 0x0A (DekuHover)
; LinkState_HoppingSouthOW : 0x0B ; LinkState_HoppingSouthOW : 0x0B
; LinkState_HoppingHorizontallyOW : 0x0C ; LinkState_HoppingHorizontallyOW : 0x0C
; LinkState_HoppingDiagonallyUpOW : 0x0D ; LinkState_HoppingDiagonallyUpOW : 0x0D

2
Masks/moosh.asm
View File

@@ -28,7 +28,7 @@ Link_HoverIfMooshWantsToDash:
JSL Link_HandleMovingAnimation_FullLongEntry JSL Link_HandleMovingAnimation_FullLongEntry
RTL RTL
} }
print "End of Masks/moosh.asm ", pc print "End of Masks/moosh.asm ", pc
org $079093 org $079093
JSL Link_HoverIfMooshWantsToDash JSL Link_HoverIfMooshWantsToDash

4
Sprites/NPCs/followers.asm
View File

@@ -23,7 +23,6 @@ LoadFollowerGraphics = $00D423
; --------------------------------------------------------- ; ---------------------------------------------------------
print "OldMan_ExpandedPrep ", pc
; Old man sprite wont spawn in his home room ; Old man sprite wont spawn in his home room
; if you have the follower ; if you have the follower
OldMan_ExpandedPrep: OldMan_ExpandedPrep:
@@ -38,6 +37,8 @@ OldMan_ExpandedPrep:
RTL RTL
} }
pushpc
; Old man gives link the "shovel" ; Old man gives link the "shovel"
; Now the goldstar hookshot upgrade ; Now the goldstar hookshot upgrade
org $1EE9FF org $1EE9FF
@@ -160,3 +161,4 @@ Follower_HandleTriggerData:
#_09A596: dw $0000, $000A, $0028, $0032 #_09A596: dw $0000, $000A, $0028, $0032
} }
pullpc

4
Sprites/NPCs/ranch_girl.asm
View File

@@ -2,6 +2,7 @@
; Ranch Girl (Chicken Easter Egg Sprite) ; Ranch Girl (Chicken Easter Egg Sprite)
; Gives Link the Ocarina ; Gives Link the Ocarina
pushpc
org $05FA8E org $05FA8E
Sprite_ShowMessageMinimal: Sprite_ShowMessageMinimal:
@@ -91,4 +92,5 @@ ChickenLady:
#_1AFEFF: RTS #_1AFEFF: RTS
} }
warnpc $01AFEFF warnpc $01AFEFF
pullpc

50
Sprites/all_sprites.asm
View File

@@ -93,6 +93,8 @@ Graphics_Transfer:
RTL RTL
} }
print "End of Sprites Bank 30 ", pc
; UnderworldTransition_ScrollRoom ; UnderworldTransition_ScrollRoom
org $02BE5E org $02BE5E
JSL Graphics_Transfer JSL Graphics_Transfer
@@ -204,25 +206,6 @@ print "End of whirlpool.asm ", pc
incsrc "Sprites/NPCs/ranch_girl.asm" incsrc "Sprites/NPCs/ranch_girl.asm"
print "End of Ranch Girl.asm ", pc print "End of Ranch Girl.asm ", pc
incsrc "Sprites/NPCs/bug_net_kid.asm"
incsrc "Sprites/Bosses/king_dodongo.asm"
incsrc "Sprites/Bosses/arrghus.asm"
print "End of arrghus.asm ", pc
incsrc "Sprites/Bosses/lanmola.asm"
print "End of Lanmola.asm ", pc
incsrc "Sprites/Bosses/lanmola_Expanded.asm"
print "End of Lanmola_Expanded.asm ", pc
incsrc "Sprites/NPCs/followers.asm"
print "End of followers.asm ", pc
incsrc "Sprites/NPCs/fortune_teller.asm"
print "End of fortune_teller.asm ", pc
warnpc $328000 warnpc $328000
; ========================================================= ; =========================================================
@@ -247,6 +230,35 @@ print "End of kydreeok_head.asm ", pc
; ========================================================= ; =========================================================
incsrc "Sprites/NPCs/bug_net_kid.asm"
print "End of bug_net_kid.asm ", pc
incsrc "Sprites/Bosses/king_dodongo.asm"
print "End of king_dodongo.asm ", pc
incsrc "Sprites/Bosses/arrghus.asm"
print "End of arrghus.asm ", pc
; =========================================================
print ""
print "Bank 2C Sprites"
print ""
incsrc "Sprites/Bosses/lanmola.asm"
print "End of Lanmola.asm ", pc
incsrc "Sprites/Bosses/lanmola_Expanded.asm"
print "End of Lanmola_Expanded.asm ", pc
incsrc "Sprites/NPCs/followers.asm"
print "End of followers.asm ", pc
incsrc "Sprites/NPCs/fortune_teller.asm"
print "End of fortune_teller.asm ", pc
; =========================================================
; Sprite Recoil and Death ; Sprite Recoil and Death
; TODO: Sprite_AttemptKillingOfKin ; TODO: Sprite_AttemptKillingOfKin