diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
| commit | e638cdb74cabff705d4879568e74b8ed43da64e1 (patch) | |
| tree | 02869ee6058c1b7d00d554af86e6eb6b197cd660 /engine/std_scripts.asm | |
| parent | b8da3874bbc06e858b7b2d7a602fe33baa046e93 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
Merge remote-tracking branch 'origin/master' into pngs-kind-of
Conflicts:
INSTALL.md
Diffstat (limited to 'engine/std_scripts.asm')
| -rw-r--r-- | engine/std_scripts.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 95c91b647..5c0df0355 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -159,7 +159,7 @@ PokeCenterNurseScript: .pokerus_done setflag ENGINE_POKERUS - specialphonecall ELMCALL_POKERUS + specialphonecall SPECIALCALL_POKERUS end DifficultBookshelfScript: @@ -297,7 +297,7 @@ RadioTowerRocketsScript: clearevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST - specialphonecall ELMCALL_WEIRDBROADCAST + specialphonecall SPECIALCALL_WEIRDBROADCAST domaptrigger MAHOGANY_TOWN, $1 end @@ -1809,7 +1809,7 @@ CoinVendor_IntroScript: ; 0xbcde0 farwritetext CoinVendor_IntroText CoinVendor_SellCoinsMenuScript: ; 0xbcde4 - special Function24b4e + special Special_DisplayMoneyAndCoinBalance loadmenudata CoinVendor_MenuDataHeader interpretmenu2 writebackup |