diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index ec7b620..8f220d7 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -332,6 +332,9 @@ db GFX_HUD_Main org $008781 UseImplicitRegIndexedLocalJumpTable: +org $00879c +UseImplicitRegIndexedLongJumpTable: + org $008333 Vram_EraseTilemaps_triforce: diff --git a/hooks.asm b/hooks.asm index 917b807..5ead58d 100644 --- a/hooks.asm +++ b/hooks.asm @@ -143,9 +143,6 @@ org $0288D1 ; <- 108D1 - Bank02.asm : 1690 (STZ $0646) JSL.l IndoorSubtileTransitionCounter 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) JSL.l IncrementChestCounter NOP @@ -2089,13 +2086,13 @@ org $02895D ; <- Bank02.asm:1812 (JSL Dungeon_LoadRoom) JSL LoadRoomHook ;-------------------------------------------------------------------------------- org $028BE7 ; <- Bank02.asm:2299 (JSL Dungeon_LoadRoom) - JSL LoadRoomHook + JSL LoadRoomHook_noStats ;-------------------------------------------------------------------------------- org $029309 ; <- Bank02.asm:3533 (JSL Dungeon_LoadRoom) - JSL LoadRoomHook + JSL LoadRoomHook_noStats ;-------------------------------------------------------------------------------- org $02C2F3 ; <- Bank02.asm:10391 (JSL Dungeon_LoadRoom) - JSL LoadRoomHook + JSL LoadRoomHook_noStats ;================================================================================ ;================================================================================ diff --git a/roomloading.asm b/roomloading.asm index 063f06f..0bb8b7b 100644 --- a/roomloading.asm +++ b/roomloading.asm @@ -1,10 +1,13 @@ LoadRoomHook: - JSL $01873A ; Dungeon_LoadRoom (Bank01.asm:726) + JSL.l IndoorTileTransitionCounter + + .noStats + JSL Dungeon_LoadRoom REP #$10 ; 16 bit XY LDX $A0 ; Room ID LDA RoomCallbackTable, X SEP #$10 ; 8 bit XY - JSL $00879c ; UseImplicitRegIndexedLocalJumpTable + JSL UseImplicitRegIndexedLongJumpTable ; Callback routines: dl NoCallback ; 00 dl IcePalaceBombosSE ; 01