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

Cleanup impa npc asm

Browse Source
This commit is contained in:
scawful
2024-12-11 09:08:05 -05:00
parent 6389b7084b
commit 41e3fd67ed
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Sprites/NPCs/impa.asm
View File

@@ -18,36 +18,26 @@ Impa_SetSpawnPointFlag:
pushpc pushpc
; Zelda_AtSanctuary ; Zelda_AtSanctuary
org $05EE46 org $05EE46 : JSL Impa_SetSpawnPointFlag
JSL Impa_SetSpawnPointFlag
; TODO: Figure out what to do with this ; TODO: Figure out what to do with this
org $05EBCF org $05EBCF : LDA $7EF359 : CMP.b #$05
LDA $7EF359 : CMP.b #$05
; Module15_0C ; Module15_0C
; Change overlay that Impa activates after intro ; Change overlay that Impa activates after intro
org $029E2E org $029E2E : LDA.l $7EF2A3 : ORA.b #$20 : STA.l $7EF2A3
#_029E2E: LDA.l $7EF2A3
#_029E32: ORA.b #$20
#_029E34: STA.l $7EF2A3
; Prevent Impa from setting spawn point ; Prevent Impa from setting spawn point
org $05ED43 org $05ED43
Zelda_BecomeFollower: Zelda_BecomeFollower:
STZ.w $02E4 STZ.w $02E4
#_05ED46: LDA.b #$00 LDA.b #$00 : STA.l $7EF3C8
#_05ED48: STA.l $7EF3C8
org $05ED63 : NOP #5
; Prevent Impa from changing the song ; Prevent Impa from changing the song
org $05ED10 org $05ED10
NOP #5 Zelda_ApproachHero:
NOP #5
; LDA.b #$19 ; SONG 19
; STA.w $012C
org $05ED63
NOP #5
; #_05ED63: LDA.b #$10 ; SONG 10
; #_05ED65: STA.w $012C
pullpc pullpc