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

Reimplemented part of the TF Cutscene for new item code

Browse Source
This commit is contained in:
codemann8
2024-04-26 07:24:54 -05:00
parent ad5eafec61
commit b76d440958
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
multiworld.asm
View File

@@ -240,7 +240,10 @@ Multiworld_MasterSword_GrantToPlayer:
LDA.l PedestalSword_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID LDA.l PedestalSword_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
PLP : PLA PLP : PLA
JSL Link_ReceiveItem ; thing we wrote over CPY.b #$6A : BEQ +
JSL Link_ReceiveItem ; thing we wrote over
RTL
+ JSL ActivateGoal
RTL RTL
} }

10
newitems.asm
View File

@@ -470,7 +470,10 @@ ItemBehavior:
RTS RTS
.triforce .triforce
JSL ActivateGoal LDA.b OverworldIndex : CMP.b #$80 : BNE +
LDA.b LinkPosX+1 : BNE +
JSL ActivateGoal
+
RTS RTS
.goal_item .goal_item
@@ -479,7 +482,10 @@ ItemBehavior:
LDA.l GoalCounter : INC : STA.l GoalCounter LDA.l GoalCounter : INC : STA.l GoalCounter
CMP.w GoalItemRequirement : BCC + CMP.w GoalItemRequirement : BCC +
LDA.l TurnInGoalItems : AND.w #$00FF : BNE + LDA.l TurnInGoalItems : AND.w #$00FF : BNE +
JSL ActivateGoal SEP #$20 ; set 8-bit accumulator
LDA.b OverworldIndex : CMP.b #$80 : BNE +
LDA.b LinkPosX+1 : BNE +
JSL ActivateGoal
+ +
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
RTS RTS