diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 21:30:05 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-12 00:52:13 -0700 |
| commit | fd2235e678c58cebd6255b5e658e704ee5138591 (patch) | |
| tree | 6b7a3e2ae3030f4078ac4cbf9b59cd9529055fa2 /engine/overworld/hidden_items.asm | |
| parent | Remove the last address comments (diff) | |
| download | pokeyellow-fd2235e678c58cebd6255b5e658e704ee5138591.tar.gz pokeyellow-fd2235e678c58cebd6255b5e658e704ee5138591.tar.xz pokeyellow-fd2235e678c58cebd6255b5e658e704ee5138591.zip | |
sync engine code with pokeyellow
Diffstat (limited to 'engine/overworld/hidden_items.asm')
| -rwxr-xr-x | engine/overworld/hidden_items.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 11e6ad55..dae85c28 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -27,7 +27,7 @@ FoundHiddenItemText: ld b, a ld c, 1 call GiveItem - jr nc, .BagFull + jr nc, .bagFull ld hl, wObtainedHiddenItemsFlags ld a, [wHiddenItemOrCoinsIndex] ld c, a @@ -37,7 +37,7 @@ FoundHiddenItemText: call PlaySoundWaitForCurrent call WaitForSoundToFinish jp TextScriptEnd -.BagFull +.bagFull call WaitForTextScrollButtonPress ; wait for button press xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -77,24 +77,24 @@ HiddenCoins: cp 20 jr z, .bcd20 cp 40 - jr z, .bcd20 + jr z, .bcd20 ; should be bcd40 jr .bcd100 .bcd10 ld a, $10 ld [hCoins + 1], a - jr .bcddone + jr .bcdDone .bcd20 ld a, $20 ld [hCoins + 1], a - jr .bcddone + jr .bcdDone .bcd40 ; due to a typo, this is never used ld a, $40 ld [hCoins + 1], a - jr .bcddone + jr .bcdDone .bcd100 ld a, $1 ld [hCoins], a -.bcddone +.bcdDone ld de, wPlayerCoins + 1 ld hl, hCoins + 1 ld c, $2 @@ -107,13 +107,13 @@ HiddenCoins: call EnableAutoTextBoxDrawing ld a, [wPlayerCoins] cp $99 - jr nz, .RoomInCoinCase + jr nz, .roomInCoinCase ld a, [wPlayerCoins + 1] cp $99 - jr nz, .RoomInCoinCase + jr nz, .roomInCoinCase tx_pre_id DroppedHiddenCoinsText jr .done -.RoomInCoinCase +.roomInCoinCase tx_pre_id FoundHiddenCoinsText .done jp PrintPredefTextID |