From 0309bc22c5d671d4e99ea9c7806cab69324f7481 Mon Sep 17 00:00:00 2001 From: sporchia Date: Sat, 20 Oct 2018 12:52:24 -0400 Subject: [PATCH] Fix bats in inverted (bats in these rooms will always be LW) Thanks Zarby --- LTTP_RND_GeneralBugfixes.asm | 1 + enemy_adjustments.asm | 30 ++++++++++++++++++++++++++++++ hooks.asm | 8 ++++++++ 3 files changed, 39 insertions(+) create mode 100644 enemy_adjustments.asm diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 830ecf0..b489c08 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -173,6 +173,7 @@ incsrc invertedmaps.asm incsrc newhud.asm incsrc compasses.asm incsrc password.asm +incsrc enemy_adjustments.asm warnpc $A58000 ;org $228000 ; contrib area diff --git a/enemy_adjustments.asm b/enemy_adjustments.asm new file mode 100644 index 0000000..a0206f2 --- /dev/null +++ b/enemy_adjustments.asm @@ -0,0 +1,30 @@ +;-------------------------------------------------------------------------------- +; NewBatInit: +; make sure bats always load LW stats +;-------------------------------------------------------------------------------- +NewBatInit: + ;check if map id == 240 or 241 + LDA $A0 : CMP #$F0 : BNE + ;oldman cave1 + BRA .light_world + + + CMP #$F1 : BNE + ;oldman cave2 + BRA .light_world + + + CMP #$B0 : BNE + ;agahnim statue keese + BRA .light_world + + + CMP #$D0 : BNE + ;agahnim darkmaze + BRA .light_world + + + + CPY #$00 : BEQ .light_world + LDA.b #$85 : STA $0CD2, X + LDA.b #$04 : STA $0E50, X +RTL + + .light_world + LDA.b #$80 : STA $0CD2, X + LDA.b #$01 : STA $0E50, X +RTL +;-------------------------------------------------------------------------------- + diff --git a/hooks.asm b/hooks.asm index 2e5d841..b55b8a8 100755 --- a/hooks.asm +++ b/hooks.asm @@ -220,6 +220,14 @@ org $0CD4E7 ; <- 654E7 - Bank0C.asm : 2282 (STA $700400, X : STA $700F00, X : ST NOP #20 ;-------------------------------------------------------------------------------- +;================================================================================ +; Cross World Damage fixes +;-------------------------------------------------------------------------------- +org $068891 ; Sprite_Prep.asm : 378 //LDA .damage_class, Y : STA $0CD2, X +nop #$08 +JSL.l NewBatInit +;-------------------------------------------------------------------------------- + ;================================================================================ ; Damage table Relocation from WRAM ;--------------------------------------------------------------------------------