From 04a6c306dce136873fd33d27aa3d5b90d9eeba5a Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 23 Jul 2015 06:07:12 -0700 Subject: clean up wram aliases --- engine/overworld/hidden_items.asm | 4 ++-- engine/overworld/trainers.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/overworld') diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index fc69afc1..1203dd2a 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -29,7 +29,7 @@ FoundHiddenItemText: ; 7675b (1d:675b) call GiveItem jr nc, .BagFull ld hl, wObtainedHiddenItemsFlags - ld a, [wTrainerScreenX] + ld a, [wHiddenItemOrCoinsIndex] ld c, a ld b, FLAG_SET predef FlagActionPredef @@ -100,7 +100,7 @@ HiddenCoins: ; 76799 (1d:6799) ld c, $2 predef AddBCDPredef ld hl, wObtainedHiddenCoinsFlags - ld a, [wTrainerScreenX] + ld a, [wHiddenItemOrCoinsIndex] ld c, a ld b, FLAG_SET predef FlagActionPredef diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm index 2b08997b..a983881d 100755 --- a/engine/overworld/trainers.asm +++ b/engine/overworld/trainers.asm @@ -256,7 +256,7 @@ ReadTrainerScreenPosition: ; 5698e (15:698e) ; a: distance player to sprite CheckSpriteCanSeePlayer: ; 569af (15:69af) ld b, a - ld a, [wTrainerEngageDistance] ; sprite line of sight (engage distance) + ld a, [wTrainerEngageDistance] ; how far the trainer can see cp b jr nc, .checkIfLinedUp jr .notInLine ; player too far away -- cgit v1.3.1-sl0p