Skip to content

Commit

Permalink
use correct chest reference for popup item coords
Browse files Browse the repository at this point in the history
  • Loading branch information
mracsys committed Sep 21, 2024
1 parent cc20589 commit ece2b93
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ASM/src/chest_game.asm
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ chestgame_delayed_chest_open:
; contents if the tcg_requires_lens setting is enabled
chestgame_force_game_loss_left:
; displaced code
lwc1 $f0, 0x0024($v0)
lwc1 $f2, 0x0028($v0)
lwc1 $f0, 0x0024($v1)
lwc1 $f2, 0x0028($v1)
; check setting
lb $t7, TCG_REQUIRES_LENS
beqz $t7, @@return
Expand Down
3 changes: 2 additions & 1 deletion ASM/src/hacks.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3656,7 +3656,8 @@ DemoEffect_DrawJewel_AfterHook:
; Show a key in the unopened chest regardless of chest
; contents if the tcg_requires_lens setting is enabled.
; Left/right do the same check for the get item ID,
; but use different registers for the actor spawn branch.
; but use different registers for the actor spawn branch
; and chest actor references for coordinates.
.orga 0xE43964
jal chestgame_force_game_loss_left
nop
Expand Down
4 changes: 2 additions & 2 deletions data/generated/rom_patch.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ece2b93

Please sign in to comment.