diff options
Diffstat (limited to 'engine/events/std_scripts.asm')
| -rw-r--r-- | engine/events/std_scripts.asm | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 216ce0058..47090c1c3 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -108,13 +108,13 @@ PokecenterNurseScript: farwritetext NurseTakePokemonText pause 20 - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings spriteface LAST_TALKED, LEFT pause 10 special HealParty playmusic MUSIC_NONE writebyte HEALMACHINE_POKECENTER - special Special_HealMachineAnim + special HealMachineAnim pause 30 special RestartMapMusic spriteface LAST_TALKED, DOWN @@ -122,9 +122,9 @@ PokecenterNurseScript: checkphonecall ; elm already called about pokerus iftrue .no - checkflag ENGINE_POKERUS ; nurse already talked about pokerus + checkflag ENGINE_CAUGHT_POKERUS iftrue .no - special Special_CheckPokerus + special CheckPokerus iftrue .pokerus .no @@ -158,7 +158,7 @@ PokecenterNurseScript: closetext .pokerus_done - setflag ENGINE_POKERUS + setflag ENGINE_CAUGHT_POKERUS specialphonecall SPECIALCALL_POKERUS end @@ -184,7 +184,7 @@ TownMapScript: opentext farwritetext TownMapText waitbutton - special Special_TownMap + special OverworldTownMap closetext end @@ -204,7 +204,7 @@ HomepageScript: Radio1Script: opentext writebyte MAPRADIO_POKEMON_CHANNEL - special Special_MapRadio + special MapRadio closetext end @@ -212,7 +212,7 @@ Radio2Script: ; Lucky Channel opentext writebyte MAPRADIO_LUCKY_CHANNEL - special Special_MapRadio + special MapRadio closetext end @@ -221,7 +221,7 @@ TrashCanScript: ; 0xbc1a5 PCScript: opentext - special Special_PokemonCenterPC + special PokemonCenterPC closetext end @@ -320,7 +320,7 @@ BugContestResultsScript: opentext farwritetext ContestResults_ReadyToJudgeText waitbutton - special Special_BugContestJudging + special BugContestJudging vartomem MEM_BUFFER_0 if_equal 1, BugContestResults_FirstPlace if_equal 2, BugContestResults_SecondPlace @@ -346,9 +346,9 @@ BugContestResults_FinishUp iffalse BugContestResults_DidNotLeaveMons farwritetext ContestResults_ReturnPartyText waitbutton - special Special_ContestReturnMons + special ContestReturnMons BugContestResults_DidNotLeaveMons - special Special_CheckPartyFullAfterContest + special CheckPartyFullAfterContest if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp ; BUGCONTEST_BOXED_MON @@ -384,7 +384,7 @@ BugContestResults_CleanUp ; 0xbc31e BugContestResults_FirstPlace ; 0xbc31e - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 itemtotext SUN_STONE, MEM_BUFFER_1 farwritetext ContestResults_PlayerWonAPrizeText waitbutton @@ -539,10 +539,10 @@ InitializeEventsScript: setevent EVENT_MAHOGANY_MART_OWNERS setevent EVENT_TIN_TOWER_ROOF_HO_OH setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA - setevent EVENT_KRISS_HOUSE_2F_CONSOLE - setevent EVENT_KRISS_HOUSE_2F_DOLL_1 - setevent EVENT_KRISS_HOUSE_2F_DOLL_2 - setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL + setevent EVENT_PLAYERS_HOUSE_2F_CONSOLE + setevent EVENT_PLAYERS_HOUSE_2F_DOLL_1 + setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2 + setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL setevent EVENT_DECO_BED_1 setevent EVENT_DECO_PLANT_4 setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN @@ -576,7 +576,7 @@ InitializeEventsScript: setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS setevent EVENT_DRAGON_SHRINE_CLAIR setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER - setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + setevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR setevent EVENT_AZALEA_TOWN_KURT setevent EVENT_AZALEA_TOWN_KURT setevent EVENT_ILEX_FOREST_KURT @@ -585,7 +585,7 @@ InitializeEventsScript: setevent EVENT_GOLDENROD_SALE_OFF setevent EVENT_ECRUTEAK_CITY_GRAMPS setevent EVENT_EUSINE_IN_BURNED_TOWER - setevent EVENT_KRISS_HOUSE_MOM_2 + setevent EVENT_PLAYERS_HOUSE_MOM_2 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 setevent EVENT_CIANWOOD_CITY_EUSINE setevent EVENT_TIN_TOWER_1F_EUSINE @@ -622,7 +622,7 @@ InitializeEventsScript: return AskNumber1MScript: - special Special_RandomPhoneMon + special RandomPhoneMon checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -707,7 +707,7 @@ AskNumber1MScript: end AskNumber2MScript: - special Special_RandomPhoneMon + special RandomPhoneMon checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -1810,8 +1810,8 @@ CoinVendor_IntroScript: ; 0xbcde0 farwritetext CoinVendor_IntroText .loop ; 0xbcde4 - special Special_DisplayMoneyAndCoinBalance - loadmenudata .MenuDataHeader + special DisplayMoneyAndCoinBalance + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .Buy50 @@ -1869,13 +1869,13 @@ CoinVendor_IntroScript: ; 0xbcde0 ; 0xbce54 -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 4, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db " 50 : ¥1000@" @@ -1887,7 +1887,7 @@ CoinVendor_IntroScript: ; 0xbcde0 HappinessCheckScript: faceplayer opentext - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness if_less_than 50, .Unhappy if_less_than 150, .KindaHappy farwritetext HappinessText3 |