From 3a7f518de4bbced15cbf5bb877a988055de7d063 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 15:40:43 -0500 Subject: wStatusFlags/2 bit constants --- engine/events/std_scripts.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 216ce0058..e4dd586b0 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -122,7 +122,7 @@ 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 iftrue .pokerus @@ -158,7 +158,7 @@ PokecenterNurseScript: closetext .pokerus_done - setflag ENGINE_POKERUS + setflag ENGINE_CAUGHT_POKERUS specialphonecall SPECIALCALL_POKERUS end -- cgit v1.2.3 From 363d8b92421b065eaa61650a06777e9f684cb46f Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 19:10:09 -0500 Subject: =?UTF-8?q?KrissHouse=20=E2=86=92=20PlayersHouse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/events/std_scripts.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index e4dd586b0..eff1ab8f6 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -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 -- cgit v1.2.3 From ead103d2c6d21cd4774e5c32b9c66f9435f7adbb Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 16:08:43 -0500 Subject: =?UTF-8?q?MenuDataHeader=20=E2=86=92=20MenuHeader,=20MenuData2=20?= =?UTF-8?q?=E2=86=92=20MenuData=20(might=20complete=20issue=20#440)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/events/std_scripts.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index eff1ab8f6..42dce7c65 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -1811,7 +1811,7 @@ CoinVendor_IntroScript: ; 0xbcde0 .loop ; 0xbcde4 special Special_DisplayMoneyAndCoinBalance - loadmenudata .MenuDataHeader + 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@" -- cgit v1.2.3 From 505a6595bc32dd687500f2e0561fcf4e9f8fca8c Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 24 Jan 2018 10:46:49 -0500 Subject: EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481) --- engine/events/std_scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 42dce7c65..cd4aa1497 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -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 -- cgit v1.2.3 From 132fe4692581891802c38420bdd4744d58bf78d5 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 24 Jan 2018 11:12:02 -0500 Subject: Rename some routines to avoid conflicts when removing "Special_" prefixes --- engine/events/std_scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index cd4aa1497..7da52fe2f 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -184,7 +184,7 @@ TownMapScript: opentext farwritetext TownMapText waitbutton - special Special_TownMap + special Special_OverworldTownMap closetext end -- cgit v1.2.3 From d719d318e8b2de51e818485423ac878d20dd295a Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 24 Jan 2018 11:17:05 -0500 Subject: Remove Special_ prefix from special routines (close #478) --- engine/events/std_scripts.asm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 7da52fe2f..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 @@ -124,7 +124,7 @@ PokecenterNurseScript: iftrue .no checkflag ENGINE_CAUGHT_POKERUS iftrue .no - special Special_CheckPokerus + special CheckPokerus iftrue .pokerus .no @@ -184,7 +184,7 @@ TownMapScript: opentext farwritetext TownMapText waitbutton - special Special_OverworldTownMap + 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 @@ -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,7 +1810,7 @@ CoinVendor_IntroScript: ; 0xbcde0 farwritetext CoinVendor_IntroText .loop ; 0xbcde4 - special Special_DisplayMoneyAndCoinBalance + special DisplayMoneyAndCoinBalance loadmenuheader .MenuHeader verticalmenu closewindow @@ -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 -- cgit v1.2.3 From a17623d96b25d6733846f5774fd10bb317862b43 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 31 Jan 2018 23:16:51 -0500 Subject: Add scene ID constants (TODO: meaningful names) --- engine/events/std_scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 47090c1c3..642b44fa8 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons waitbutton BugContestResults_CleanUp closetext - setscene 0 + setscene SCENE_ROUTE36NATIONALPARKGATE_0 setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0 setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_2A -- cgit v1.2.3 From fcfe77bc3db73afd2001c21ec9cc1cfb1beca20e Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 1 Feb 2018 12:40:58 -0500 Subject: Meaningful scene constant names (Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event) --- engine/events/std_scripts.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 642b44fa8..f0990cd02 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -298,7 +298,7 @@ RadioTowerRocketsScript: clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST specialphonecall SPECIALCALL_WEIRDBROADCAST - setmapscene MAHOGANY_TOWN, 1 + setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOTHING end BugContestResultsWarpScript: @@ -356,8 +356,8 @@ BugContestResults_DidNotLeaveMons waitbutton BugContestResults_CleanUp closetext - setscene SCENE_ROUTE36NATIONALPARKGATE_0 - setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0 + setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING + setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_3A -- cgit v1.2.3 From b2970e75f4d1a7a2bc7ac58a656ffd350a80cf0a Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 1 Feb 2018 15:06:06 -0500 Subject: SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern) --- engine/events/std_scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index f0990cd02..a79e9e679 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -298,7 +298,7 @@ RadioTowerRocketsScript: clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST specialphonecall SPECIALCALL_WEIRDBROADCAST - setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOTHING + setmapscene MAHOGANY_TOWN, SCENE_FINISHED end BugContestResultsWarpScript: -- cgit v1.2.3 From 68d855c21312f871115984ccc932ce28861cf787 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 2 Feb 2018 21:09:17 -0500 Subject: Script commands don't have underscores --- engine/events/std_scripts.asm | 430 +++++++++++++++++++++--------------------- 1 file changed, 215 insertions(+), 215 deletions(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index a79e9e679..f075aced4 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -245,12 +245,12 @@ MartSignScript DayToTextScript: checkcode VAR_WEEKDAY - if_equal MONDAY, .Monday - if_equal TUESDAY, .Tuesday - if_equal WEDNESDAY, .Wednesday - if_equal THURSDAY, .Thursday - if_equal FRIDAY, .Friday - if_equal SATURDAY, .Saturday + ifequal MONDAY, .Monday + ifequal TUESDAY, .Tuesday + ifequal WEDNESDAY, .Wednesday + ifequal THURSDAY, .Thursday + ifequal FRIDAY, .Friday + ifequal SATURDAY, .Saturday stringtotext .SundayText, MEM_BUFFER_0 end .Monday: @@ -322,9 +322,9 @@ BugContestResultsScript: waitbutton special BugContestJudging vartomem MEM_BUFFER_0 - if_equal 1, BugContestResults_FirstPlace - if_equal 2, BugContestResults_SecondPlace - if_equal 3, BugContestResults_ThirdPlace + ifequal 1, BugContestResults_FirstPlace + ifequal 2, BugContestResults_SecondPlace + ifequal 3, BugContestResults_ThirdPlace farwritetext ContestResults_ConsolationPrizeText buttonsound waitsfx @@ -349,8 +349,8 @@ BugContestResults_FinishUp special ContestReturnMons BugContestResults_DidNotLeaveMons special CheckPartyFullAfterContest - if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp - if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp + ifequal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp + ifequal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp ; BUGCONTEST_BOXED_MON farwritetext ContestResults_PartyFullText waitbutton @@ -624,26 +624,26 @@ InitializeEventsScript: AskNumber1MScript: special RandomPhoneMon checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry + ifequal PHONE_SCHOOLBOY_JACK, .Jack + ifequal PHONE_SAILOR_HUEY, .Huey + ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven + ifequal PHONE_BIRDKEEPER_JOSE, .Jose + ifequal PHONE_YOUNGSTER_JOEY, .Joey + ifequal PHONE_BUG_CATCHER_WADE, .Wade + ifequal PHONE_FISHER_RALPH, .Ralph + ifequal PHONE_HIKER_ANTHONY, .Anthony + ifequal PHONE_CAMPER_TODD, .Todd + ifequal PHONE_JUGGLER_IRWIN, .Irwin + ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie + ifequal PHONE_SCHOOLBOY_ALAN, .Alan + ifequal PHONE_SCHOOLBOY_CHAD, .Chad + ifequal PHONE_POKEFANM_DEREK, .Derek + ifequal PHONE_FISHER_TULLY, .Tully + ifequal PHONE_POKEMANIAC_BRENT, .Brent + ifequal PHONE_BIRDKEEPER_VANCE, .Vance + ifequal PHONE_FISHER_WILTON, .Wilton + ifequal PHONE_BLACKBELT_KENJI, .Kenji + ifequal PHONE_HIKER_PARRY, .Parry .Jack: farwritetext JackAskNumber1Text @@ -709,26 +709,26 @@ AskNumber1MScript: AskNumber2MScript: special RandomPhoneMon checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry + ifequal PHONE_SCHOOLBOY_JACK, .Jack + ifequal PHONE_SAILOR_HUEY, .Huey + ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven + ifequal PHONE_BIRDKEEPER_JOSE, .Jose + ifequal PHONE_YOUNGSTER_JOEY, .Joey + ifequal PHONE_BUG_CATCHER_WADE, .Wade + ifequal PHONE_FISHER_RALPH, .Ralph + ifequal PHONE_HIKER_ANTHONY, .Anthony + ifequal PHONE_CAMPER_TODD, .Todd + ifequal PHONE_JUGGLER_IRWIN, .Irwin + ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie + ifequal PHONE_SCHOOLBOY_ALAN, .Alan + ifequal PHONE_SCHOOLBOY_CHAD, .Chad + ifequal PHONE_POKEFANM_DEREK, .Derek + ifequal PHONE_FISHER_TULLY, .Tully + ifequal PHONE_POKEMANIAC_BRENT, .Brent + ifequal PHONE_BIRDKEEPER_VANCE, .Vance + ifequal PHONE_FISHER_WILTON, .Wilton + ifequal PHONE_BLACKBELT_KENJI, .Kenji + ifequal PHONE_HIKER_PARRY, .Parry .Jack: farwritetext JackAskNumber2Text @@ -800,26 +800,26 @@ RegisteredNumberMScript: NumberAcceptedMScript: checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry + ifequal PHONE_SCHOOLBOY_JACK, .Jack + ifequal PHONE_SAILOR_HUEY, .Huey + ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven + ifequal PHONE_BIRDKEEPER_JOSE, .Jose + ifequal PHONE_YOUNGSTER_JOEY, .Joey + ifequal PHONE_BUG_CATCHER_WADE, .Wade + ifequal PHONE_FISHER_RALPH, .Ralph + ifequal PHONE_HIKER_ANTHONY, .Anthony + ifequal PHONE_CAMPER_TODD, .Todd + ifequal PHONE_JUGGLER_IRWIN, .Irwin + ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie + ifequal PHONE_SCHOOLBOY_ALAN, .Alan + ifequal PHONE_SCHOOLBOY_CHAD, .Chad + ifequal PHONE_POKEFANM_DEREK, .Derek + ifequal PHONE_FISHER_TULLY, .Tully + ifequal PHONE_POKEMANIAC_BRENT, .Brent + ifequal PHONE_BIRDKEEPER_VANCE, .Vance + ifequal PHONE_FISHER_WILTON, .Wilton + ifequal PHONE_BLACKBELT_KENJI, .Kenji + ifequal PHONE_HIKER_PARRY, .Parry .Jack: farwritetext JackNumberAcceptedText @@ -924,26 +924,26 @@ NumberAcceptedMScript: NumberDeclinedMScript: checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry + ifequal PHONE_SCHOOLBOY_JACK, .Jack + ifequal PHONE_SAILOR_HUEY, .Huey + ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven + ifequal PHONE_BIRDKEEPER_JOSE, .Jose + ifequal PHONE_YOUNGSTER_JOEY, .Joey + ifequal PHONE_BUG_CATCHER_WADE, .Wade + ifequal PHONE_FISHER_RALPH, .Ralph + ifequal PHONE_HIKER_ANTHONY, .Anthony + ifequal PHONE_CAMPER_TODD, .Todd + ifequal PHONE_JUGGLER_IRWIN, .Irwin + ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie + ifequal PHONE_SCHOOLBOY_ALAN, .Alan + ifequal PHONE_SCHOOLBOY_CHAD, .Chad + ifequal PHONE_POKEFANM_DEREK, .Derek + ifequal PHONE_FISHER_TULLY, .Tully + ifequal PHONE_POKEMANIAC_BRENT, .Brent + ifequal PHONE_BIRDKEEPER_VANCE, .Vance + ifequal PHONE_FISHER_WILTON, .Wilton + ifequal PHONE_BLACKBELT_KENJI, .Kenji + ifequal PHONE_HIKER_PARRY, .Parry .Jack: farwritetext JackNumberDeclinedText @@ -1048,26 +1048,26 @@ NumberDeclinedMScript: PhoneFullMScript: checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry + ifequal PHONE_SCHOOLBOY_JACK, .Jack + ifequal PHONE_SAILOR_HUEY, .Huey + ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven + ifequal PHONE_BIRDKEEPER_JOSE, .Jose + ifequal PHONE_YOUNGSTER_JOEY, .Joey + ifequal PHONE_BUG_CATCHER_WADE, .Wade + ifequal PHONE_FISHER_RALPH, .Ralph + ifequal PHONE_HIKER_ANTHONY, .Anthony + ifequal PHONE_CAMPER_TODD, .Todd + ifequal PHONE_JUGGLER_IRWIN, .Irwin + ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie + ifequal PHONE_SCHOOLBOY_ALAN, .Alan + ifequal PHONE_SCHOOLBOY_CHAD, .Chad + ifequal PHONE_POKEFANM_DEREK, .Derek + ifequal PHONE_FISHER_TULLY, .Tully + ifequal PHONE_POKEMANIAC_BRENT, .Brent + ifequal PHONE_BIRDKEEPER_VANCE, .Vance + ifequal PHONE_FISHER_WILTON, .Wilton + ifequal PHONE_BLACKBELT_KENJI, .Kenji + ifequal PHONE_HIKER_PARRY, .Parry .Jack: farwritetext JackPhoneFullText @@ -1172,23 +1172,23 @@ PhoneFullMScript: RematchMScript: checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_HIKER_PARRY, .Parry + ifequal PHONE_SCHOOLBOY_JACK, .Jack + ifequal PHONE_SAILOR_HUEY, .Huey + ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven + ifequal PHONE_BIRDKEEPER_JOSE, .Jose + ifequal PHONE_YOUNGSTER_JOEY, .Joey + ifequal PHONE_BUG_CATCHER_WADE, .Wade + ifequal PHONE_FISHER_RALPH, .Ralph + ifequal PHONE_HIKER_ANTHONY, .Anthony + ifequal PHONE_CAMPER_TODD, .Todd + ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie + ifequal PHONE_SCHOOLBOY_ALAN, .Alan + ifequal PHONE_SCHOOLBOY_CHAD, .Chad + ifequal PHONE_FISHER_TULLY, .Tully + ifequal PHONE_POKEMANIAC_BRENT, .Brent + ifequal PHONE_BIRDKEEPER_VANCE, .Vance + ifequal PHONE_FISHER_WILTON, .Wilton + ifequal PHONE_HIKER_PARRY, .Parry .Jack: farwritetext JackRematchText @@ -1278,13 +1278,13 @@ RematchMScript: GiftMScript: checkcode VAR_CALLERID - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji + ifequal PHONE_BIRDKEEPER_JOSE, .Jose + ifequal PHONE_BUG_CATCHER_WADE, .Wade + ifequal PHONE_SCHOOLBOY_ALAN, .Alan + ifequal PHONE_POKEFANM_DEREK, .Derek + ifequal PHONE_FISHER_TULLY, .Tully + ifequal PHONE_FISHER_WILTON, .Wilton + ifequal PHONE_BLACKBELT_KENJI, .Kenji .Jose: farwritetext JoseGiftText @@ -1317,17 +1317,17 @@ GiftMScript: PackFullMScript: checkcode VAR_CALLERID - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry + ifequal PHONE_SAILOR_HUEY, .Huey + ifequal PHONE_BIRDKEEPER_JOSE, .Jose + ifequal PHONE_YOUNGSTER_JOEY, .Joey + ifequal PHONE_BUG_CATCHER_WADE, .Wade + ifequal PHONE_SCHOOLBOY_ALAN, .Alan + ifequal PHONE_POKEFANM_DEREK, .Derek + ifequal PHONE_FISHER_TULLY, .Tully + ifequal PHONE_BIRDKEEPER_VANCE, .Vance + ifequal PHONE_FISHER_WILTON, .Wilton + ifequal PHONE_BLACKBELT_KENJI, .Kenji + ifequal PHONE_HIKER_PARRY, .Parry .Huey: farwritetext HueyPackFullText @@ -1388,10 +1388,10 @@ PackFullMScript: RematchGiftMScript: opentext checkcode VAR_CALLERID - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_HIKER_PARRY, .Parry + ifequal PHONE_SAILOR_HUEY, .Huey + ifequal PHONE_YOUNGSTER_JOEY, .Joey + ifequal PHONE_BIRDKEEPER_VANCE, .Vance + ifequal PHONE_HIKER_PARRY, .Parry .Huey: farwritetext HueyRematchGiftText @@ -1412,14 +1412,14 @@ RematchGiftMScript: AskNumber1FScript: checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin + ifequal PHONE_POKEFAN_BEVERLY, .Beverly + ifequal PHONE_COOLTRAINERF_BETH, .Beth + ifequal PHONE_COOLTRAINERF_REENA, .Reena + ifequal PHONE_PICNICKER_LIZ, .Liz + ifequal PHONE_PICNICKER_GINA, .Gina + ifequal PHONE_LASS_DANA, .Dana + ifequal PHONE_PICNICKER_TIFFANY, .Tiffany + ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: farwritetext BeverlyAskNumber1Text @@ -1448,14 +1448,14 @@ AskNumber1FScript: AskNumber2FScript: checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin + ifequal PHONE_POKEFAN_BEVERLY, .Beverly + ifequal PHONE_COOLTRAINERF_BETH, .Beth + ifequal PHONE_COOLTRAINERF_REENA, .Reena + ifequal PHONE_PICNICKER_LIZ, .Liz + ifequal PHONE_PICNICKER_GINA, .Gina + ifequal PHONE_LASS_DANA, .Dana + ifequal PHONE_PICNICKER_TIFFANY, .Tiffany + ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: farwritetext BeverlyAskNumber2Text @@ -1491,14 +1491,14 @@ RegisteredNumberFScript: NumberAcceptedFScript: ; 0xbcbd3 checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin + ifequal PHONE_POKEFAN_BEVERLY, .Beverly + ifequal PHONE_COOLTRAINERF_BETH, .Beth + ifequal PHONE_COOLTRAINERF_REENA, .Reena + ifequal PHONE_PICNICKER_LIZ, .Liz + ifequal PHONE_PICNICKER_GINA, .Gina + ifequal PHONE_LASS_DANA, .Dana + ifequal PHONE_PICNICKER_TIFFANY, .Tiffany + ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: farwritetext BeverlyNumberAcceptedText @@ -1543,14 +1543,14 @@ NumberAcceptedFScript: ; 0xbcbd3 NumberDeclinedFScript: checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin + ifequal PHONE_POKEFAN_BEVERLY, .Beverly + ifequal PHONE_COOLTRAINERF_BETH, .Beth + ifequal PHONE_COOLTRAINERF_REENA, .Reena + ifequal PHONE_PICNICKER_LIZ, .Liz + ifequal PHONE_PICNICKER_GINA, .Gina + ifequal PHONE_LASS_DANA, .Dana + ifequal PHONE_PICNICKER_TIFFANY, .Tiffany + ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: farwritetext BeverlyNumberDeclinedText @@ -1595,14 +1595,14 @@ NumberDeclinedFScript: PhoneFullFScript: checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin + ifequal PHONE_POKEFAN_BEVERLY, .Beverly + ifequal PHONE_COOLTRAINERF_BETH, .Beth + ifequal PHONE_COOLTRAINERF_REENA, .Reena + ifequal PHONE_PICNICKER_LIZ, .Liz + ifequal PHONE_PICNICKER_GINA, .Gina + ifequal PHONE_LASS_DANA, .Dana + ifequal PHONE_PICNICKER_TIFFANY, .Tiffany + ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: farwritetext BeverlyPhoneFullText @@ -1647,13 +1647,13 @@ PhoneFullFScript: RematchFScript: checkcode VAR_CALLERID - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin + ifequal PHONE_COOLTRAINERF_BETH, .Beth + ifequal PHONE_COOLTRAINERF_REENA, .Reena + ifequal PHONE_PICNICKER_LIZ, .Liz + ifequal PHONE_PICNICKER_GINA, .Gina + ifequal PHONE_LASS_DANA, .Dana + ifequal PHONE_PICNICKER_TIFFANY, .Tiffany + ifequal PHONE_PICNICKER_ERIN, .Erin .Beth: farwritetext BethRematchText @@ -1693,10 +1693,10 @@ RematchFScript: GiftFScript: checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + ifequal PHONE_POKEFAN_BEVERLY, .Beverly + ifequal PHONE_PICNICKER_GINA, .Gina + ifequal PHONE_LASS_DANA, .Dana + ifequal PHONE_PICNICKER_TIFFANY, .Tiffany .Beverly: farwritetext BeverlyGiftText @@ -1717,11 +1717,11 @@ GiftFScript: PackFullFScript: checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin + ifequal PHONE_POKEFAN_BEVERLY, .Beverly + ifequal PHONE_PICNICKER_GINA, .Gina + ifequal PHONE_LASS_DANA, .Dana + ifequal PHONE_PICNICKER_TIFFANY, .Tiffany + ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: farwritetext BeverlyPackFullText @@ -1751,7 +1751,7 @@ PackFullFScript: RematchGiftFScript: checkcode VAR_CALLERID - if_equal PHONE_PICNICKER_ERIN, .Erin + ifequal PHONE_PICNICKER_ERIN, .Erin .Erin: opentext @@ -1814,16 +1814,16 @@ CoinVendor_IntroScript: ; 0xbcde0 loadmenuheader .MenuHeader verticalmenu closewindow - if_equal 1, .Buy50 - if_equal 2, .Buy500 + ifequal 1, .Buy50 + ifequal 2, .Buy500 jump .Cancel ; 0xbcdf7 .Buy50: ; 0xbcdf7 checkcoins MAX_COINS - 50 - if_equal HAVE_MORE, .CoinCaseFull + ifequal HAVE_MORE, .CoinCaseFull checkmoney YOUR_MONEY, 1000 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney givecoins 50 takemoney YOUR_MONEY, 1000 waitsfx @@ -1835,9 +1835,9 @@ CoinVendor_IntroScript: ; 0xbcde0 .Buy500: ; 0xbce1b checkcoins MAX_COINS - 500 - if_equal HAVE_MORE, .CoinCaseFull + ifequal HAVE_MORE, .CoinCaseFull checkmoney YOUR_MONEY, 10000 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney givecoins 500 takemoney YOUR_MONEY, 10000 waitsfx @@ -1888,8 +1888,8 @@ HappinessCheckScript: faceplayer opentext special GetFirstPokemonHappiness - if_less_than 50, .Unhappy - if_less_than 150, .KindaHappy + ifless 50, .Unhappy + ifless 150, .KindaHappy farwritetext HappinessText3 waitbutton closetext -- cgit v1.2.3 From aa8db1632c8826ead8c8d246c8be265839374f7b Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 2 Feb 2018 21:20:13 -0500 Subject: Remove checkmorn/checkday/checknite macros --- engine/events/std_scripts.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index f075aced4..d075b5a6b 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -57,11 +57,11 @@ PokecenterNurseScript: ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set opentext - checkmorn + checktime MORN iftrue .morn - checkday + checktime DAY iftrue .day - checknite + checktime NITE iftrue .nite jump .ok -- cgit v1.2.3 From c834bdadf2f3e38d684f798dfa67d7cd751a6a65 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 2 Feb 2018 21:50:43 -0500 Subject: =?UTF-8?q?spriteface=20=E2=86=92=20objectface,=20consistent=20wit?= =?UTF-8?q?h=20the=20other=20script=20commands?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/events/std_scripts.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index d075b5a6b..e3dbd92df 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -109,7 +109,7 @@ PokecenterNurseScript: farwritetext NurseTakePokemonText pause 20 special StubbedTrainerRankings_Healings - spriteface LAST_TALKED, LEFT + objectface LAST_TALKED, LEFT pause 10 special HealParty playmusic MUSIC_NONE @@ -117,7 +117,7 @@ PokecenterNurseScript: special HealMachineAnim pause 30 special RestartMapMusic - spriteface LAST_TALKED, DOWN + objectface LAST_TALKED, DOWN pause 10 checkphonecall ; elm already called about pokerus @@ -134,9 +134,9 @@ PokecenterNurseScript: .done farwritetext NurseGoodbyeText - spriteface LAST_TALKED, UP + objectface LAST_TALKED, UP pause 10 - spriteface LAST_TALKED, DOWN + objectface LAST_TALKED, DOWN pause 10 waitbutton -- cgit v1.2.3 From f964d04a873769c0aa1d27a7dd032170f55853fd Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 25 Feb 2018 20:05:37 -0500 Subject: * loadmenuheader -> loadmenu (ead103d) * objectface -> turnobject (c834bda) --- engine/events/std_scripts.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/events/std_scripts.asm') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index e3dbd92df..85d6e7dc5 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -109,7 +109,7 @@ PokecenterNurseScript: farwritetext NurseTakePokemonText pause 20 special StubbedTrainerRankings_Healings - objectface LAST_TALKED, LEFT + turnobject LAST_TALKED, LEFT pause 10 special HealParty playmusic MUSIC_NONE @@ -117,7 +117,7 @@ PokecenterNurseScript: special HealMachineAnim pause 30 special RestartMapMusic - objectface LAST_TALKED, DOWN + turnobject LAST_TALKED, DOWN pause 10 checkphonecall ; elm already called about pokerus @@ -134,9 +134,9 @@ PokecenterNurseScript: .done farwritetext NurseGoodbyeText - objectface LAST_TALKED, UP + turnobject LAST_TALKED, UP pause 10 - objectface LAST_TALKED, DOWN + turnobject LAST_TALKED, DOWN pause 10 waitbutton @@ -1811,7 +1811,7 @@ CoinVendor_IntroScript: ; 0xbcde0 .loop ; 0xbcde4 special DisplayMoneyAndCoinBalance - loadmenuheader .MenuHeader + loadmenu .MenuHeader verticalmenu closewindow ifequal 1, .Buy50 -- cgit v1.2.3