diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:49:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:49:03 -0700 |
| commit | db0ac16b6b4f257de338d1aaac561e681ca8723a (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /engine/hidden_object_functions17.asm | |
| parent | More syncing with pokered (diff) | |
| parent | Merge branch 'master' of github.com:pret/pokeyellow (diff) | |
| download | pokeyellow-db0ac16b6b4f257de338d1aaac561e681ca8723a.tar.gz pokeyellow-db0ac16b6b4f257de338d1aaac561e681ca8723a.tar.xz pokeyellow-db0ac16b6b4f257de338d1aaac561e681ca8723a.zip | |
Merge pull request #14 from PikalaxALT/master
Yellow documentation
Diffstat (limited to 'engine/hidden_object_functions17.asm')
| -rwxr-xr-x | engine/hidden_object_functions17.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 78950150..7753cad1 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -11,7 +11,7 @@ OpenRedsPC: ; 5db86 (17:5b86) tx_pre_jump RedBedroomPCText RedBedroomPCText: ; 5db8e (17:5b8e) - db $fc ; FuncTX_ItemStoragePC + TX_PLAYERS_PC Route15GateLeftBinoculars: ; 5db8f (17:5b8f) ld a, [wPlayerFacingDirection] @@ -365,7 +365,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) .openFirstLock ; Next can is trying for the second switch. SetEvent EVENT_1ST_LOCK_OPENED - callab Func_f2d0c + callab Yellow_SampleSecondTrashCan tx_pre_id VermilionGymTrashSuccessText1 jr .done |