diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-17 10:49:54 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-17 10:49:54 -0500 |
| commit | 6e46ec61f9a324116ef016397cdce9e67f75e77f (patch) | |
| tree | 101d51fea00a852808f2a76d9e45a4b3779cab56 /engine/overworld | |
| parent | fb559f1f4e0104bfc59350359a2fb82fbe88ebba (diff) | |
| parent | 6931ce96259d366263c63e704dfaac6f241d8e4a (diff) | |
Merge pull request #103 from YamaArashi/master
Misc changes again
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/hidden_items.asm | 16 | ||||
| -rwxr-xr-x | engine/overworld/npc_movement.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/pokemart.asm | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 868f118f..910fcf04 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -67,9 +67,9 @@ HiddenCoins: ; 76799 (1d:6799) and a ret nz xor a - ld [$ff9f], a - ld [$ffa0], a - ld [$ffa1], a + ld [hCoins - 1], a + ld [hCoins], a + ld [hCoins + 1], a ld a, [wWhichTrade] sub COIN cp 10 @@ -81,22 +81,22 @@ HiddenCoins: ; 76799 (1d:6799) jr .bcd100 .bcd10 ld a, $10 - ld [$ffa1], a + ld [hCoins + 1], a jr .bcddone .bcd20 ld a, $20 - ld [$ffa1], a + ld [hCoins + 1], a jr .bcddone .bcd40 ; due to a typo, this is never used ld a, $40 - ld [$ffa1], a + ld [hCoins + 1], a jr .bcddone .bcd100 ld a, $1 - ld [$ffa0], a + ld [hCoins], a .bcddone ld de, wPlayerCoins + 1 - ld hl, $ffa1 + ld hl, hCoins + 1 ld c, $2 predef AddBCDPredef ld hl, wd6fe diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index aabc2de8..fcef55e0 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -74,7 +74,7 @@ PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c) jr .done ; The player is on the left tile of the northern path out of Pallet Town and ; Prof. Oak is below. -; Prof. Oak is already on the right tile. +; Prof. Oak is already where he needs to be. .playerOnLeftTile ld a, $3 ld [wNPCMovementScriptFunctionNum], a diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index 2caada1d..e6fdfc92 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -206,7 +206,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) jp .loop .isThereEnoughMoney ld de,wPlayerMoney - ld hl,$ff9f ; item price + ld hl,hMoney ld c,3 ; length of money in bytes jp StringCmp .notEnoughMoney |