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

Fixed pogdor (frogdor at PoD entrance) with Kiki following while exiting at PoD

Browse Source
This commit is contained in:
codemann8
2025-09-21 13:40:51 -05:00
parent c3616f2d65
commit a8b1fc989e
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
follower.asm
View File

@@ -79,6 +79,8 @@ org $9EE495
JSL Kiki_FollowCheck : BRA + : NOP #12 : + JSL Kiki_FollowCheck : BRA + : NOP #12 : +
org $9EE4AF org $9EE4AF
JSL Kiki_BecomeFollower : NOP #2 JSL Kiki_BecomeFollower : NOP #2
org $9EE4F7
JSL Kiki_FixTeleportOnExit
org $89A1B2 org $89A1B2
JSL Kiki_DontScareTheMonke : NOP #3 JSL Kiki_DontScareTheMonke : NOP #3
@@ -834,6 +836,14 @@ Kiki_BecomeFollower:
LDA.b #$0A : STA.l FollowerIndicator LDA.b #$0A : STA.l FollowerIndicator
RTL RTL
Kiki_FixTeleportOnExit:
REP #$30
LDA.b LinkPosX : STA.w LinkPosXCache
LDA.b LinkPosY : STA.w LinkPosYCache
SEP #$30
LDA.b #$19 : LDY.b #$01 ; what we wrote over
RTL
; on return it checks BEQ and if non-zero, kiki get spook ; on return it checks BEQ and if non-zero, kiki get spook
Kiki_DontScareTheMonke: Kiki_DontScareTheMonke:
LDA.b LinkJumping : BEQ .return LDA.b LinkJumping : BEQ .return

3
ram.asm
View File

@@ -441,7 +441,8 @@ SpriteSubPixelZ = $7E0F90 ;
CurrentSpriteSlot = $7E0FA0 ; Holds the current sprite/ancilla's index CurrentSpriteSlot = $7E0FA0 ; Holds the current sprite/ancilla's index
; ;
FreezeSprites = $7E0FC1 ; "Seems to freeze sprites" FreezeSprites = $7E0FC1 ; "Seems to freeze sprites"
; LinkPosXCache = $7E0FC2 ; Cache of Link's coordinates
LinkPosYCache = $7E0FC4 ; - Done at the beginning of Link_Main every frame
GfxChrHalfSlotVerify = $7E0FC6 ; Mirrors $0AAA, set to >= $03 when VRAM has temp graphics loaded GfxChrHalfSlotVerify = $7E0FC6 ; Mirrors $0AAA, set to >= $03 when VRAM has temp graphics loaded
PrizePackIndexes = $7E0FC7 ; $07 bytes. One for each prize pack. PrizePackIndexes = $7E0FC7 ; $07 bytes. One for each prize pack.
; ;