fix: remove terrorpin ai code
This commit is contained in:
@@ -174,7 +174,6 @@ incsrc msu.asm
|
|||||||
incsrc dungeonmap.asm
|
incsrc dungeonmap.asm
|
||||||
incsrc hextodec.asm
|
incsrc hextodec.asm
|
||||||
incsrc multiworld.asm
|
incsrc multiworld.asm
|
||||||
incsrc terrorpin.asm
|
|
||||||
incsrc textrenderer.asm
|
incsrc textrenderer.asm
|
||||||
warnpc $A58000
|
warnpc $A58000
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,7 @@ db #$00 ;408103 : 200103 ; Randomize Sprites.
|
|||||||
db #$00 ;408104 : 200104 ; make Agahnim balls deflect back
|
db #$00 ;408104 : 200104 ; make Agahnim balls deflect back
|
||||||
.enable_mimic_override
|
.enable_mimic_override
|
||||||
db #$00 ;408105 : 200105 ; toggle mimic code between new and old
|
db #$00 ;408105 : 200105 ; toggle mimic code between new and old
|
||||||
.enable_terrorpin_ai_fix
|
; free byte ;408106 : 200106
|
||||||
db #$00 ;408106 : 200106 ; toggle to turn on terrorpin ai "fix"
|
|
||||||
.center_boss_drops
|
.center_boss_drops
|
||||||
db #$00 ;368107
|
db #$00 ;368107
|
||||||
.killable_theives_id ; must be set to C4 to make thieves killable...
|
.killable_theives_id ; must be set to C4 to make thieves killable...
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ lorom
|
|||||||
!RANDOM_SPRITE_FLAG = "$368103"
|
!RANDOM_SPRITE_FLAG = "$368103"
|
||||||
!AGAHNIM_FUN_BALLS = "$368104"
|
!AGAHNIM_FUN_BALLS = "$368104"
|
||||||
!ENABLE_MIMIC_OVERRIDE = "$368105"
|
!ENABLE_MIMIC_OVERRIDE = "$368105"
|
||||||
;!ENABLE_TERRORPIN_AI_FIX = "$368106" # moved to baserom already
|
; free byte
|
||||||
!CENTER_BOSS_DROP_FLAG = "$368107"
|
!CENTER_BOSS_DROP_FLAG = "$368107"
|
||||||
!KILLABLE_THIEVES_ID = "$368108"
|
!KILLABLE_THIEVES_ID = "$368108"
|
||||||
!ENEMY_FALLING_STAY_ALIVE = "$368109"
|
!ENEMY_FALLING_STAY_ALIVE = "$368109"
|
||||||
|
|||||||
@@ -2552,12 +2552,6 @@ org $828818
|
|||||||
org $82A463
|
org $82A463
|
||||||
JSL OnMenuLoad
|
JSL OnMenuLoad
|
||||||
|
|
||||||
;================================================================================
|
|
||||||
; Terrorpin AI fix
|
|
||||||
;--------------------------------------------------------------------------------
|
|
||||||
org $1EB2B1 ; sprite_terrorpin.asm(57) : AND.b #$03 : STA $0DE0, X ; 5 bytes
|
|
||||||
JSL FixTerrorpin ; 4 bytes
|
|
||||||
NOP ; 1 byte
|
|
||||||
;--------------------------------------------------------------------------------
|
;--------------------------------------------------------------------------------
|
||||||
; Text Renderer
|
; Text Renderer
|
||||||
;--------------------------------------------------------------------------------
|
;--------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -2721,10 +2721,6 @@ org $B0EE30 ; PC 0x18636C
|
|||||||
RemoteItems:
|
RemoteItems:
|
||||||
db #$00 ; $00 = off; $01 = on (default: off)
|
db #$00 ; $00 = off; $01 = on (default: off)
|
||||||
|
|
||||||
org $B0EE31 ; PC 0x18637D
|
|
||||||
Enable_TerrorPin_AI_Fix:
|
|
||||||
db #$00
|
|
||||||
|
|
||||||
;Shop slot count as check
|
;Shop slot count as check
|
||||||
org $B0EE40 ;
|
org $B0EE40 ;
|
||||||
EnableShopItemCount:
|
EnableShopItemCount:
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
;================================================================================
|
|
||||||
; Terrorpin AI Fixes
|
|
||||||
;================================================================================
|
|
||||||
FixTerrorpin:
|
|
||||||
{
|
|
||||||
PHA ;save A so that checking the option doesn't smoke A
|
|
||||||
LDA.b Enable_TerrorPin_AI_Fix : BNE .new ; check if option is on
|
|
||||||
PLA ;restore A
|
|
||||||
; do the old code that smokes A
|
|
||||||
AND.b #$03 : STA $0DE0, X
|
|
||||||
RTL
|
|
||||||
|
|
||||||
.new
|
|
||||||
PLA ; Restore A
|
|
||||||
PHA ; save A so the orignal code doesn't kill it
|
|
||||||
AND.b #$03 : STA $0DE0, X ; restore what we overwrote
|
|
||||||
PLA ; restore A so the AND/BNE in the original code actually does something
|
|
||||||
RTL
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user