diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-20 17:40:25 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-20 17:40:25 -0500 |
| commit | 13e28b0ece7c7888cba792cc6f7219b384213427 (patch) | |
| tree | 4dcd58e0fe7ac33bf38817f423754dc758cb902f /engine/overworld/hidden_items.asm | |
| parent | Merge branch 'master' of https://github.com/YamaArashi/pokered (diff) | |
| parent | constants for flag actions (diff) | |
| download | pokeyellow-13e28b0ece7c7888cba792cc6f7219b384213427.tar.gz pokeyellow-13e28b0ece7c7888cba792cc6f7219b384213427.tar.xz pokeyellow-13e28b0ece7c7888cba792cc6f7219b384213427.zip | |
Merge pull request #106 from YamaArashi/master
jpab/jpba macros
Diffstat (limited to 'engine/overworld/hidden_items.asm')
| -rwxr-xr-x | engine/overworld/hidden_items.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index fee5b5bc..fc69afc1 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -5,7 +5,7 @@ HiddenItems: ; 76688 (1d:6688) ld hl, wObtainedHiddenItemsFlags ld a, [wHiddenItemOrCoinsIndex] ld c, a - ld b, $2 + ld b, FLAG_TEST predef FlagActionPredef ld a, c and a @@ -31,7 +31,7 @@ FoundHiddenItemText: ; 7675b (1d:675b) ld hl, wObtainedHiddenItemsFlags ld a, [wTrainerScreenX] ld c, a - ld b, $1 + ld b, FLAG_SET predef FlagActionPredef ld a, SFX_GET_ITEM_2 call PlaySoundWaitForCurrent @@ -61,13 +61,13 @@ HiddenCoins: ; 76799 (1d:6799) ld hl, wObtainedHiddenCoinsFlags ld a, [wHiddenItemOrCoinsIndex] ld c, a - ld b, $2 + ld b, FLAG_TEST predef FlagActionPredef ld a, c and a ret nz xor a - ld [hCoins - 1], a + ld [hUnusedCoinsByte], a ld [hCoins], a ld [hCoins + 1], a ld a, [wHiddenObjectFunctionArgument] @@ -102,7 +102,7 @@ HiddenCoins: ; 76799 (1d:6799) ld hl, wObtainedHiddenCoinsFlags ld a, [wTrainerScreenX] ld c, a - ld b, $1 + ld b, FLAG_SET predef FlagActionPredef call EnableAutoTextBoxDrawing ld a, [wPlayerCoins] |