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

Merge pull request #211 from cassidoxa/prize_ancilla

Browse Source 
Fix dungeon prize ancilla spawn regression
This commit is contained in:
Lexi Rose
2023-12-28 03:36:58 -06:00
committed by GitHub
parent 7116cb6557 7001767c9b
commit 88ef1f385d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dungeondrops.asm
View File

@@ -3,6 +3,9 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
SpawnDungeonPrize: SpawnDungeonPrize:
PHX : PHB PHX : PHB
TAX
LDA.b $06,S : STA.b ScrapBuffer72 ; Store current RoomTag index
TXA
JSL.l AttemptItemSubstitution JSL.l AttemptItemSubstitution
JSL.l ResolveLootIDLong JSL.l ResolveLootIDLong
STA.w ItemReceiptID STA.w ItemReceiptID
@@ -14,6 +17,7 @@ SpawnDungeonPrize:
LDA.w ItemReceiptID LDA.w ItemReceiptID
STA.w AncillaGet,X : STA.w SpriteID,X STA.w AncillaGet,X : STA.w SpriteID,X
JSR.w AddDungeonPrizeAncilla JSR.w AddDungeonPrizeAncilla
LDX.b ScrapBuffer72 : STZ.b RoomTag,X
.failed_spawn .failed_spawn
PLB : PLX PLB : PLX
RTL RTL

2
hooks.asm
View File

@@ -1000,7 +1000,7 @@ org $81C517 : JSL.l CheckDungeonCompletion
org $81C523 : JSL.l CheckDungeonCompletion org $81C523 : JSL.l CheckDungeonCompletion
org $81C710 : JSL.l CheckSpawnPrize org $81C710 : JSL.l CheckSpawnPrize
BCS RoomTag_GetHeartForPrize_spawn_prize : BRA RoomTag_GetHeartForPrize_delete_tag BCS RoomTag_GetHeartForPrize_spawn_prize : BRA RoomTag_GetHeartForPrize_delete_tag
org $81C742 : JSL.l SpawnDungeonPrize org $81C742 : JSL.l SpawnDungeonPrize : PLA : RTS
org $8799EA : JML.l SetItemPose org $8799EA : JML.l SetItemPose
org $88C415 : JSL.l PendantMusicCheck org $88C415 : JSL.l PendantMusicCheck
BCS Ancilla22_ItemReceipt_is_pendant : BRA Ancilla22_ItemReceipt_wait_for_music BCS Ancilla22_ItemReceipt_is_pendant : BRA Ancilla22_ItemReceipt_wait_for_music