alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix double hook

Browse Source 
Use names instead of addresses for calls.
This commit is contained in:
Kevin Cathcart
2018-04-21 13:00:49 -04:00
parent 6ed672d63d
commit 739df5ca28
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LTTP_RND_GeneralBugfixes.asm
View File

@@ -332,6 +332,9 @@ db GFX_HUD_Main
org $008781 org $008781
UseImplicitRegIndexedLocalJumpTable: UseImplicitRegIndexedLocalJumpTable:
org $00879c
UseImplicitRegIndexedLongJumpTable:
org $008333 org $008333
Vram_EraseTilemaps_triforce: Vram_EraseTilemaps_triforce:

9
hooks.asm
View File

@@ -143,9 +143,6 @@ org $0288D1 ; <- 108D1 - Bank02.asm : 1690 (STZ $0646)
JSL.l IndoorSubtileTransitionCounter JSL.l IndoorSubtileTransitionCounter
NOP #2 NOP #2
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $02895D ; <- 1095D - Bank02.asm : 1812 (JSL Dungeon_LoadRoom)
JSL.l IndoorTileTransitionCounter
;--------------------------------------------------------------------------------
org $07B574 ; <- 3B574 - Bank07.asm : 8519 (LDA.b #$01 : STA $02E9) org $07B574 ; <- 3B574 - Bank07.asm : 8519 (LDA.b #$01 : STA $02E9)
JSL.l IncrementChestCounter JSL.l IncrementChestCounter
NOP NOP
@@ -2089,13 +2086,13 @@ org $02895D ; <- Bank02.asm:1812 (JSL Dungeon_LoadRoom)
JSL LoadRoomHook JSL LoadRoomHook
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $028BE7 ; <- Bank02.asm:2299 (JSL Dungeon_LoadRoom) org $028BE7 ; <- Bank02.asm:2299 (JSL Dungeon_LoadRoom)
JSL LoadRoomHook JSL LoadRoomHook_noStats
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $029309 ; <- Bank02.asm:3533 (JSL Dungeon_LoadRoom) org $029309 ; <- Bank02.asm:3533 (JSL Dungeon_LoadRoom)
JSL LoadRoomHook JSL LoadRoomHook_noStats
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $02C2F3 ; <- Bank02.asm:10391 (JSL Dungeon_LoadRoom) org $02C2F3 ; <- Bank02.asm:10391 (JSL Dungeon_LoadRoom)
JSL LoadRoomHook JSL LoadRoomHook_noStats
;================================================================================ ;================================================================================
;================================================================================ ;================================================================================

7
roomloading.asm
View File

@@ -1,10 +1,13 @@
LoadRoomHook: LoadRoomHook:
JSL $01873A ; Dungeon_LoadRoom (Bank01.asm:726) JSL.l IndoorTileTransitionCounter
.noStats
JSL Dungeon_LoadRoom
REP #$10 ; 16 bit XY REP #$10 ; 16 bit XY
LDX $A0 ; Room ID LDX $A0 ; Room ID
LDA RoomCallbackTable, X LDA RoomCallbackTable, X
SEP #$10 ; 8 bit XY SEP #$10 ; 8 bit XY
JSL $00879c ; UseImplicitRegIndexedLocalJumpTable JSL UseImplicitRegIndexedLongJumpTable
; Callback routines: ; Callback routines:
dl NoCallback ; 00 dl NoCallback ; 00
dl IcePalaceBombosSE ; 01 dl IcePalaceBombosSE ; 01