Merge remote-tracking branch 'codemann/OWMain' into codemann_OWMain
This commit is contained in:
12
hooks.asm
12
hooks.asm
@@ -120,7 +120,7 @@ JSL AddBonkTremors : NOP #4
|
||||
; Bonk Breakable Walls
|
||||
;--------------------------------------------------------------------------------
|
||||
org $81CF8E ; CF8E <- Bank01.asm : 11641 (LDA $0372 : AND.w #$00FF)
|
||||
JSL BonkBreakableWall : NOP #2
|
||||
JSL ValidDashCheck : NOP #2
|
||||
;--------------------------------------------------------------------------------
|
||||
|
||||
;================================================================================
|
||||
@@ -139,6 +139,11 @@ GravestoneHook_continue:
|
||||
org $87C106
|
||||
moveGravestone:
|
||||
;--------------------------------------------------------------------------------
|
||||
org $899A30
|
||||
JSL ValidDashCheck : NOP #2
|
||||
org $899A3A
|
||||
JSL ValidDashCheck : NOP #2
|
||||
;--------------------------------------------------------------------------------
|
||||
|
||||
;================================================================================
|
||||
; Jump Down Ledge
|
||||
@@ -2102,6 +2107,11 @@ JSL FlipperScrollWarp
|
||||
;--------------------------------------------------------------------------------
|
||||
;org $878F51 ; <- 38F51 - Bank07.asm:2444 (JSR $AE54 ; $3AE54 IN ROM)
|
||||
;JSL OnEnterWater : NOP
|
||||
;--------------------------------------------------------------------------------
|
||||
; Fixes getting bumped while swimming, unable to screen transition
|
||||
org $879632
|
||||
LinkState_Swimming:
|
||||
JSL FixSwimBump
|
||||
;================================================================================
|
||||
; Floodgate Softlock Fix
|
||||
;--------------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user