From 31d31d326034fde26dedaf2dadb1c608e00fb92f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 18:09:24 -0500 Subject: [PATCH 01/20] Sync compare macros, some event_scripts.s doc, begin map_scripts constants --- asm/field_control_avatar.s | 4 +- asm/macros/event.inc | 16 +- data/event_scripts.s | 1472 ++++++++--------- data/maps/BirthIsland_Exterior/scripts.inc | 10 +- .../CeladonCity_Condominiums_1F/scripts.inc | 2 +- .../CeladonCity_Condominiums_3F/scripts.inc | 4 +- .../scripts.inc | 10 +- .../scripts.inc | 4 +- .../scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 10 +- .../scripts.inc | 30 +- data/maps/CeladonCity_GameCorner/scripts.inc | 26 +- .../scripts.inc | 28 +- data/maps/CeladonCity_Gym/scripts.inc | 2 +- data/maps/CeladonCity_Restaurant/scripts.inc | 2 +- data/maps/CeruleanCave_B1F/scripts.inc | 10 +- data/maps/CeruleanCity/scripts.inc | 34 +- data/maps/CeruleanCity_Gym/scripts.inc | 2 +- data/maps/CeruleanCity_House3/scripts.inc | 6 +- data/maps/CeruleanCity_House4/scripts.inc | 24 +- data/maps/CeruleanCity_House5/scripts.inc | 14 +- data/maps/CeruleanCity_Mart/scripts.inc | 2 +- data/maps/CinnabarIsland/scripts.inc | 12 +- data/maps/CinnabarIsland_Gym/scripts.inc | 50 +- data/maps/CinnabarIsland_Mart/scripts.inc | 2 +- .../scripts.inc | 8 +- .../scripts.inc | 2 +- .../scripts.inc | 56 +- .../scripts.inc | 12 +- .../FiveIsland_LostCave_Room10/scripts.inc | 2 +- .../FiveIsland_MemorialPillar/scripts.inc | 10 +- .../scripts.inc | 18 +- .../FiveIsland_RocketWarehouse/scripts.inc | 22 +- .../FiveIsland_WaterLabyrinth/scripts.inc | 10 +- data/maps/FourIsland/scripts.inc | 16 +- .../FourIsland_IcefallCave_Back/scripts.inc | 2 +- data/maps/FourIsland_Mart/scripts.inc | 2 +- .../FourIsland_PokemonDayCare/scripts.inc | 44 +- data/maps/FuchsiaCity_Building1/scripts.inc | 8 +- data/maps/FuchsiaCity_Gym/scripts.inc | 2 +- data/maps/FuchsiaCity_House2/scripts.inc | 4 +- data/maps/FuchsiaCity_House3/scripts.inc | 12 +- data/maps/FuchsiaCity_Mart/scripts.inc | 2 +- .../scripts.inc | 18 +- data/maps/IndigoPlateau_Exterior/scripts.inc | 2 +- .../scripts.inc | 6 +- data/maps/LavenderTown/scripts.inc | 2 +- data/maps/LavenderTown_House2/scripts.inc | 20 +- data/maps/LavenderTown_Mart/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/MtEmber_Exterior/scripts.inc | 8 +- data/maps/MtEmber_Summit/scripts.inc | 10 +- data/maps/MtMoon_B2F/scripts.inc | 4 +- data/maps/NavelRock_Base/scripts.inc | 10 +- data/maps/NavelRock_Exterior/scripts.inc | 4 +- data/maps/NavelRock_Summit/scripts.inc | 10 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 40 +- data/maps/PalletTown/scripts.inc | 26 +- data/maps/PalletTown_GarysHouse/scripts.inc | 24 +- .../PalletTown_PlayersHouse_1F/scripts.inc | 10 +- .../PalletTown_PlayersHouse_2F/scripts.inc | 4 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 198 +-- data/maps/PewterCity/scripts.inc | 42 +- data/maps/PewterCity_Gym/scripts.inc | 6 +- data/maps/PewterCity_Mart/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/scripts.inc | 22 +- .../PokemonLeague_AgathasRoom/scripts.inc | 2 +- .../maps/PokemonLeague_BrunosRoom/scripts.inc | 18 +- .../PokemonLeague_ChampionsRoom/scripts.inc | 20 +- .../maps/PokemonLeague_LancesRoom/scripts.inc | 2 +- .../PokemonLeague_LoreleisRoom/scripts.inc | 2 +- data/maps/PokemonTower_1F/scripts.inc | 2 +- data/maps/PokemonTower_2F/scripts.inc | 14 +- data/maps/PokemonTower_6F/scripts.inc | 4 +- data/maps/PokemonTower_7F/scripts.inc | 14 +- data/maps/PowerPlant/scripts.inc | 26 +- data/maps/RockTunnel_1F/scripts.inc | 4 +- data/maps/RocketHideout_B4F/scripts.inc | 14 +- data/maps/RocketHideout_Elevator/scripts.inc | 6 +- data/maps/Route1/scripts.inc | 2 +- .../maps/Route10_PokemonCenter_1F/scripts.inc | 6 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 12 +- data/maps/Route12/scripts.inc | 10 +- data/maps/Route12_FishingHouse/scripts.inc | 20 +- .../maps/Route12_NorthEntrance_2F/scripts.inc | 6 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 6 +- data/maps/Route16/scripts.inc | 12 +- data/maps/Route16_House/scripts.inc | 2 +- .../maps/Route16_NorthEntrance_1F/scripts.inc | 8 +- .../maps/Route16_NorthEntrance_2F/scripts.inc | 6 +- data/maps/Route18/scripts.inc | 2 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 8 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 6 +- data/maps/Route20/scripts.inc | 4 +- data/maps/Route22/scripts.inc | 30 +- data/maps/Route24/scripts.inc | 12 +- data/maps/Route25_SeaCottage/scripts.inc | 24 +- data/maps/Route2_EastBuilding/scripts.inc | 6 +- data/maps/Route2_House/scripts.inc | 6 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 18 +- data/maps/Route5_SouthEntrance/scripts.inc | 6 +- data/maps/Route6_NorthEntrance/scripts.inc | 6 +- data/maps/Route7_EastEntrance/scripts.inc | 6 +- data/maps/Route8_WestEntrance/scripts.inc | 6 +- data/maps/SSAnne_1F_Room4/scripts.inc | 2 +- data/maps/SSAnne_1F_Room6/scripts.inc | 4 +- data/maps/SSAnne_2F_Corridor/scripts.inc | 18 +- data/maps/SSAnne_Exterior/scripts.inc | 4 +- data/maps/SSAnne_Kitchen/scripts.inc | 6 +- data/maps/SafariZone_SecretHouse/scripts.inc | 2 +- data/maps/SaffronCity_Dojo/scripts.inc | 14 +- data/maps/SaffronCity_Gym/scripts.inc | 2 +- data/maps/SaffronCity_House1_2F/scripts.inc | 8 +- data/maps/SaffronCity_House3/scripts.inc | 2 +- data/maps/SaffronCity_Mart/scripts.inc | 2 +- .../SaffronCity_PokemonCenter_1F/scripts.inc | 2 +- .../scripts.inc | 76 +- data/maps/SeafoamIslands_1F/scripts.inc | 4 +- data/maps/SeafoamIslands_B3F/scripts.inc | 8 +- data/maps/SeafoamIslands_B4F/scripts.inc | 20 +- data/maps/SevenIsland_House_Room1/scripts.inc | 28 +- data/maps/SevenIsland_House_Room2/scripts.inc | 6 +- data/maps/SevenIsland_Mart/scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 28 +- .../maps/SevenIsland_TrainerTower/scripts.inc | 4 +- .../SevenIsland_TrainerTower_1F/scripts.inc | 6 +- .../SevenIsland_TrainerTower_2F/scripts.inc | 6 +- .../SevenIsland_TrainerTower_3F/scripts.inc | 6 +- .../SevenIsland_TrainerTower_4F/scripts.inc | 6 +- .../SevenIsland_TrainerTower_5F/scripts.inc | 6 +- .../SevenIsland_TrainerTower_6F/scripts.inc | 6 +- .../SevenIsland_TrainerTower_7F/scripts.inc | 6 +- .../SevenIsland_TrainerTower_8F/scripts.inc | 6 +- .../scripts.inc | 6 +- .../scripts.inc | 30 +- data/maps/SilphCo_10F/map.json | 8 +- data/maps/SilphCo_10F/scripts.inc | 4 +- data/maps/SilphCo_11F/map.json | 8 +- data/maps/SilphCo_11F/scripts.inc | 12 +- data/maps/SilphCo_2F/map.json | 16 +- data/maps/SilphCo_2F/scripts.inc | 4 +- data/maps/SilphCo_3F/map.json | 16 +- data/maps/SilphCo_3F/scripts.inc | 6 +- data/maps/SilphCo_4F/map.json | 16 +- data/maps/SilphCo_4F/scripts.inc | 6 +- data/maps/SilphCo_5F/map.json | 24 +- data/maps/SilphCo_5F/scripts.inc | 8 +- data/maps/SilphCo_6F/map.json | 8 +- data/maps/SilphCo_6F/scripts.inc | 12 +- data/maps/SilphCo_7F/map.json | 24 +- data/maps/SilphCo_7F/scripts.inc | 38 +- data/maps/SilphCo_8F/map.json | 8 +- data/maps/SilphCo_8F/scripts.inc | 4 +- data/maps/SilphCo_9F/map.json | 32 +- data/maps/SilphCo_9F/scripts.inc | 10 +- data/maps/SilphCo_Elevator/scripts.inc | 22 +- .../scripts.inc | 40 +- data/maps/SixIsland_Mart/scripts.inc | 2 +- data/maps/SixIsland_PatternBush/scripts.inc | 4 +- .../SixIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SixIsland_RuinValley/scripts.inc | 2 +- .../SixIsland_WaterPath_House1/scripts.inc | 16 +- data/maps/ThreeIsland/scripts.inc | 46 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 4 +- .../ThreeIsland_DunsparceTunnel/scripts.inc | 8 +- data/maps/ThreeIsland_Mart/scripts.inc | 2 +- data/maps/ThreeIsland_Port/scripts.inc | 4 +- data/maps/TwoIsland/scripts.inc | 14 +- data/maps/TwoIsland_House/scripts.inc | 16 +- .../TwoIsland_JoyfulGameCorner/scripts.inc | 8 +- .../UndergroundPath_NorthEntrance/scripts.inc | 6 +- data/maps/VermilionCity/scripts.inc | 26 +- data/maps/VermilionCity_Gym/scripts.inc | 8 +- data/maps/VermilionCity_House1/scripts.inc | 4 +- data/maps/VermilionCity_House2/scripts.inc | 6 +- data/maps/VermilionCity_Mart/scripts.inc | 2 +- .../VermilionCity_PokemonFanClub/scripts.inc | 4 +- data/maps/VictoryRoad_1F/scripts.inc | 4 +- data/maps/VictoryRoad_2F/scripts.inc | 8 +- data/maps/VictoryRoad_3F/scripts.inc | 4 +- data/maps/ViridianCity/scripts.inc | 28 +- data/maps/ViridianCity_Gym/scripts.inc | 2 +- data/maps/ViridianCity_House2/scripts.inc | 6 +- data/maps/ViridianCity_Mart/scripts.inc | 4 +- data/mystery_event_msg.s | 26 +- data/strings.s | 2 +- include/constants/global.h | 80 +- include/constants/map_scripts.h | 12 + include/constants/vars.h | 7 +- include/global.h | 4 +- include/strings.h | 2 +- src/script_menu.c | 2 +- 194 files changed, 1933 insertions(+), 1942 deletions(-) create mode 100644 include/constants/map_scripts.h diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 85799d9da..3e76d76e2 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1641,11 +1641,11 @@ _0806D570: lsrs r0, 24 cmp r0, 0x1 bne _0806D5A4 - ldr r0, _0806D5A0 @ =EventScript_1A6AC8 + ldr r0, _0806D5A0 @ =EventScript_UseSurf b _0806D5E2 .align 2, 0 _0806D59C: .4byte 0x00000824 -_0806D5A0: .4byte EventScript_1A6AC8 +_0806D5A0: .4byte EventScript_UseSurf _0806D5A4: adds r0, r4, 0 bl MetatileBehavior_IsWaterfall diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 19293e527..b6526f96f 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -234,14 +234,12 @@ .endm @ Generic compare macro which attempts to deduce argument types based on their values - @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers - .macro compare arg1, arg2 - .if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8) - compare_var_to_var \arg1, \arg2 - .elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF) - compare_var_to_value \arg1, \arg2 + @ Any values between 0x4000 to 0x40FF and 0x8000 to 0x8014 are considered event variable identifiers + .macro compare var:req, arg:req + .if ((\arg >= VARS_START && \arg <= VARS_END) || (\arg >= SPECIAL_VARS_START && \arg <= SPECIAL_VARS_END)) + compare_var_to_var \var, \arg .else - .error "Invalid arguments for 'compare'" + compare_var_to_value \var, \arg .endif .endm @@ -1424,7 +1422,7 @@ .endm .macro case condition, dest - compare_var_to_value 0x8000, \condition + compare_var_to_value VAR_0x8000, \condition goto_if_eq \dest .endm @@ -1461,5 +1459,5 @@ .macro set_gym_trainers gym:req setvar VAR_0x8008, \gym - call EventScript_1A6B18 + call EventScript_SetGymTrainers .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index 21fdffe43..523d08e27 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,3 +1,4 @@ +#include "constants/global.h" #include "constants/flags.h" #include "constants/decorations.h" #include "constants/items.h" @@ -18,6 +19,7 @@ #include "constants/game_stat.h" #include "constants/menu.h" #include "constants/battle_setup.h" +#include "constants/map_scripts.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -57,12 +59,12 @@ gSpecialVars:: @ 815FD0C gStdScripts:: @ 8160450 .4byte gStdScript_0 .4byte gStdScript_1 - .4byte gStdScript_2 - .4byte gStdScript_3 - .4byte gStdScript_4 - .4byte gStdScript_5 + .4byte Std_MsgboxNPC + .4byte Std_MsgboxSign + .4byte Std_MsgboxDefault + .4byte Std_MsgboxYesNo .4byte gStdScript_Message_WaitButton_AndRelease - .4byte gStdScript_7 + .4byte Std_ObtainDecoration .4byte gStdScript_8 .4byte gStdScript_ItemMessageAndFanfare gStdScriptsEnd:: @@ -778,7 +780,7 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_WaterPath_House2/text.inc" .include "data/maps/SevenIsland_SevaultCanyon_House/text.inc" -gStdScript_2:: @ 81A4E3F +Std_MsgboxNPC:: @ 81A4E3F lock faceplayer message 0x0 @@ -787,7 +789,7 @@ gStdScript_2:: @ 81A4E3F release return -gStdScript_3:: @ 81A4E4A +Std_MsgboxSign:: @ 81A4E4A lockall message 0x0 waitmessage @@ -795,13 +797,13 @@ gStdScript_3:: @ 81A4E4A releaseall return -gStdScript_4:: @ 81A4E54 +Std_MsgboxDefault:: @ 81A4E54 message 0x0 waitmessage waitbuttonpress return -gStdScript_5:: @ 81A4E5C +Std_MsgboxYesNo:: @ 81A4E5C message 0x0 waitmessage yesnobox 20, 8 @@ -809,14 +811,14 @@ gStdScript_5:: @ 81A4E5C gStdScript_ItemMessageAndFanfare:: @ 81A4E66 textcolor 3 - compare_var_to_value VAR_0x8002, MUS_FANFA1 + compare VAR_0x8002, MUS_FANFA1 call_if eq, EventScript_1A4EA2 - compare_var_to_value VAR_0x8002, MUS_FAN5 + compare VAR_0x8002, MUS_FAN5 call_if eq, EventScript_1A4EA6 message 0x0 waitmessage waitfanfare - compare_var_to_value VAR_0x8002, MUS_FANFA1 + compare VAR_0x8002, MUS_FANFA1 call_if eq, EventScript_1A4EAA giveitem VAR_0x8000, VAR_0x8001, 8 call EventScript_1A6675 @@ -855,7 +857,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1A4EE8 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -869,10 +871,10 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 faceplayer call EventScript_1A4FBA specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1A4F20 special CheckForAlivePartyMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1A4F19 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -893,7 +895,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21 waitmovement 0 special PlayTrainerEncounterMusic special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A501A battlebegin ontrainerbattleend @@ -901,7 +903,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21 EventScript_TryDoRematchBattle:: @ 81A4F3E call EventScript_1A4FBA specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A4F72 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -909,7 +911,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E waitmessage waitbuttonpress special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A4FB8 special ScrSpecial_StartTrainerEyeRematch waitstate @@ -921,10 +923,10 @@ EventScript_1A4F72:: @ 81A4F72 EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A4FB0 special CheckForAlivePartyMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1A4FB1 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -932,7 +934,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 waitmessage waitbuttonpress special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A4FB8 special ScrSpecial_StartTrainerEyeRematch waitstate @@ -967,19 +969,19 @@ EventScript_1A4FC7:: @ 81A4FC7 waitmessage waitbuttonpress special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A501A battlebegin specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A5017 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A5019 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A5019 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1A5019 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1A5019 EventScript_1A5017:: @ 81A5017 @@ -1001,14 +1003,16 @@ gStdScript_Message_WaitButton_AndRelease:: @ 81A501F release return -gUnknown_81A5028:: @ 81A5028 +@ Unused +Text_WouldYouLikeToMixRecords:: @ 81A5028 .string "Would you like to mix records with\n" .string "other TRAINERS?$" -Text_1A505B:: @ 81A505B +@ Unused +Text_WeHopeToSeeYouAgain:: @ 81A505B .string "We hope to see you again!$" -Text_1A5075:: @ 81A5075 +Text_BootedUpPC:: @ 81A5075 .string "{PLAYER} booted up the PC.$" gUnknown_81A508A:: @ 81A508A @@ -1155,7 +1159,7 @@ Text_1A556E:: @ 81A556E Text_1A55A5:: @ 81A55A5 .string "{STR_VAR_1} used SURF!$" -Text_1A55B3:: @ 81A55B3 +Text_CurrentTooFast:: @ 81A55B3 .string "The current is much too fast!\n" .string "SURF can't be used here…$" @@ -1300,11 +1304,11 @@ gUnknown_81A5B60:: @ 81A5B60 .string "How is my old {STR_VAR_2}?\n" .string "My {STR_VAR_1} is doing great!$" -Text_1A5B88:: @ 81A5B88 +Text_CardKeyOpenedDoor:: @ 81A5B88 .string "Bingo!\n" .string "The CARD KEY opened the door!$" -Text_1A5BAD:: @ 81A5BAD +Text_ItNeedsCardKey:: @ 81A5BAD .string "No!\n" .string "It needs a CARD KEY!$" @@ -1345,7 +1349,7 @@ Text_1A5CCE:: @ 81A5CCE Text_1A5CD3:: @ 81A5CD3 .string "ドアは　しまっている‥$" -Text_1A5CDF:: @ 81A5CDF +Text_TheDoorIsOpen:: @ 81A5CDF .string "The door is open…$" Text_1A5CF1:: @ 81A5CF1 @@ -1554,7 +1558,7 @@ EventScript_1A651A:: @ 81A651A call EventScript_1A6551 special sub_81130A8 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1A653B call EventScript_1A6541 return @@ -1590,7 +1594,7 @@ EventScript_1A6551:: @ 81A6551 EventScript_1A6578:: @ 81A6578 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 message Text_1A5483 waitmessage @@ -1622,13 +1626,13 @@ EventScript_1A65CE:: @ 81A65CE EventScript_1A65EC:: @ 81A65EC specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A661D specialvar VAR_RESULT, sp182_move_string copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_if eq, EventScript_1A661D - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 goto_if eq, EventScript_1A6636 end @@ -1682,53 +1686,48 @@ EventScript_1A6697:: @ 81A6697 bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 call EventScript_1A66BC - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6749 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 call_if eq, EventScript_1A675E return EventScript_1A66BC:: @ 81A66BC switch VAR_RESULT - compare_var_to_value VAR_0x8000, 1 - goto_if eq, EventScript_1A66F9 - compare_var_to_value VAR_0x8000, 2 - goto_if eq, EventScript_1A6709 - compare_var_to_value VAR_0x8000, 3 - goto_if eq, EventScript_1A6719 - compare_var_to_value VAR_0x8000, 4 - goto_if eq, EventScript_1A6729 - compare_var_to_value VAR_0x8000, 5 - goto_if eq, EventScript_1A6739 + case POCKET_ITEMS, EventScript_1A66F9 + case POCKET_KEY_ITEMS, EventScript_1A6709 + case POCKET_POKE_BALLS, EventScript_1A6719 + case POCKET_TM_CASE, EventScript_1A6729 + case POCKET_BERRY_POUCH, EventScript_1A6739 end EventScript_1A66F9:: @ 81A66F9 getstdstring 2, 24 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6764 return EventScript_1A6709:: @ 81A6709 getstdstring 2, 25 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6764 return EventScript_1A6719:: @ 81A6719 getstdstring 2, 26 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6764 return EventScript_1A6729:: @ 81A6729 getstdstring 2, 27 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6768 return EventScript_1A6739:: @ 81A6739 getstdstring 2, 28 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6764 return @@ -1752,7 +1751,7 @@ EventScript_1A6768:: @ 81A6768 playfanfare MUS_FANFA1 return -gStdScript_7:: @ 81A676C +Std_ObtainDecoration:: @ 81A676C adddecor VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT call EventScript_1A677A @@ -1760,9 +1759,9 @@ gStdScript_7:: @ 81A676C EventScript_1A677A:: @ 81A677A getdecorname 1, VAR_0x8000 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6795 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 call_if eq, EventScript_1A67AD return @@ -1790,9 +1789,9 @@ gStdScript_1:: @ 81A67B3 getitemname 1, VAR_0x8000 checkitemtype VAR_0x8000 call EventScript_1A66BC - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A67EE - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 call_if eq, EventScript_1A682D release return @@ -1802,9 +1801,9 @@ EventScript_1A67EE:: @ 81A67EE additem VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_1A6821 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_1A6827 waitfanfare waitmessage @@ -1829,12 +1828,12 @@ EventScript_PickUpHiddenItem:: @ 81A6843 lockall textcolor 3 waitse - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 goto_if eq, EventScript_PickUpHiddenCoins call EventScript_GiveItem - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 goto_if eq, EventScript_ItemInPocketMessage - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_BagIsFullMessage end @@ -1847,9 +1846,9 @@ EventScript_GiveItem:: return EventScript_ItemInPocketMessage:: - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 call_if eq, EventScript_FoundSingleItemMessage - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 call_if ne, EventScript_FoundMultipleItemsMessage waitfanfare waitmessage @@ -1884,7 +1883,7 @@ EventScript_PickUpHiddenCoins:: goto_if FALSE, EventScript_HiddenCoinsButNoCoinCase checkcoins VAR_RESULT specialvar VAR_RESULT, Special_CheckAddCoins - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_HiddenCoinsButTheCoinCaseIsFull givecoins VAR_0x8006 getstdstring 1, 0x17 @@ -1917,7 +1916,7 @@ EventScript_HiddenCoinsButNoCoinCase:: gUnknown_81A6955:: @ 81A6955 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_SYS_PC_STORAGE_DISABLED @@ -1927,7 +1926,7 @@ gUnknown_81A6955:: @ 81A6955 setvar VAR_0x8004, 0 special Special_AnimatePcTurnOn playse SE_PC_ON - msgbox Text_1A5075 + msgbox Text_BootedUpPC goto EventScript_1A6998 end @@ -2011,7 +2010,7 @@ EventScript_1A6A7A:: @ 81A6A7A playse SE_PC_LOGIN msgbox Text_1A5BC6 msgbox Text_1A5C03, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6AB2 setflag FLAG_OAKS_RATING_IS_VIA_PC call EventScript_1A73E0 @@ -2030,60 +2029,60 @@ EventScript_1A6AC0:: @ 81A6AC0 fadescreen 0 return -EventScript_1A6AC8:: @ 81A6AC8 +EventScript_UseSurf:: @ 81A6AC8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A6AC8_End + compare VAR_RESULT, 2 + goto_if eq, EventScript_UseSurfEnd checkpartymove MOVE_SURF - compare_var_to_value VAR_RESULT, 6 - goto_if eq, EventScript_1A6AC8_End + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_UseSurfEnd getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT lockall msgbox Text_1A556E, 5 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A6AC8_Release + compare VAR_RESULT, 0 + goto_if eq, EventScript_UseSurfRelease msgbox Text_1A55A5 dofieldeffect FLDEFF_USE_SURF -EventScript_1A6AC8_Release:@ 81A6B0B +EventScript_UseSurfRelease:@ 81A6B0B releaseall -EventScript_1A6AC8_End: @ 81A6B0C +EventScript_UseSurfEnd: @ 81A6B0C end gUnknown_81A6B0D:: @ 81A6B0D lockall - msgbox Text_1A55B3 + msgbox Text_CurrentTooFast releaseall end -EventScript_1A6B18:: @ 81A6B18 +EventScript_SetGymTrainers:: @ 81A6B18 switch VAR_0x8008 - case 1, EventScript_1A6B76 - case 2, EventScript_1A6B7A - case 3, EventScript_1A6B81 - case 4, EventScript_1A6B8B - case 5, EventScript_1A6BA1 - case 6, EventScript_1A6BB4 - case 7, EventScript_1A6BCA - case 8, EventScript_1A6BE0 + case 1, EventScript_SetPewterGymTrainers + case 2, EventScript_SetCeruleanGymTrainers + case 3, EventScript_SetVermilionGymTrainers + case 4, EventScript_SetCeladonGymTrainers + case 5, EventScript_SetFuchsiaGymTrainers + case 6, EventScript_SetSaffronGymTrainers + case 7, EventScript_SetCinnabarGymTrainers + case 8, EventScript_SetViridianGymTrainers end -EventScript_1A6B76:: @ 81A6B76 +EventScript_SetPewterGymTrainers:: @ 81A6B76 settrainerflag TRAINER_CAMPER_LIAM return -EventScript_1A6B7A:: @ 81A6B7A +EventScript_SetCeruleanGymTrainers:: @ 81A6B7A settrainerflag TRAINER_PICNICKER_DIANA settrainerflag TRAINER_SWIMMER_MALE_LUIS return -EventScript_1A6B81:: @ 81A6B81 +EventScript_SetVermilionGymTrainers:: @ 81A6B81 settrainerflag TRAINER_SAILOR_DWAYNE settrainerflag TRAINER_ENGINEER_BAILY settrainerflag TRAINER_GENTLEMAN_TUCKER return -EventScript_1A6B8B:: @ 81A6B8B +EventScript_SetCeladonGymTrainers:: @ 81A6B8B settrainerflag TRAINER_LASS_KAY settrainerflag TRAINER_LASS_LISA settrainerflag TRAINER_PICNICKER_TINA @@ -2093,7 +2092,7 @@ EventScript_1A6B8B:: @ 81A6B8B settrainerflag TRAINER_COOLTRAINER_MARY return -EventScript_1A6BA1:: @ 81A6BA1 +EventScript_SetFuchsiaGymTrainers:: @ 81A6BA1 settrainerflag TRAINER_TAMER_PHIL settrainerflag TRAINER_TAMER_EDGAR settrainerflag TRAINER_JUGGLER_KIRK @@ -2102,7 +2101,7 @@ EventScript_1A6BA1:: @ 81A6BA1 settrainerflag TRAINER_JUGGLER_NATE return -EventScript_1A6BB4:: @ 81A6BB4 +EventScript_SetSaffronGymTrainers:: @ 81A6BB4 settrainerflag TRAINER_PSYCHIC_JOHAN settrainerflag TRAINER_PSYCHIC_TYRON settrainerflag TRAINER_PSYCHIC_CAMERON @@ -2112,7 +2111,7 @@ EventScript_1A6BB4:: @ 81A6BB4 settrainerflag TRAINER_CHANNELER_TASHA return -EventScript_1A6BCA:: @ 81A6BCA +EventScript_SetCinnabarGymTrainers:: @ 81A6BCA settrainerflag TRAINER_SUPER_NERD_ERIK settrainerflag TRAINER_SUPER_NERD_AVERY settrainerflag TRAINER_SUPER_NERD_DEREK @@ -2122,7 +2121,7 @@ EventScript_1A6BCA:: @ 81A6BCA settrainerflag TRAINER_BURGLAR_DUSTY return -EventScript_1A6BE0:: @ 81A6BE0 +EventScript_SetViridianGymTrainers:: @ 81A6BE0 settrainerflag TRAINER_TAMER_JASON settrainerflag TRAINER_TAMER_COLE settrainerflag TRAINER_BLACK_BELT_ATSUSHI @@ -2169,7 +2168,7 @@ gUnknown_81A6C32:: @ 81A6C32 lockall msgbox Text_1C0DF1 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 fadescreen 1 special Special_TownMap @@ -2188,6 +2187,7 @@ Text_1A6CA3:: @ 81A6CA3 .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.\p" .string "{SIZE}ÁPROF. OAK's rating:$" + gUnknown_81A6D17:: @ 81A6D17 .string "You still have lots to do.\p" .string "Go into every patch of grass you\n" @@ -2302,7 +2302,7 @@ Text_1A72F2:: @ 81A72F2 EventScript_1A737B:: @ 81A737B special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 checkflag FLAG_OAK_SAW_DEX_COMPLETION @@ -2324,9 +2324,9 @@ EventScript_1A73B6:: @ 81A73B6 copyvar VAR_0x8004, VAR_0x8009 special Special_GetProfOaksRatingMessage waitmessage - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1A73D8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1A73DC waitfanfare waitbuttonpress @@ -2355,7 +2355,7 @@ EventScript_1A73E0:: @ 81A73E0 checkflag FLAG_OAKS_RATING_IS_VIA_PC call_if FALSE, EventScript_1A746D call EventScript_1A73B6 - compare_var_to_value VAR_0x800A, 0 + compare VAR_0x800A, 0 goto_if eq, EventScript_1A748F setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_GetPokedexCount @@ -2365,9 +2365,9 @@ EventScript_1A73E0:: @ 81A73E0 getnumberstring 1, VAR_0x8009 msgbox Text_1A71AA specialvar VAR_RESULT, HasAllMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7470 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A747E end @@ -2701,7 +2701,7 @@ gUnknown_81A7702:: @ 81A7702 lockall textcolor 3 msgbox Text_1A622C, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A778A setvar VAR_0x8004, 14 call EventScript_1A6AC0 @@ -2709,11 +2709,11 @@ gUnknown_81A7702:: @ 81A7702 faceplayer specialvar VAR_0x8008, Special_GetMartClerkObjectId textcolor 0 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_if eq, EventScript_1A774D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A778A - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A778C end @@ -2808,7 +2808,7 @@ EventScript_1A77F9:: @ 81A77F9 end EventScript_1A7803:: @ 81A7803 - compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 goto_if ge, EventScript_1A77EC switch VAR_0x4001 case 1, EventScript_1A78D5 @@ -2822,7 +2822,7 @@ EventScript_1A7803:: @ 81A7803 end EventScript_1A786C:: @ 81A786C - compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 goto_if ge, EventScript_1A77F9 switch VAR_0x4001 case 1, EventScript_1A78D5 @@ -3036,7 +3036,7 @@ EventScript_1A7AE0:: @ 81A7AE0 EventScript_1A7AE2:: @ 81A7AE2 msgbox Text_177460, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7B70 msgbox Text_17747B checkflag FLAG_POKEMON_MANSION_SWITCH_STATE @@ -3260,17 +3260,17 @@ EventScript_1A80FE:: @ 81A80FE releaseall end -EventScript_1A8135:: @ 81A8135 - msgbox Text_1A5BAD +EventScript_NeedCardKey:: @ 81A8135 + msgbox Text_ItNeedsCardKey releaseall end -EventScript_1A813F:: @ 81A813F - msgbox Text_1A5CDF +EventScript_DoorUnlocked:: @ 81A813F + msgbox Text_TheDoorIsOpen releaseall end -EventScript_1A8149:: @ 81A8149 +EventScript_Close2FDoor1:: @ 81A8149 setmetatile 5, 8, 944, 1 setmetatile 6, 8, 945, 1 setmetatile 5, 9, 952, 1 @@ -3278,7 +3278,7 @@ EventScript_1A8149:: @ 81A8149 setmetatile 6, 10, 821, 0 return -EventScript_1A8177:: @ 81A8177 +EventScript_Close2FDoor2:: @ 81A8177 setmetatile 5, 15, 944, 1 setmetatile 6, 15, 945, 1 setmetatile 5, 16, 952, 1 @@ -3286,7 +3286,7 @@ EventScript_1A8177:: @ 81A8177 setmetatile 6, 17, 821, 0 return -EventScript_1A81A5:: @ 81A81A5 +EventScript_Close3FDoor1:: @ 81A81A5 setmetatile 9, 11, 960, 1 setmetatile 10, 11, 961, 1 setmetatile 9, 12, 962, 1 @@ -3295,7 +3295,7 @@ EventScript_1A81A5:: @ 81A81A5 setmetatile 10, 13, 965, 1 return -EventScript_1A81DC:: @ 81A81DC +EventScript_Close3FDoor2:: @ 81A81DC setmetatile 20, 11, 960, 1 setmetatile 21, 11, 961, 1 setmetatile 20, 12, 962, 1 @@ -3304,7 +3304,7 @@ EventScript_1A81DC:: @ 81A81DC setmetatile 21, 13, 965, 1 return -EventScript_1A8213:: @ 81A8213 +EventScript_Close4FDoor1:: @ 81A8213 setmetatile 3, 16, 944, 1 setmetatile 4, 16, 945, 1 setmetatile 3, 17, 952, 1 @@ -3312,7 +3312,7 @@ EventScript_1A8213:: @ 81A8213 setmetatile 4, 18, 821, 0 return -EventScript_1A8241:: @ 81A8241 +EventScript_Close4FDoor2:: @ 81A8241 setmetatile 14, 11, 944, 1 setmetatile 15, 11, 945, 1 setmetatile 14, 12, 952, 1 @@ -3320,7 +3320,7 @@ EventScript_1A8241:: @ 81A8241 setmetatile 15, 13, 821, 0 return -EventScript_1A826F:: @ 81A826F +EventScript_Close5FDoor1:: @ 81A826F setmetatile 7, 8, 960, 1 setmetatile 8, 8, 961, 1 setmetatile 7, 9, 962, 1 @@ -3329,7 +3329,7 @@ EventScript_1A826F:: @ 81A826F setmetatile 8, 10, 965, 1 return -EventScript_1A82A6:: @ 81A82A6 +EventScript_Close5FDoor2:: @ 81A82A6 setmetatile 7, 17, 960, 1 setmetatile 8, 17, 961, 1 setmetatile 7, 18, 962, 1 @@ -3338,7 +3338,7 @@ EventScript_1A82A6:: @ 81A82A6 setmetatile 8, 19, 965, 1 return -EventScript_1A82DD:: @ 81A82DD +EventScript_Close5FDoor3:: @ 81A82DD setmetatile 18, 12, 960, 1 setmetatile 19, 12, 961, 1 setmetatile 18, 13, 962, 1 @@ -3347,7 +3347,7 @@ EventScript_1A82DD:: @ 81A82DD setmetatile 19, 14, 965, 1 return -EventScript_1A8314:: @ 81A8314 +EventScript_Close6FDoor:: @ 81A8314 setmetatile 5, 14, 960, 1 setmetatile 6, 14, 961, 1 setmetatile 5, 15, 962, 1 @@ -3356,7 +3356,7 @@ EventScript_1A8314:: @ 81A8314 setmetatile 6, 16, 965, 1 return -EventScript_1A834B:: @ 81A834B +EventScript_Close7FDoor1:: @ 81A834B setmetatile 11, 8, 944, 1 setmetatile 12, 8, 945, 1 setmetatile 11, 9, 952, 1 @@ -3364,7 +3364,7 @@ EventScript_1A834B:: @ 81A834B setmetatile 12, 10, 821, 0 return -EventScript_1A8379:: @ 81A8379 +EventScript_Close7FDoor2:: @ 81A8379 setmetatile 24, 7, 944, 1 setmetatile 25, 7, 945, 1 setmetatile 24, 8, 952, 1 @@ -3372,7 +3372,7 @@ EventScript_1A8379:: @ 81A8379 setmetatile 25, 9, 821, 0 return -EventScript_1A83A7:: @ 81A83A7 +EventScript_Close7FDoor3:: @ 81A83A7 setmetatile 25, 13, 944, 1 setmetatile 26, 13, 945, 1 setmetatile 25, 14, 952, 1 @@ -3380,7 +3380,7 @@ EventScript_1A83A7:: @ 81A83A7 setmetatile 26, 15, 821, 0 return -EventScript_1A83D5:: @ 81A83D5 +EventScript_Close8FDoor:: @ 81A83D5 setmetatile 5, 9, 960, 1 setmetatile 6, 9, 961, 1 setmetatile 5, 10, 962, 1 @@ -3389,7 +3389,7 @@ EventScript_1A83D5:: @ 81A83D5 setmetatile 6, 11, 965, 1 return -EventScript_1A840C:: @ 81A840C +EventScript_Close9FDoor1:: @ 81A840C setmetatile 2, 9, 960, 1 setmetatile 3, 9, 961, 1 setmetatile 2, 10, 962, 1 @@ -3398,7 +3398,7 @@ EventScript_1A840C:: @ 81A840C setmetatile 3, 11, 965, 1 return -EventScript_1A8443:: @ 81A8443 +EventScript_Close9FDoor2:: @ 81A8443 setmetatile 12, 15, 960, 1 setmetatile 13, 15, 961, 1 setmetatile 12, 16, 962, 1 @@ -3407,7 +3407,7 @@ EventScript_1A8443:: @ 81A8443 setmetatile 13, 17, 965, 1 return -EventScript_1A847A:: @ 81A847A +EventScript_Close9FDoor3:: @ 81A847A setmetatile 21, 6, 944, 1 setmetatile 22, 6, 945, 1 setmetatile 21, 7, 952, 1 @@ -3415,7 +3415,7 @@ EventScript_1A847A:: @ 81A847A setmetatile 22, 8, 821, 0 return -EventScript_1A84A8:: @ 81A84A8 +EventScript_Close9FDoor4:: @ 81A84A8 setmetatile 21, 12, 944, 1 setmetatile 22, 12, 945, 1 setmetatile 21, 13, 952, 1 @@ -3423,7 +3423,7 @@ EventScript_1A84A8:: @ 81A84A8 setmetatile 22, 14, 821, 0 return -EventScript_1A84D6:: @ 81A84D6 +EventScript_Close10FDoor:: @ 81A84D6 setmetatile 12, 11, 944, 1 setmetatile 13, 11, 945, 1 setmetatile 12, 12, 952, 1 @@ -3431,7 +3431,7 @@ EventScript_1A84D6:: @ 81A84D6 setmetatile 13, 13, 821, 0 return -EventScript_1A8504:: @ 81A8504 +EventScript_Close11FDoor:: @ 81A8504 setmetatile 5, 16, 944, 1 setmetatile 6, 16, 945, 1 setmetatile 5, 17, 952, 1 @@ -3439,7 +3439,7 @@ EventScript_1A8504:: @ 81A8504 setmetatile 6, 18, 821, 0 return -EventScript_1A8532:: @ 81A8532 +EventScript_Open2FDoor1:: @ 81A8532 setmetatile 5, 8, 821, 0 setmetatile 6, 8, 820, 0 setmetatile 5, 9, 821, 0 @@ -3447,7 +3447,7 @@ EventScript_1A8532:: @ 81A8532 setmetatile 6, 10, 820, 0 return -EventScript_1A8560:: @ 81A8560 +EventScript_Open2FDoor2:: @ 81A8560 setmetatile 5, 15, 821, 0 setmetatile 6, 15, 820, 0 setmetatile 5, 16, 821, 0 @@ -3455,7 +3455,7 @@ EventScript_1A8560:: @ 81A8560 setmetatile 6, 17, 820, 0 return -EventScript_1A858E:: @ 81A858E +EventScript_Open3FDoor1:: @ 81A858E setmetatile 9, 11, 839, 1 setmetatile 10, 11, 838, 1 setmetatile 9, 12, 821, 0 @@ -3464,7 +3464,7 @@ EventScript_1A858E:: @ 81A858E setmetatile 10, 13, 826, 0 return -EventScript_1A85C5:: @ 81A85C5 +EventScript_Open3FDoor2:: @ 81A85C5 setmetatile 20, 11, 839, 1 setmetatile 21, 11, 838, 1 setmetatile 20, 12, 821, 0 @@ -3473,7 +3473,7 @@ EventScript_1A85C5:: @ 81A85C5 setmetatile 21, 13, 826, 0 return -EventScript_1A85FC:: @ 81A85FC +EventScript_Open4FDoor1:: @ 81A85FC setmetatile 3, 16, 821, 0 setmetatile 4, 16, 820, 0 setmetatile 3, 17, 821, 0 @@ -3481,7 +3481,7 @@ EventScript_1A85FC:: @ 81A85FC setmetatile 4, 18, 820, 0 return -EventScript_1A862A:: @ 81A862A +EventScript_Open4FDoor2:: @ 81A862A setmetatile 14, 11, 821, 0 setmetatile 15, 11, 820, 0 setmetatile 14, 12, 821, 0 @@ -3489,7 +3489,7 @@ EventScript_1A862A:: @ 81A862A setmetatile 15, 13, 820, 0 return -EventScript_1A8658:: @ 81A8658 +EventScript_Open5FDoor1:: @ 81A8658 setmetatile 7, 8, 839, 1 setmetatile 8, 8, 838, 1 setmetatile 7, 9, 821, 0 @@ -3498,7 +3498,7 @@ EventScript_1A8658:: @ 81A8658 setmetatile 8, 10, 826, 0 return -EventScript_1A868F:: @ 81A868F +EventScript_Open5FDoor2:: @ 81A868F setmetatile 7, 17, 839, 1 setmetatile 8, 17, 838, 1 setmetatile 7, 18, 821, 0 @@ -3507,7 +3507,7 @@ EventScript_1A868F:: @ 81A868F setmetatile 8, 19, 826, 0 return -EventScript_1A86C6:: @ 81A86C6 +EventScript_Open5FDoor3:: @ 81A86C6 setmetatile 18, 12, 839, 1 setmetatile 19, 12, 838, 1 setmetatile 18, 13, 821, 0 @@ -3516,7 +3516,7 @@ EventScript_1A86C6:: @ 81A86C6 setmetatile 19, 14, 826, 0 return -EventScript_1A86FD:: @ 81A86FD +EventScript_Open6FDoor:: @ 81A86FD setmetatile 5, 14, 839, 1 setmetatile 6, 14, 838, 1 setmetatile 5, 15, 821, 0 @@ -3525,7 +3525,7 @@ EventScript_1A86FD:: @ 81A86FD setmetatile 6, 16, 826, 0 return -EventScript_1A8734:: @ 81A8734 +EventScript_Open7FDoor1:: @ 81A8734 setmetatile 11, 8, 821, 0 setmetatile 12, 8, 820, 0 setmetatile 11, 9, 821, 0 @@ -3533,7 +3533,7 @@ EventScript_1A8734:: @ 81A8734 setmetatile 12, 10, 820, 0 return -EventScript_1A8762:: @ 81A8762 +EventScript_Open7FDoor2:: @ 81A8762 setmetatile 24, 7, 821, 0 setmetatile 25, 7, 820, 0 setmetatile 24, 8, 821, 0 @@ -3541,7 +3541,7 @@ EventScript_1A8762:: @ 81A8762 setmetatile 25, 9, 820, 0 return -EventScript_1A8790:: @ 81A8790 +EventScript_Open7FDoor3:: @ 81A8790 setmetatile 25, 13, 821, 0 setmetatile 26, 13, 820, 0 setmetatile 25, 14, 821, 0 @@ -3549,7 +3549,7 @@ EventScript_1A8790:: @ 81A8790 setmetatile 26, 15, 820, 0 return -EventScript_1A87BE:: @ 81A87BE +EventScript_Open8FDoor:: @ 81A87BE setmetatile 5, 9, 839, 1 setmetatile 6, 9, 838, 1 setmetatile 5, 10, 821, 0 @@ -3558,7 +3558,7 @@ EventScript_1A87BE:: @ 81A87BE setmetatile 6, 11, 826, 0 return -EventScript_1A87F5:: @ 81A87F5 +EventScript_Open9FDoor1:: @ 81A87F5 setmetatile 2, 9, 839, 1 setmetatile 3, 9, 838, 1 setmetatile 2, 10, 821, 0 @@ -3567,7 +3567,7 @@ EventScript_1A87F5:: @ 81A87F5 setmetatile 3, 11, 826, 0 return -EventScript_1A882C:: @ 81A882C +EventScript_Open9FDoor2:: @ 81A882C setmetatile 12, 15, 839, 1 setmetatile 13, 15, 838, 1 setmetatile 12, 16, 821, 0 @@ -3576,7 +3576,7 @@ EventScript_1A882C:: @ 81A882C setmetatile 13, 17, 826, 0 return -EventScript_1A8863:: @ 81A8863 +EventScript_Open9FDoor3:: @ 81A8863 setmetatile 21, 6, 821, 0 setmetatile 22, 6, 820, 0 setmetatile 21, 7, 821, 0 @@ -3584,7 +3584,7 @@ EventScript_1A8863:: @ 81A8863 setmetatile 22, 8, 820, 0 return -EventScript_1A8891:: @ 81A8891 +EventScript_Open9FDoor4:: @ 81A8891 setmetatile 21, 12, 821, 0 setmetatile 22, 12, 820, 0 setmetatile 21, 13, 821, 0 @@ -3592,7 +3592,7 @@ EventScript_1A8891:: @ 81A8891 setmetatile 22, 14, 820, 0 return -EventScript_1A88BF:: @ 81A88BF +EventScript_Open10FDoor:: @ 81A88BF setmetatile 12, 11, 821, 0 setmetatile 13, 11, 820, 0 setmetatile 12, 12, 821, 0 @@ -3600,7 +3600,7 @@ EventScript_1A88BF:: @ 81A88BF setmetatile 13, 13, 820, 0 return -EventScript_1A88ED:: @ 81A88ED +EventScript_Open11FDoor:: @ 81A88ED setmetatile 5, 16, 821, 0 setmetatile 6, 16, 820, 0 setmetatile 5, 17, 821, 0 @@ -3608,236 +3608,236 @@ EventScript_1A88ED:: @ 81A88ED setmetatile 6, 18, 820, 0 return -SilphCo_2F_EventScript_1A891B:: @ 81A891B +SilphCo_2F_EventScript_Door1:: @ 81A891B lockall setvar VAR_0x4001, 1 setvar VAR_0x8004, 634 checkflag FLAG_SILPH_2F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_2F_EventScript_1A8935:: @ 81A8935 +SilphCo_2F_EventScript_Door2:: @ 81A8935 lockall setvar VAR_0x4001, 2 setvar VAR_0x8004, 635 checkflag FLAG_SILPH_2F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_3F_EventScript_1A894F:: @ 81A894F +SilphCo_3F_EventScript_Door1:: @ 81A894F lockall setvar VAR_0x4001, 3 setvar VAR_0x8004, 636 checkflag FLAG_SILPH_3F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_3F_EventScript_1A8969:: @ 81A8969 +SilphCo_3F_EventScript_Door2:: @ 81A8969 lockall setvar VAR_0x4001, 4 setvar VAR_0x8004, 637 checkflag FLAG_SILPH_3F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_4F_EventScript_1A8983:: @ 81A8983 +SilphCo_4F_EventScript_Door1:: @ 81A8983 lockall setvar VAR_0x4001, 5 setvar VAR_0x8004, 638 checkflag FLAG_SILPH_4F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_4F_EventScript_1A899D:: @ 81A899D +SilphCo_4F_EventScript_Door2:: @ 81A899D lockall setvar VAR_0x4001, 6 setvar VAR_0x8004, 639 checkflag FLAG_SILPH_4F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_5F_EventScript_1A89B7:: @ 81A89B7 +SilphCo_5F_EventScript_Door1:: @ 81A89B7 lockall setvar VAR_0x4001, 7 setvar VAR_0x8004, 640 checkflag FLAG_SILPH_5F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_5F_EventScript_1A89D1:: @ 81A89D1 +SilphCo_5F_EventScript_Door2:: @ 81A89D1 lockall setvar VAR_0x4001, 8 setvar VAR_0x8004, 641 checkflag FLAG_SILPH_5F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_5F_EventScript_1A89EB:: @ 81A89EB +SilphCo_5F_EventScript_Door3:: @ 81A89EB lockall setvar VAR_0x4001, 9 setvar VAR_0x8004, 642 checkflag FLAG_SILPH_5F_DOOR_3 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_6F_EventScript_1A8A05:: @ 81A8A05 +SilphCo_6F_EventScript_Door:: @ 81A8A05 lockall setvar VAR_0x4001, 10 setvar VAR_0x8004, 643 checkflag FLAG_SILPH_6F_DOOR - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_7F_EventScript_1A8A1F:: @ 81A8A1F +SilphCo_7F_EventScript_Door1:: @ 81A8A1F lockall setvar VAR_0x4001, 11 setvar VAR_0x8004, 644 checkflag FLAG_SILPH_7F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_7F_EventScript_1A8A39:: @ 81A8A39 +SilphCo_7F_EventScript_Door2:: @ 81A8A39 lockall setvar VAR_0x4001, 12 setvar VAR_0x8004, 645 checkflag FLAG_SILPH_7F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_7F_EventScript_1A8A53:: @ 81A8A53 +SilphCo_7F_EventScript_Door3:: @ 81A8A53 lockall setvar VAR_0x4001, 13 setvar VAR_0x8004, 646 checkflag FLAG_SILPH_7F_DOOR_3 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_8F_EventScript_1A8A6D:: @ 81A8A6D +SilphCo_8F_EventScript_Door:: @ 81A8A6D lockall setvar VAR_0x4001, 14 setvar VAR_0x8004, 647 checkflag FLAG_SILPH_8F_DOOR - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_1A8A87:: @ 81A8A87 +SilphCo_9F_EventScript_Door1:: @ 81A8A87 lockall setvar VAR_0x4001, 15 setvar VAR_0x8004, 648 checkflag FLAG_SILPH_9F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_1A8AA1:: @ 81A8AA1 +SilphCo_9F_EventScript_Door2:: @ 81A8AA1 lockall setvar VAR_0x4001, 16 setvar VAR_0x8004, 649 checkflag FLAG_SILPH_9F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_1A8ABB:: @ 81A8ABB +SilphCo_9F_EventScript_Door3:: @ 81A8ABB lockall setvar VAR_0x4001, 17 setvar VAR_0x8004, 650 checkflag FLAG_SILPH_9F_DOOR_3 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_1A8AD5:: @ 81A8AD5 +SilphCo_9F_EventScript_Door4:: @ 81A8AD5 lockall setvar VAR_0x4001, 18 setvar VAR_0x8004, 651 checkflag FLAG_SILPH_9F_DOOR_4 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_10F_EventScript_1A8AEF:: @ 81A8AEF +SilphCo_10F_EventScript_Door:: @ 81A8AEF lockall setvar VAR_0x4001, 19 setvar VAR_0x8004, 652 checkflag FLAG_SILPH_10F_DOOR - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_11F_EventScript_1A8B09:: @ 81A8B09 +SilphCo_11F_EventScript_Door:: @ 81A8B09 lockall setvar VAR_0x4001, 20 setvar VAR_0x8004, 653 checkflag FLAG_SILPH_11F_DOOR - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -EventScript_1A8B23:: @ 81A8B23 +EventScript_TryUnlockDoor:: @ 81A8B23 checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY - goto_if TRUE, EventScript_1A8B32 - goto EventScript_1A8135 + goto_if TRUE, EventScript_OpenDoor + goto EventScript_NeedCardKey end -EventScript_1A8B32:: @ 81A8B32 +EventScript_OpenDoor:: @ 81A8B32 playfanfare MUS_FANFA1 - msgbox Text_1A5B88 + msgbox Text_CardKeyOpenedDoor waitfanfare - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1A8532 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1A8560 - compare_var_to_value VAR_0x4001, 3 - call_if eq, EventScript_1A858E - compare_var_to_value VAR_0x4001, 4 - call_if eq, EventScript_1A85C5 - compare_var_to_value VAR_0x4001, 5 - call_if eq, EventScript_1A85FC - compare_var_to_value VAR_0x4001, 6 - call_if eq, EventScript_1A862A - compare_var_to_value VAR_0x4001, 7 - call_if eq, EventScript_1A8658 - compare_var_to_value VAR_0x4001, 8 - call_if eq, EventScript_1A868F - compare_var_to_value VAR_0x4001, 9 - call_if eq, EventScript_1A86C6 - compare_var_to_value VAR_0x4001, 10 - call_if eq, EventScript_1A86FD - compare_var_to_value VAR_0x4001, 11 - call_if eq, EventScript_1A8734 - compare_var_to_value VAR_0x4001, 12 - call_if eq, EventScript_1A8762 - compare_var_to_value VAR_0x4001, 13 - call_if eq, EventScript_1A8790 - compare_var_to_value VAR_0x4001, 14 - call_if eq, EventScript_1A87BE - compare_var_to_value VAR_0x4001, 15 - call_if eq, EventScript_1A87F5 - compare_var_to_value VAR_0x4001, 16 - call_if eq, EventScript_1A882C - compare_var_to_value VAR_0x4001, 17 - call_if eq, EventScript_1A8863 - compare_var_to_value VAR_0x4001, 18 - call_if eq, EventScript_1A8891 - compare_var_to_value VAR_0x4001, 19 - call_if eq, EventScript_1A88BF - compare_var_to_value VAR_0x4001, 20 - call_if eq, EventScript_1A88ED + compare VAR_0x4001, 1 + call_if eq, EventScript_Open2FDoor1 + compare VAR_0x4001, 2 + call_if eq, EventScript_Open2FDoor2 + compare VAR_0x4001, 3 + call_if eq, EventScript_Open3FDoor1 + compare VAR_0x4001, 4 + call_if eq, EventScript_Open3FDoor2 + compare VAR_0x4001, 5 + call_if eq, EventScript_Open4FDoor1 + compare VAR_0x4001, 6 + call_if eq, EventScript_Open4FDoor2 + compare VAR_0x4001, 7 + call_if eq, EventScript_Open5FDoor1 + compare VAR_0x4001, 8 + call_if eq, EventScript_Open5FDoor2 + compare VAR_0x4001, 9 + call_if eq, EventScript_Open5FDoor3 + compare VAR_0x4001, 10 + call_if eq, EventScript_Open6FDoor + compare VAR_0x4001, 11 + call_if eq, EventScript_Open7FDoor1 + compare VAR_0x4001, 12 + call_if eq, EventScript_Open7FDoor2 + compare VAR_0x4001, 13 + call_if eq, EventScript_Open7FDoor3 + compare VAR_0x4001, 14 + call_if eq, EventScript_Open8FDoor + compare VAR_0x4001, 15 + call_if eq, EventScript_Open9FDoor1 + compare VAR_0x4001, 16 + call_if eq, EventScript_Open9FDoor2 + compare VAR_0x4001, 17 + call_if eq, EventScript_Open9FDoor3 + compare VAR_0x4001, 18 + call_if eq, EventScript_Open9FDoor4 + compare VAR_0x4001, 19 + call_if eq, EventScript_Open10FDoor + compare VAR_0x4001, 20 + call_if eq, EventScript_Open11FDoor waitse playse SE_KI_GASYAN special DrawWholeMapView @@ -3871,7 +3871,7 @@ EventScript_1A8C3C:: @ 81A8C3C EventScript_1A8C57:: @ 81A8C57 specialvar VAR_RESULT, sub_80CC7B4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A8C70 msgbox Text_1A5CF1 return @@ -3884,7 +3884,7 @@ EventScript_1A8C70:: @ 81A8C70 EventScript_1A8C82:: @ 81A8C82 specialvar VAR_RESULT, sub_80CC7B4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A8C9B msgbox Text_1A5D31 return @@ -4009,7 +4009,7 @@ VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 msgbox Text_194234 setflag FLAG_GOT_VS_SEEKER giveitem ITEM_VS_SEEKER - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 msgbox Text_19430F release @@ -4025,9 +4025,9 @@ EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 textcolor 3 waitse call EventScript_GiveItem - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 goto_if eq, EventScript_DigUpItemPutInPocket - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_DigUpItemBagIsFull end @@ -4088,16 +4088,16 @@ EventScript_PoisonWhiteOut:: @ 81A8DFD textcolor 3 special ExecuteWhiteOut waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A8E11 releaseall end EventScript_1A8E11:: @ 81A8E11 checkmoney 1, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A8E2E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A8E3C end @@ -4157,9 +4157,9 @@ EventScript_1A8EC0:: @ 81A8EC0 return EventScript_1A8EC5:: @ 81A8EC5 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1A911E - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A8F12 multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE switch VAR_RESULT @@ -4180,9 +4180,9 @@ EventScript_1A8F12:: @ 81A8F12 end EventScript_1A8F54:: @ 81A8F54 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1A911E - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A8FA1 multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE switch VAR_RESULT @@ -4223,9 +4223,9 @@ EventScript_1A9004:: @ 81A9004 end EventScript_1A900F:: @ 81A900F - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1A911E - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A905C multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE switch VAR_RESULT @@ -4248,9 +4248,9 @@ EventScript_1A905C:: @ 81A905C EventScript_1A909E:: @ 81A909E specialvar VAR_RESULT, sub_8147500 getnumberstring 0, VAR_RESULT - compare_var_to_value VAR_0x8004, SEAGALLOP_VERMILION_CITY + compare VAR_0x8004, SEAGALLOP_VERMILION_CITY goto_if eq, EventScript_1A90BE - compare_var_to_value VAR_0x8004, SEAGALLOP_VERMILION_CITY + compare VAR_0x8004, SEAGALLOP_VERMILION_CITY goto_if ne, EventScript_1A90CC end @@ -4268,7 +4268,7 @@ EventScript_1A90DA:: @ 81A90DA closemessage delay 20 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 fadescreen 1 @@ -4278,7 +4278,7 @@ EventScript_1A90DA:: @ 81A90DA EventScript_1A90F6:: @ 81A90F6 specialvar VAR_RESULT, sub_8147594 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9108 release end @@ -4529,7 +4529,7 @@ gUnknown_81A93C0:: @ 81A93C0 Route3_EventScript_1A93C9:: @ 81A93C9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_BEN, 0, Text_183560, Text_1835A0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A93F0 msgbox Text_1835B4, 6 end @@ -4542,7 +4542,7 @@ EventScript_1A93F0:: @ 81A93F0 Route3_EventScript_1A9407:: @ 81A9407 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CALVIN, 0, Text_183786, Text_1837BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A942E msgbox Text_1837CF, 6 end @@ -4555,7 +4555,7 @@ EventScript_1A942E:: @ 81A942E Route3_EventScript_1A9445:: @ 81A9445 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_COLTON, 0, Text_1834E6, Text_183509 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A946C msgbox Text_18351C, 6 end @@ -4568,7 +4568,7 @@ EventScript_1A946C:: @ 81A946C Route3_EventScript_1A9483:: @ 81A9483 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GREG, 0, Text_183682, Text_1836B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A94AA msgbox Text_1836D9, 6 end @@ -4581,7 +4581,7 @@ EventScript_1A94AA:: @ 81A94AA Route3_EventScript_1A94C1:: @ 81A94C1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JAMES, 0, Text_183807, Text_183837 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A94E8 msgbox Text_183849, 6 end @@ -4594,7 +4594,7 @@ EventScript_1A94E8:: @ 81A94E8 Route3_EventScript_1A94FF:: @ 81A94FF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JANICE, 0, Text_183616, Text_18363F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9526 msgbox Text_18364C, 6 end @@ -4607,7 +4607,7 @@ EventScript_1A9526:: @ 81A9526 Route3_EventScript_1A953D:: @ 81A953D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_SALLY, 0, Text_18371B, Text_183746 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9564 msgbox Text_18374F, 6 end @@ -4620,7 +4620,7 @@ EventScript_1A9564:: @ 81A9564 Route3_EventScript_1A957B:: @ 81A957B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ROBIN, 0, Text_18387A, Text_183891 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A95A2 msgbox Text_18389C, 6 end @@ -4633,7 +4633,7 @@ EventScript_1A95A2:: @ 81A95A2 Route4_EventScript_1A95B9:: @ 81A95B9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_CRISSY, 0, Text_183906, Text_183938 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A95E0 msgbox Text_183957, 6 end @@ -4646,7 +4646,7 @@ EventScript_1A95E0:: @ 81A95E0 Route24_EventScript_1A95F7:: @ 81A95F7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_TIMMY, 0, Text_188F76, Text_188F95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A961E msgbox Text_188FA7, 6 end @@ -4659,7 +4659,7 @@ EventScript_1A961E:: @ 81A961E Route24_EventScript_1A9635:: @ 81A9635 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CALE, 0, Text_18901B, Text_18908C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A965C msgbox Text_18909E, 6 end @@ -4672,7 +4672,7 @@ EventScript_1A965C:: @ 81A965C Route24_EventScript_1A9673:: @ 81A9673 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_RELI, 0, Text_188F2C, Text_188F46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A969A msgbox Text_188F53, 6 end @@ -4685,7 +4685,7 @@ EventScript_1A969A:: @ 81A969A Route24_EventScript_1A96B1:: @ 81A96B1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ALI, 0, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A96D8 msgbox Text_188FF9, 6 end @@ -4698,7 +4698,7 @@ EventScript_1A96D8:: @ 81A96D8 Route24_EventScript_1A96EF:: @ 81A96EF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_SHANE, 0, Text_188E74, Text_188E94 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9716 msgbox Text_188EA3, 6 end @@ -4711,7 +4711,7 @@ EventScript_1A9716:: @ 81A9716 Route24_EventScript_1A972D:: @ 81A972D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_ETHAN, 0, Text_188ED9, Text_188EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9754 msgbox Text_188F0A, 6 end @@ -4724,7 +4724,7 @@ EventScript_1A9754:: @ 81A9754 Route25_EventScript_1A976B:: @ 81A976B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOEY, 0, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9792 msgbox Text_1890F5, 6 end @@ -4737,7 +4737,7 @@ EventScript_1A9792:: @ 81A9792 Route25_EventScript_1A97A9:: @ 81A97A9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAN, 0, Text_189165, Text_1891A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A97D0 msgbox Text_1891B3, 6 end @@ -4750,7 +4750,7 @@ EventScript_1A97D0:: @ 81A97D0 Route25_EventScript_1A97E7:: @ 81A97E7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CHAD, 0, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A980E msgbox Text_1892EF, 6 end @@ -4763,7 +4763,7 @@ EventScript_1A980E:: @ 81A980E Route25_EventScript_1A9825:: @ 81A9825 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KELSEY, 0, Text_189247, Text_189261 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A984C msgbox Text_189281, 6 end @@ -4776,7 +4776,7 @@ EventScript_1A984C:: @ 81A984C Route25_EventScript_1A9863:: @ 81A9863 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_HALEY, 0, Text_189333, Text_189364 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A988A msgbox Text_189378, 6 end @@ -4789,7 +4789,7 @@ EventScript_1A988A:: @ 81A988A Route25_EventScript_1A98A1:: @ 81A98A1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_FRANKLIN, 0, Text_1893A7, Text_1893EA specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A98C8 msgbox Text_1893FB, 6 end @@ -4802,7 +4802,7 @@ EventScript_1A98C8:: @ 81A98C8 Route25_EventScript_1A98DF:: @ 81A98DF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_NOB, 0, Text_189423, Text_189459 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9906 msgbox Text_18947E, 6 end @@ -4815,7 +4815,7 @@ EventScript_1A9906:: @ 81A9906 Route25_EventScript_1A991D:: @ 81A991D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_WAYNE, 0, Text_1894DE, Text_18950A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9944 msgbox Text_18951C, 6 end @@ -4828,7 +4828,7 @@ EventScript_1A9944:: @ 81A9944 Route25_EventScript_1A995B:: @ 81A995B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_FLINT, 0, Text_1891EB, Text_189212 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9982 msgbox Text_18921D, 6 end @@ -4841,7 +4841,7 @@ EventScript_1A9982:: @ 81A9982 Route6_EventScript_1A9999:: @ 81A9999 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KEIGO, 0, Text_183E9F, Text_183EC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A99C0 msgbox Text_183ED4, 6 end @@ -4854,7 +4854,7 @@ EventScript_1A99C0:: @ 81A99C0 Route6_EventScript_1A99D7:: @ 81A99D7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_183FF0, Text_18401A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A99FE msgbox Text_18402B, 6 end @@ -4867,7 +4867,7 @@ EventScript_1A99FE:: @ 81A99FE Route6_EventScript_1A9A15:: @ 81A9A15 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RICKY, 0, Text_183E04, Text_183E2A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9A3C msgbox Text_183E3C, 6 end @@ -4880,7 +4880,7 @@ EventScript_1A9A3C:: @ 81A9A3C Route6_EventScript_1A9A53:: @ 81A9A53 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JEFF, 0, Text_183F07, Text_183F24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9A7A msgbox Text_183F51, 6 end @@ -4893,7 +4893,7 @@ EventScript_1A9A7A:: @ 81A9A7A Route6_EventScript_1A9A91:: @ 81A9A91 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_NANCY, 0, Text_183E4E, Text_183E79 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9AB8 msgbox Text_183E8D, 6 end @@ -4906,7 +4906,7 @@ EventScript_1A9AB8:: @ 81A9AB8 Route6_EventScript_1A9ACF:: @ 81A9ACF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ISABELLE, 0, Text_183F90, Text_183FAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9AF6 msgbox Text_183FC4, 6 end @@ -4919,7 +4919,7 @@ EventScript_1A9AF6:: @ 81A9AF6 Route11_EventScript_1A9B0D:: @ 81A9B0D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_EDDIE, 0, Text_184FBD, Text_184FD8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9B34 msgbox Text_184FEF, 6 end @@ -4932,7 +4932,7 @@ EventScript_1A9B34:: @ 81A9B34 Route11_EventScript_1A9B4B:: @ 81A9B4B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DILLON, 0, Text_18506A, Text_18509B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9B72 msgbox Text_1850CF, 6 end @@ -4945,7 +4945,7 @@ EventScript_1A9B72:: @ 81A9B72 Route11_EventScript_1A9B89:: @ 81A9B89 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_YASU, 0, Text_18517B, Text_1851AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9BB0 msgbox Text_1851D2, 6 end @@ -4958,7 +4958,7 @@ EventScript_1A9BB0:: @ 81A9BB0 Route11_EventScript_1A9BC7:: @ 81A9BC7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAVE, 0, Text_185285, Text_1852C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9BEE msgbox Text_1852E3, 6 end @@ -4971,7 +4971,7 @@ EventScript_1A9BEE:: @ 81A9BEE Route11_EventScript_1A9C05:: @ 81A9C05 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BRAXTON, 0, Text_185011, Text_185037 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9C2C msgbox Text_18504A, 6 end @@ -4984,7 +4984,7 @@ EventScript_1A9C2C:: @ 81A9C2C Route11_EventScript_1A9C43:: @ 81A9C43 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BERNIE, 0, Text_185236, Text_185250 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9C6A msgbox Text_185266, 6 end @@ -4997,7 +4997,7 @@ EventScript_1A9C6A:: @ 81A9C6A Route11_EventScript_1A9C81:: @ 81A9C81 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_HUGO, 0, Text_184F01, Text_184F15 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9CA8 msgbox Text_184F2E, 6 end @@ -5010,7 +5010,7 @@ EventScript_1A9CA8:: @ 81A9CA8 Route11_EventScript_1A9CBF:: @ 81A9CBF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_JASPER, 0, Text_184F5D, Text_184F7E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9CE6 msgbox Text_184F8E, 6 end @@ -5023,7 +5023,7 @@ EventScript_1A9CE6:: @ 81A9CE6 Route11_EventScript_1A9CFD:: @ 81A9CFD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DIRK, 0, Text_1850E9, Text_185105 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9D24 msgbox Text_185114, 6 end @@ -5036,7 +5036,7 @@ EventScript_1A9D24:: @ 81A9D24 Route11_EventScript_1A9D3B:: @ 81A9D3B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DARIAN, 0, Text_185135, Text_18514E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9D62 msgbox Text_185161, 6 end @@ -5049,7 +5049,7 @@ EventScript_1A9D62:: @ 81A9D62 Route9_EventScript_1A9D79:: @ 81A9D79 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_BRENT, 0, Text_184A2F, Text_184A6A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9DA0 msgbox Text_184A8C, 6 end @@ -5062,7 +5062,7 @@ EventScript_1A9DA0:: @ 81A9DA0 Route9_EventScript_1A9DB7:: @ 81A9DB7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CONNER, 0, Text_184B18, Text_184B32 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9DDE msgbox Text_184B3B, 6 end @@ -5075,7 +5075,7 @@ EventScript_1A9DDE:: @ 81A9DDE Route9_EventScript_1A9DF5:: @ 81A9DF5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_CHRIS, 0, Text_184844, Text_18487E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9E1C msgbox Text_184890, 6 end @@ -5088,7 +5088,7 @@ EventScript_1A9E1C:: @ 81A9E1C Route9_EventScript_1A9E33:: @ 81A9E33 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_DREW, 0, Text_18489E, Text_1848CC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9E5A msgbox Text_1848DE, 6 end @@ -5101,7 +5101,7 @@ EventScript_1A9E5A:: @ 81A9E5A Route9_EventScript_1A9E71:: @ 81A9E71 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALICIA, 0, Text_1847B7, Text_1847DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9E98 msgbox Text_1847F0, 6 end @@ -5114,7 +5114,7 @@ EventScript_1A9E98:: @ 81A9E98 Route9_EventScript_1A9EAF:: @ 81A9EAF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAITLIN, 0, Text_1848FF, Text_18491C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9ED6 msgbox Text_184931, 6 end @@ -5127,7 +5127,7 @@ EventScript_1A9ED6:: @ 81A9ED6 Route9_EventScript_1A9EED:: @ 81A9EED trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALAN, 0, Text_184ABE, Text_184AD5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9F14 msgbox Text_184AF1, 6 end @@ -5140,7 +5140,7 @@ EventScript_1A9F14:: @ 81A9F14 Route9_EventScript_1A9F2B:: @ 81A9F2B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_BRICE, 0, Text_1849DF, Text_184A04 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9F52 msgbox Text_184A11, 6 end @@ -5153,7 +5153,7 @@ EventScript_1A9F52:: @ 81A9F52 Route9_EventScript_1A9F69:: @ 81A9F69 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_JEREMY, 0, Text_18495E, Text_18497F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9F90 msgbox Text_1849B0, 6 end @@ -5166,7 +5166,7 @@ EventScript_1A9F90:: @ 81A9F90 Route10_EventScript_1A9FA7:: @ 81A9FA7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_HEIDI, 0, Text_184CF1, Text_184D31 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9FCE msgbox Text_184D4D, 6 end @@ -5179,7 +5179,7 @@ EventScript_1A9FCE:: @ 81A9FCE Route10_EventScript_1A9FE5:: @ 81A9FE5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAROL, 0, Text_184E04, Text_184E3B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA00C msgbox Text_184E5E, 6 end @@ -5192,7 +5192,7 @@ EventScript_1AA00C:: @ 81AA00C Route10_EventScript_1AA023:: @ 81AA023 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_MARK, 0, Text_184B8A, Text_184BE5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA04A msgbox Text_184BFB, 6 end @@ -5205,7 +5205,7 @@ EventScript_1AA04A:: @ 81AA04A Route10_EventScript_1AA061:: @ 81AA061 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HERMAN, 0, Text_184C86, Text_184CA7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA088 msgbox Text_184CBB, 6 end @@ -5218,7 +5218,7 @@ EventScript_1AA088:: @ 81AA088 Route10_EventScript_1AA09F:: @ 81AA09F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_CLARK, 0, Text_184C1D, Text_184C2D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA0C6 msgbox Text_184C60, 6 end @@ -5231,7 +5231,7 @@ EventScript_1AA0C6:: @ 81AA0C6 Route10_EventScript_1AA0DD:: @ 81AA0DD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_TRENT, 0, Text_184DAA, Text_184DCE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA104 msgbox Text_184DE4, 6 end @@ -5244,7 +5244,7 @@ EventScript_1AA104:: @ 81AA104 Route8_EventScript_1AA11B:: @ 81AA11B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_PAIGE, 0, Text_1841ED, Text_184210 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA142 msgbox Text_18421B, 6 end @@ -5257,7 +5257,7 @@ EventScript_1AA142:: @ 81AA142 Route8_EventScript_1AA159:: @ 81AA159 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ANDREA, 0, Text_184321, Text_184346 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA180 msgbox Text_184350, 6 end @@ -5270,7 +5270,7 @@ EventScript_1AA180:: @ 81AA180 Route8_EventScript_1AA197:: @ 81AA197 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MEGAN, 0, Text_18437A, Text_1843A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA1BE msgbox Text_1843D2, 6 end @@ -5283,7 +5283,7 @@ EventScript_1AA1BE:: @ 81AA1BE Route8_EventScript_1AA1D5:: @ 81AA1D5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JULIA, 0, Text_1844AC, Text_1844D6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA1FC msgbox Text_1844FD, 6 end @@ -5296,7 +5296,7 @@ EventScript_1AA1FC:: @ 81AA1FC Route8_EventScript_1AA213:: @ 81AA213 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_AIDAN, 0, Text_1840C5, Text_184100 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA23A msgbox Text_18410E, 6 end @@ -5309,7 +5309,7 @@ EventScript_1AA23A:: @ 81AA23A Route8_EventScript_1AA251:: @ 81AA251 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_GLENN, 0, Text_18417C, Text_1841B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA278 msgbox Text_1841C8, 6 end @@ -5322,7 +5322,7 @@ EventScript_1AA278:: @ 81AA278 Route8_EventScript_1AA28F:: @ 81AA28F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_LESLIE, 0, Text_184257, Text_18427A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA2B6 msgbox Text_1842B3, 6 end @@ -5335,7 +5335,7 @@ EventScript_1AA2B6:: @ 81AA2B6 Route8_EventScript_1AA2CD:: @ 81AA2CD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_STAN, 0, Text_18412F, Text_18414D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA2F4 msgbox Text_184162, 6 end @@ -5348,7 +5348,7 @@ EventScript_1AA2F4:: @ 81AA2F4 Route8_EventScript_1AA30B:: @ 81AA30B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_RICH, 0, Text_184432, Text_18444F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA332 msgbox Text_184466, 6 end @@ -5361,7 +5361,7 @@ EventScript_1AA332:: @ 81AA332 Route8_EventScript_1AA349:: @ 81AA349 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1845A4, Text_1845D0, Text_184616 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA374 msgbox Text_1845F2, 6 end @@ -5374,7 +5374,7 @@ EventScript_1AA374:: @ 81AA374 Route8_EventScript_1AA38F:: @ 81AA38F trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_18464A, Text_184675, Text_1846AF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA3BA msgbox Text_18468B, 6 end @@ -5387,7 +5387,7 @@ EventScript_1AA3BA:: @ 81AA3BA Route8_EventScript_1AA3D5:: @ 81AA3D5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RICARDO, 0, Text_1846E2, Text_1846FC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA3FC msgbox Text_184719, 6 end @@ -5400,7 +5400,7 @@ EventScript_1AA3FC:: @ 81AA3FC Route8_EventScript_1AA413:: @ 81AA413 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAREN, 0, Text_184742, Text_184767 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA43A msgbox Text_18477A, 6 end @@ -5413,7 +5413,7 @@ EventScript_1AA43A:: @ 81AA43A Route12_EventScript_1AA451:: @ 81AA451 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NED, 0, Text_185402, Text_18541B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA478 msgbox Text_185432, 6 end @@ -5426,7 +5426,7 @@ EventScript_1AA478:: @ 81AA478 Route12_EventScript_1AA48F:: @ 81AA48F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CHIP, 0, Text_18544E, Text_185475 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA4B6 msgbox Text_185488, 6 end @@ -5439,7 +5439,7 @@ EventScript_1AA4B6:: @ 81AA4B6 Route12_EventScript_1AA4CD:: @ 81AA4CD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_HANK, 0, Text_1855E1, Text_185606 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA4F4 msgbox Text_185616, 6 end @@ -5452,7 +5452,7 @@ EventScript_1AA4F4:: @ 81AA4F4 Route12_EventScript_1AA50B:: @ 81AA50B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ELLIOT, 0, Text_185682, Text_1856D0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA532 msgbox Text_1856DF, 6 end @@ -5465,7 +5465,7 @@ EventScript_1AA532:: @ 81AA532 Route12_EventScript_1AA549:: @ 81AA549 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ANDREW, 0, Text_18570E, Text_185744 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA570 msgbox Text_18574D, 6 end @@ -5478,7 +5478,7 @@ EventScript_1AA570:: @ 81AA570 Route12_EventScript_1AA587:: @ 81AA587 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ROCKER_LUCA, 0, Text_185547, Text_18559B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA5AE msgbox Text_1855A6, 6 end @@ -5491,7 +5491,7 @@ EventScript_1AA5AE:: @ 81AA5AE Route12_EventScript_1AA5C5:: @ 81AA5C5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JUSTIN, 0, Text_1854B9, Text_1854ED specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA5EC msgbox Text_1854F2, 6 end @@ -5504,7 +5504,7 @@ EventScript_1AA5EC:: @ 81AA5EC Route12_EventScript_1AA603:: @ 81AA603 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1857C5, Text_1857F1, Text_185842 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA62E msgbox Text_18581F, 6 end @@ -5517,7 +5517,7 @@ EventScript_1AA62E:: @ 81AA62E Route12_EventScript_1AA649:: @ 81AA649 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1858A6, Text_1858D0, Text_185908 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA674 msgbox Text_1858E2, 6 end @@ -5530,7 +5530,7 @@ EventScript_1AA674:: @ 81AA674 Route13_EventScript_1AA68F:: @ 81AA68F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JARED, 0, Text_185D05, Text_185D1D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA6B6 msgbox Text_185D33, 6 end @@ -5543,7 +5543,7 @@ EventScript_1AA6B6:: @ 81AA6B6 Route13_EventScript_1AA6CD:: @ 81AA6CD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LOLA, 0, Text_185BFC, Text_185C1F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA6F4 msgbox Text_185C35, 6 end @@ -5556,7 +5556,7 @@ EventScript_1AA6F4:: @ 81AA6F4 Route13_EventScript_1AA70B:: @ 81AA70B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_SHEILA, 0, Text_185C69, Text_185C95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA732 msgbox Text_185CA8, 6 end @@ -5569,7 +5569,7 @@ EventScript_1AA732:: @ 81AA732 Route13_EventScript_1AA749:: @ 81AA749 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_185955, Text_18597E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA770 msgbox Text_1859A2, 6 end @@ -5582,7 +5582,7 @@ EventScript_1AA770:: @ 81AA770 Route13_EventScript_1AA787:: @ 81AA787 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_PERRY, 0, Text_185B8F, Text_185BCA specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA7AE msgbox Text_185BDB, 6 end @@ -5595,7 +5595,7 @@ EventScript_1AA7AE:: @ 81AA7AE Route13_EventScript_1AA7C5:: @ 81AA7C5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_185D3D, Text_185D7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA7EC msgbox Text_185D89, 6 end @@ -5608,7 +5608,7 @@ EventScript_1AA7EC:: @ 81AA7EC Route13_EventScript_1AA803:: @ 81AA803 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALMA, 0, Text_185B12, Text_185B48 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA82A msgbox Text_185B67, 6 end @@ -5621,7 +5621,7 @@ EventScript_1AA82A:: @ 81AA82A Route13_EventScript_1AA841:: @ 81AA841 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SUSIE, 0, Text_1859CF, Text_1859EC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA868 msgbox Text_1859F9, 6 end @@ -5634,7 +5634,7 @@ EventScript_1AA868:: @ 81AA868 Route13_EventScript_1AA87F:: @ 81AA87F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_VALERIE, 0, Text_185A37, Text_185A56 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA8A6 msgbox Text_185A62, 6 end @@ -5647,7 +5647,7 @@ EventScript_1AA8A6:: @ 81AA8A6 Route13_EventScript_1AA8BD:: @ 81AA8BD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_GWEN, 0, Text_185A91, Text_185AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA8E4 msgbox Text_185ADE, 6 end @@ -5660,7 +5660,7 @@ EventScript_1AA8E4:: @ 81AA8E4 Route14_EventScript_1AA8FB:: @ 81AA8FB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_MALIK, 0, Text_186344, Text_186362 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA922 msgbox Text_18636E, 6 end @@ -5673,7 +5673,7 @@ EventScript_1AA922:: @ 81AA922 Route14_EventScript_1AA939:: @ 81AA939 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LUKAS, 0, Text_1861F7, Text_186223 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA960 msgbox Text_186239, 6 end @@ -5686,7 +5686,7 @@ EventScript_1AA960:: @ 81AA960 Route14_EventScript_1AA977:: @ 81AA977 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ISAAC, 0, Text_186263, Text_186291 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA99E msgbox Text_18629D, 6 end @@ -5699,7 +5699,7 @@ EventScript_1AA99E:: @ 81AA99E Route14_EventScript_1AA9B5:: @ 81AA9B5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_GERALD, 0, Text_1862BD, Text_1862EF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA9DC msgbox Text_1862F8, 6 end @@ -5712,7 +5712,7 @@ EventScript_1AA9DC:: @ 81AA9DC Route14_EventScript_1AA9F3:: @ 81AA9F3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1860D9, Text_18610A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAA1A msgbox Text_18611D, 6 end @@ -5725,7 +5725,7 @@ EventScript_1AAA1A:: @ 81AAA1A Route14_EventScript_1AAA31:: @ 81AAA31 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BENNY, 0, Text_18618E, Text_1861B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAA58 msgbox Text_1861BE, 6 end @@ -5738,7 +5738,7 @@ EventScript_1AAA58:: @ 81AAA58 Route14_EventScript_1AAA6F:: @ 81AAA6F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CARTER, 0, Text_185E4D, Text_185E81 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAA96 msgbox Text_185E9C, 6 end @@ -5751,7 +5751,7 @@ EventScript_1AAA96:: @ 81AAA96 Route14_EventScript_1AAAAD:: @ 81AAAAD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MITCH, 0, Text_185EDF, Text_185F0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAAD4 msgbox Text_185F1A, 6 end @@ -5764,7 +5764,7 @@ EventScript_1AAAD4:: @ 81AAAD4 Route14_EventScript_1AAAEB:: @ 81AAAEB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BECK, 0, Text_185F46, Text_185FAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAB12 msgbox Text_185FBB, 6 end @@ -5777,7 +5777,7 @@ EventScript_1AAB12:: @ 81AAB12 Route14_EventScript_1AAB29:: @ 81AAB29 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MARLON, 0, Text_186021, Text_18607C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAB50 msgbox Text_186091, 6 end @@ -5790,7 +5790,7 @@ EventScript_1AAB50:: @ 81AAB50 Route14_EventScript_1AAB67:: @ 81AAB67 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1863B7, Text_1863EA, Text_18642E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAB92 msgbox Text_18640D, 6 end @@ -5803,7 +5803,7 @@ EventScript_1AAB92:: @ 81AAB92 Route14_EventScript_1AABAD:: @ 81AABAD trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_18645B, Text_186487, Text_1864D3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AABD8 msgbox Text_18649C, 6 end @@ -5816,7 +5816,7 @@ EventScript_1AABD8:: @ 81AABD8 Route15_EventScript_1AABF3:: @ 81AABF3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ERNEST, 0, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAC1A msgbox Text_1868F1, 6 end @@ -5829,7 +5829,7 @@ EventScript_1AAC1A:: @ 81AAC1A Route15_EventScript_1AAC31:: @ 81AAC31 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ALEX, 0, Text_186936, Text_186968 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAC58 msgbox Text_18697C, 6 end @@ -5842,7 +5842,7 @@ EventScript_1AAC58:: @ 81AAC58 Route15_EventScript_1AAC6F:: @ 81AAC6F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_GRACE, 0, Text_18678B, Text_1867C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAC96 msgbox Text_1867DA, 6 end @@ -5855,7 +5855,7 @@ EventScript_1AAC96:: @ 81AAC96 Route15_EventScript_1AACAD:: @ 81AACAD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_OLIVIA, 0, Text_18680C, Text_186841 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AACD4 msgbox Text_18686F, 6 end @@ -5868,7 +5868,7 @@ EventScript_1AACD4:: @ 81AACD4 Route15_EventScript_1AACEB:: @ 81AACEB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_18664F, Text_18667A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAD12 msgbox Text_18668D, 6 end @@ -5881,7 +5881,7 @@ EventScript_1AAD12:: @ 81AAD12 Route15_EventScript_1AAD29:: @ 81AAD29 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1866D1, Text_186707 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAD50 msgbox Text_18671A, 6 end @@ -5894,7 +5894,7 @@ EventScript_1AAD50:: @ 81AAD50 Route15_EventScript_1AAD67:: @ 81AAD67 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_YAZMIN, 0, Text_186A22, Text_186A40 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAD8E msgbox Text_186A55, 6 end @@ -5907,7 +5907,7 @@ EventScript_1AAD8E:: @ 81AAD8E Route15_EventScript_1AADA5:: @ 81AADA5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KINDRA, 0, Text_18650B, Text_186549 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AADCC msgbox Text_18655A, 6 end @@ -5920,7 +5920,7 @@ EventScript_1AADCC:: @ 81AADCC Route15_EventScript_1AADE3:: @ 81AADE3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_BECKY, 0, Text_1865D3, Text_186612 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAE0A msgbox Text_18661D, 6 end @@ -5933,7 +5933,7 @@ EventScript_1AAE0A:: @ 81AAE0A Route15_EventScript_1AAE21:: @ 81AAE21 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CELIA, 0, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAE48 msgbox Text_1869F4, 6 end @@ -5946,7 +5946,7 @@ EventScript_1AAE48:: @ 81AAE48 Route15_EventScript_1AAE5F:: @ 81AAE5F trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAE8A msgbox Text_186B0A, 6 end @@ -5959,7 +5959,7 @@ EventScript_1AAE8A:: @ 81AAE8A Route15_EventScript_1AAEA5:: @ 81AAEA5 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAED0 msgbox Text_186BD2, 6 end @@ -5972,7 +5972,7 @@ EventScript_1AAED0:: @ 81AAED0 Route16_EventScript_1AAEEB:: @ 81AAEEB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LAO, 0, Text_186C4D, Text_186C5F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAF12 msgbox Text_186C75, 6 end @@ -5985,7 +5985,7 @@ EventScript_1AAF12:: @ 81AAF12 Route16_EventScript_1AAF29:: @ 81AAF29 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_HIDEO, 0, Text_186D39, Text_186D52 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAF50 msgbox Text_186D5A, 6 end @@ -5998,7 +5998,7 @@ EventScript_1AAF50:: @ 81AAF50 Route16_EventScript_1AAF67:: @ 81AAF67 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RUBEN, 0, Text_186E86, Text_186EB4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAF8E msgbox Text_186EC7, 6 end @@ -6011,7 +6011,7 @@ EventScript_1AAF8E:: @ 81AAF8E Route16_EventScript_1AAFA5:: @ 81AAFA5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_KOJI, 0, Text_186CA2, Text_186CBB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAFCC msgbox Text_186CC5, 6 end @@ -6024,7 +6024,7 @@ EventScript_1AAFCC:: @ 81AAFCC Route16_EventScript_1AAFE3:: @ 81AAFE3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_LUKE, 0, Text_186CE5, Text_186D06 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB00A msgbox Text_186D16, 6 end @@ -6037,7 +6037,7 @@ EventScript_1AB00A:: @ 81AB00A Route16_EventScript_1AB021:: @ 81AB021 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_CAMRON, 0, Text_186DD9, Text_186E0D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB048 msgbox Text_186E1C, 6 end @@ -6050,7 +6050,7 @@ EventScript_1AB048:: @ 81AB048 Route16_EventScript_1AB05F:: @ 81AB05F trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB08A msgbox Text_187027, 6 end @@ -6063,7 +6063,7 @@ EventScript_1AB08A:: @ 81AB08A Route16_EventScript_1AB0A5:: @ 81AB0A5 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB0D0 msgbox Text_1870F9, 6 end @@ -6076,7 +6076,7 @@ EventScript_1AB0D0:: @ 81AB0D0 Route17_EventScript_1AB0EB:: @ 81AB0EB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_BILLY, 0, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB112 msgbox Text_1872EB, 6 end @@ -6089,7 +6089,7 @@ EventScript_1AB112:: @ 81AB112 Route17_EventScript_1AB129:: @ 81AB129 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_NIKOLAS, 0, Text_18730A, Text_187325 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB150 msgbox Text_187333, 6 end @@ -6102,7 +6102,7 @@ EventScript_1AB150:: @ 81AB150 Route17_EventScript_1AB167:: @ 81AB167 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAXON, 0, Text_187456, Text_187472 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB18E msgbox Text_187479, 6 end @@ -6115,7 +6115,7 @@ EventScript_1AB18E:: @ 81AB18E Route17_EventScript_1AB1A5:: @ 81AB1A5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_WILLIAM, 0, Text_18749B, Text_1874B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB1CC msgbox Text_1874C9, 6 end @@ -6128,7 +6128,7 @@ EventScript_1AB1CC:: @ 81AB1CC Route17_EventScript_1AB1E3:: @ 81AB1E3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_RAUL, 0, Text_18717E, Text_1871AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB20A msgbox Text_1871BA, 6 end @@ -6141,7 +6141,7 @@ EventScript_1AB20A:: @ 81AB20A Route17_EventScript_1AB221:: @ 81AB221 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ISAIAH, 0, Text_187228, Text_187254 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB248 msgbox Text_18725A, 6 end @@ -6154,7 +6154,7 @@ EventScript_1AB248:: @ 81AB248 Route17_EventScript_1AB25F:: @ 81AB25F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ZEEK, 0, Text_187362, Text_187395 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB286 msgbox Text_18739F, 6 end @@ -6167,7 +6167,7 @@ EventScript_1AB286:: @ 81AB286 Route17_EventScript_1AB29D:: @ 81AB29D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_JAMAL, 0, Text_1873D1, Text_1873EB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB2C4 msgbox Text_1873FF, 6 end @@ -6180,7 +6180,7 @@ EventScript_1AB2C4:: @ 81AB2C4 Route17_EventScript_1AB2DB:: @ 81AB2DB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_COREY, 0, Text_18741D, Text_187429 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB302 msgbox Text_187432, 6 end @@ -6193,7 +6193,7 @@ EventScript_1AB302:: @ 81AB302 Route17_EventScript_1AB319:: @ 81AB319 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_VIRGIL, 0, Text_18727D, Text_187295 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB340 msgbox Text_1872A5, 6 end @@ -6206,7 +6206,7 @@ EventScript_1AB340:: @ 81AB340 Route18_EventScript_1AB357:: @ 81AB357 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_WILTON, 0, Text_187640, Text_187672 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB37E msgbox Text_187677, 6 end @@ -6219,7 +6219,7 @@ EventScript_1AB37E:: @ 81AB37E Route18_EventScript_1AB395:: @ 81AB395 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_18768C, Text_1876B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB3BC msgbox Text_1876C5, 6 end @@ -6232,7 +6232,7 @@ EventScript_1AB3BC:: @ 81AB3BC Route18_EventScript_1AB3D3:: @ 81AB3D3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_JACOB, 0, Text_187704, Text_187726 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB3FA msgbox Text_18772C, 6 end @@ -6245,7 +6245,7 @@ EventScript_1AB3FA:: @ 81AB3FA Route19_EventScript_1AB411:: @ 81AB411 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1877A3, Text_1877DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB438 msgbox Text_1877EE, 6 end @@ -6258,7 +6258,7 @@ EventScript_1AB438:: @ 81AB438 Route19_EventScript_1AB44F:: @ 81AB44F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_REECE, 0, Text_187811, Text_18783E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB476 msgbox Text_187852, 6 end @@ -6271,7 +6271,7 @@ EventScript_1AB476:: @ 81AB476 Route19_EventScript_1AB48D:: @ 81AB48D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_187884, Text_1878A5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB4B4 msgbox Text_1878B1, 6 end @@ -6284,7 +6284,7 @@ EventScript_1AB4B4:: @ 81AB4B4 Route19_EventScript_1AB4CB:: @ 81AB4CB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB4F2 msgbox Text_1878FE, 6 end @@ -6297,7 +6297,7 @@ EventScript_1AB4F2:: @ 81AB4F2 Route19_EventScript_1AB509:: @ 81AB509 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DAVID, 0, Text_187925, Text_187955 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB530 msgbox Text_18795B, 6 end @@ -6310,7 +6310,7 @@ EventScript_1AB530:: @ 81AB530 Route19_EventScript_1AB547:: @ 81AB547 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TONY, 0, Text_187985, Text_1879C3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB56E msgbox Text_1879D3, 6 end @@ -6323,7 +6323,7 @@ EventScript_1AB56E:: @ 81AB56E Route19_EventScript_1AB585:: @ 81AB585 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_AXLE, 0, Text_187AFA, Text_187B25 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB5AC msgbox Text_187B35, 6 end @@ -6336,7 +6336,7 @@ EventScript_1AB5AC:: @ 81AB5AC Route19_EventScript_1AB5C3:: @ 81AB5C3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_187A11, Text_187A44 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB5EA msgbox Text_187A50, 6 end @@ -6349,7 +6349,7 @@ EventScript_1AB5EA:: @ 81AB5EA Route19_EventScript_1AB601:: @ 81AB601 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB628 msgbox Text_187ACA, 6 end @@ -6362,7 +6362,7 @@ EventScript_1AB628:: @ 81AB628 Route19_EventScript_1AB63F:: @ 81AB63F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_187B5D, Text_187B85 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB666 msgbox Text_187B94, 6 end @@ -6375,7 +6375,7 @@ EventScript_1AB666:: @ 81AB666 Route19_EventScript_1AB67D:: @ 81AB67D trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB6A8 msgbox Text_187C9E, 6 end @@ -6388,7 +6388,7 @@ EventScript_1AB6A8:: @ 81AB6A8 Route19_EventScript_1AB6C3:: @ 81AB6C3 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB6EE msgbox Text_187DAD, 6 end @@ -6401,7 +6401,7 @@ EventScript_1AB6EE:: @ 81AB6EE Route20_EventScript_1AB709:: @ 81AB709 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_BARRY, 0, Text_187E40, Text_187E7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB730 msgbox Text_187E83, 6 end @@ -6414,7 +6414,7 @@ EventScript_1AB730:: @ 81AB730 Route20_EventScript_1AB747:: @ 81AB747 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DEAN, 0, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB76E msgbox Text_187FFE, 6 end @@ -6427,7 +6427,7 @@ EventScript_1AB76E:: @ 81AB76E Route20_EventScript_1AB785:: @ 81AB785 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_18802E, Text_18805C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB7AC msgbox Text_18806D, 6 end @@ -6440,7 +6440,7 @@ EventScript_1AB7AC:: @ 81AB7AC Route20_EventScript_1AB7C3:: @ 81AB7C3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_187F24, Text_187F5A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB7EA msgbox Text_187F61, 6 end @@ -6453,7 +6453,7 @@ EventScript_1AB7EA:: @ 81AB7EA Route20_EventScript_1AB801:: @ 81AB801 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1880F8, Text_188119 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB828 msgbox Text_188139, 6 end @@ -6466,7 +6466,7 @@ EventScript_1AB828:: @ 81AB828 Route20_EventScript_1AB83F:: @ 81AB83F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_188218, Text_18825C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB866 msgbox Text_18827B, 6 end @@ -6479,7 +6479,7 @@ EventScript_1AB866:: @ 81AB866 Route20_EventScript_1AB87D:: @ 81AB87D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_187EBB, Text_187EED specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB8A4 msgbox Text_187EF6, 6 end @@ -6492,7 +6492,7 @@ EventScript_1AB8A4:: @ 81AB8A4 Route20_EventScript_1AB8BB:: @ 81AB8BB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROGER, 0, Text_18808E, Text_1880AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB8E2 msgbox Text_1880C8, 6 end @@ -6505,7 +6505,7 @@ EventScript_1AB8E2:: @ 81AB8E2 Route20_EventScript_1AB8F9:: @ 81AB8F9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MISSY, 0, Text_188165, Text_1881A3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB920 msgbox Text_1881B8, 6 end @@ -6518,7 +6518,7 @@ EventScript_1AB920:: @ 81AB920 Route20_EventScript_1AB937:: @ 81AB937 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_IRENE, 0, Text_187F78, Text_187F92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB95E msgbox Text_187FA3, 6 end @@ -6531,7 +6531,7 @@ EventScript_1AB95E:: @ 81AB95E Route21_North_EventScript_1AB975:: @ 81AB975 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_RONALD, 0, Text_18835A, Text_188383 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB99C msgbox Text_188389, 6 end @@ -6544,7 +6544,7 @@ EventScript_1AB99C:: @ 81AB99C Route21_South_EventScript_1AB9B3:: @ 81AB9B3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CLAUDE, 0, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB9DA msgbox Text_188632, 6 end @@ -6557,7 +6557,7 @@ EventScript_1AB9DA:: @ 81AB9DA Route21_North_EventScript_1AB9F1:: @ 81AB9F1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_WADE, 0, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABA18 msgbox Text_18841D, 6 end @@ -6570,7 +6570,7 @@ EventScript_1ABA18:: @ 81ABA18 Route21_South_EventScript_1ABA2F:: @ 81ABA2F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NOLAN, 0, Text_18868C, Text_1886AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABA56 msgbox Text_1886C5, 6 end @@ -6583,7 +6583,7 @@ EventScript_1ABA56:: @ 81ABA56 Route21_North_EventScript_1ABA6D:: @ 81ABA6D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_18843C, Text_18845F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABA94 msgbox Text_188465, 6 end @@ -6596,7 +6596,7 @@ EventScript_1ABA94:: @ 81ABA94 Route21_South_EventScript_1ABAAB:: @ 81ABAAB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JACK, 0, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABAD2 msgbox Text_1884FF, 6 end @@ -6609,7 +6609,7 @@ EventScript_1ABAD2:: @ 81ABAD2 Route21_South_EventScript_1ABAE9:: @ 81ABAE9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JEROME, 0, Text_18851F, Text_188543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABB10 msgbox Text_188555, 6 end @@ -6622,7 +6622,7 @@ EventScript_1ABB10:: @ 81ABB10 Route21_South_EventScript_1ABB27:: @ 81ABB27 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_188592, Text_1885B2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABB4E msgbox Text_1885BF, 6 end @@ -6635,7 +6635,7 @@ EventScript_1ABB4E:: @ 81ABB4E Route21_North_EventScript_1ABB65:: @ 81ABB65 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABB90 msgbox Text_188734, 6 end @@ -6648,7 +6648,7 @@ EventScript_1ABB90:: @ 81ABB90 Route21_North_EventScript_1ABBAB:: @ 81ABBAB trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABBD6 msgbox Text_188812, 6 end @@ -6661,7 +6661,7 @@ EventScript_1ABBD6:: @ 81ABBD6 OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_18961F, Text_18964D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABC18 msgbox Text_189657, 6 end @@ -6674,7 +6674,7 @@ EventScript_1ABC18:: @ 81ABC18 OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_18968C, Text_1896AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABC56 msgbox Text_1896C1, 6 end @@ -6687,7 +6687,7 @@ EventScript_1ABC56:: @ 81ABC56 OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_FINN, 0, Text_1896F9, Text_189728 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABC94 msgbox Text_189740, 6 end @@ -6700,7 +6700,7 @@ EventScript_1ABC94:: @ 81ABC94 OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_189767, Text_1897A4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABCD2 msgbox Text_1897C5, 6 end @@ -6713,7 +6713,7 @@ EventScript_1ABCD2:: @ 81ABCD2 OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TOMMY, 0, Text_1897FF, Text_189833 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABD10 msgbox Text_18984B, 6 end @@ -6726,7 +6726,7 @@ EventScript_1ABD10:: @ 81ABD10 OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_SHARON, 0, Text_189883, Text_1898AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABD4E msgbox Text_1898C4, 6 end @@ -6739,7 +6739,7 @@ EventScript_1ABD4E:: @ 81ABD4E OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1898F0, Text_18991B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABD8C msgbox Text_18992C, 6 end @@ -6752,7 +6752,7 @@ EventScript_1ABD8C:: @ 81ABD8C OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_SHEA, 0, Text_189950, Text_18998C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABDCA msgbox Text_189998, 6 end @@ -6765,7 +6765,7 @@ EventScript_1ABDCA:: @ 81ABDCA OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HUGH, 0, Text_1899CE, Text_189A0A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABE08 msgbox Text_189A13, 6 end @@ -6778,7 +6778,7 @@ EventScript_1ABE08:: @ 81ABE08 OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_BRYCE, 0, Text_189A53, Text_189A92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABE46 msgbox Text_189A9F, 6 end @@ -6791,7 +6791,7 @@ EventScript_1ABE46:: @ 81ABE46 OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CLAIRE, 0, Text_189ACB, Text_189B0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABE84 msgbox Text_189B24, 6 end @@ -6804,7 +6804,7 @@ EventScript_1ABE84:: @ 81ABE84 OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABEC6 msgbox Text_189BA3, 6 end @@ -6817,7 +6817,7 @@ EventScript_1ABEC6:: @ 81ABEC6 OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABF0C msgbox Text_189C7E, 6 end @@ -6830,7 +6830,7 @@ EventScript_1ABF0C:: @ 81ABF0C OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_189D5A, Text_189D8B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABF4E msgbox Text_189DA3, 6 end @@ -6843,7 +6843,7 @@ EventScript_1ABF4E:: @ 81ABF4E ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_NIKKI, 0, Text_189E42, Text_189E72 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABF8C msgbox Text_189E9E, 6 end @@ -6856,7 +6856,7 @@ EventScript_1ABF8C:: @ 81ABF8C ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_VIOLET, 0, Text_189ED4, Text_189EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABFCA msgbox Text_189F21, 6 end @@ -6869,7 +6869,7 @@ EventScript_1ABFCA:: @ 81ABFCA ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_AMIRA, 0, Text_189F63, Text_189F9A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC008 msgbox Text_189FA8, 6 end @@ -6882,7 +6882,7 @@ EventScript_1AC008:: @ 81AC008 ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_ALEXIS, 0, Text_189FDB, Text_189FEE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC046 msgbox Text_18A000, 6 end @@ -6895,7 +6895,7 @@ EventScript_1AC046:: @ 81AC046 ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_18A01F, Text_18A053 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC084 msgbox Text_18A082, 6 end @@ -6908,7 +6908,7 @@ EventScript_1AC084:: @ 81AC084 ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC0C6 msgbox Text_18A106, 6 end @@ -6921,7 +6921,7 @@ EventScript_1AC0C6:: @ 81AC0C6 ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC10C msgbox Text_18A1B2, 6 end @@ -6934,7 +6934,7 @@ EventScript_1AC10C:: @ 81AC10C FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_DAISY, 0, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC14E msgbox Text_18A430, 6 end @@ -6947,7 +6947,7 @@ EventScript_1AC14E:: @ 81AC14E FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_CELINA, 0, Text_18A461, Text_18A49E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC18C msgbox Text_18A4C6, 6 end @@ -6960,7 +6960,7 @@ EventScript_1AC18C:: @ 81AC18C FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_RAYNA, 0, Text_18A50E, Text_18A535 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC1CA msgbox Text_18A555, 6 end @@ -6973,7 +6973,7 @@ EventScript_1AC1CA:: @ 81AC1CA FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_JACKI, 0, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC208 msgbox Text_18A601, 6 end @@ -6986,7 +6986,7 @@ EventScript_1AC208:: @ 81AC208 FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_GILLIAN, 0, Text_18A645, Text_18A67F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC246 msgbox Text_18A699, 6 end @@ -6999,7 +6999,7 @@ EventScript_1AC246:: @ 81AC246 FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DESTIN, 0, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC284 msgbox Text_18A715, 6 end @@ -7012,7 +7012,7 @@ EventScript_1AC284:: @ 81AC284 FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TOBY, 0, Text_18A74A, Text_18A786 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC2C2 msgbox Text_18A7AC, 6 end @@ -7025,7 +7025,7 @@ EventScript_1AC2C2:: @ 81AC2C2 FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC300 msgbox Text_18AB37, 6 end @@ -7038,7 +7038,7 @@ EventScript_1AC300:: @ 81AC300 FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MILO, 0, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC33E msgbox Text_18AEB6, 6 end @@ -7051,7 +7051,7 @@ EventScript_1AC33E:: @ 81AC33E FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC37C msgbox Text_18AF45, 6 end @@ -7064,7 +7064,7 @@ EventScript_1AC37C:: @ 81AC37C FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC3BA msgbox Text_18AFF2, 6 end @@ -7077,7 +7077,7 @@ EventScript_1AC3BA:: @ 81AC3BA SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TYLOR, 0, Text_18B400, Text_18B43B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC3F8 msgbox Text_18B451, 6 end @@ -7090,7 +7090,7 @@ EventScript_1AC3F8:: @ 81AC3F8 SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MYMO, 0, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC436 msgbox Text_18B4D1, 6 end @@ -7103,7 +7103,7 @@ EventScript_1AC436:: @ 81AC436 SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC474 msgbox Text_18B573, 6 end @@ -7116,7 +7116,7 @@ EventScript_1AC474:: @ 81AC474 SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC4B6 msgbox Text_18B62E, 6 end @@ -7129,7 +7129,7 @@ EventScript_1AC4B6:: @ 81AC4B6 SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC4FC msgbox Text_18B720, 6 end @@ -7142,7 +7142,7 @@ EventScript_1AC4FC:: @ 81AC4FC SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JACLYN, 0, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC53E msgbox Text_18B7FD, 6 end @@ -7155,7 +7155,7 @@ EventScript_1AC53E:: @ 81AC53E SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_ROSE, 0, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC57C msgbox Text_18B8F7, 6 end @@ -7168,7 +7168,7 @@ EventScript_1AC57C:: @ 81AC57C SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_EDWARD, 0, Text_18B959, Text_18B988 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC5BA msgbox Text_18B9A5, 6 end @@ -7181,7 +7181,7 @@ EventScript_1AC5BA:: @ 81AC5BA SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC5F8 msgbox Text_18BA57, 6 end @@ -7194,7 +7194,7 @@ EventScript_1AC5F8:: @ 81AC5F8 SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC636 msgbox Text_18BAE0, 6 end @@ -7207,7 +7207,7 @@ EventScript_1AC636:: @ 81AC636 SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC678 msgbox Text_18BBF6, 6 end @@ -7220,7 +7220,7 @@ EventScript_1AC678:: @ 81AC678 SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC6BE msgbox Text_18BCAE, 6 end @@ -7233,7 +7233,7 @@ EventScript_1AC6BE:: @ 81AC6BE SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_EARL, 0, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC700 msgbox Text_18BB8B, 6 end @@ -7246,7 +7246,7 @@ EventScript_1AC700:: @ 81AC700 SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_STANLY, 0, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC73E msgbox Text_18BEA0, 6 end @@ -7259,7 +7259,7 @@ EventScript_1AC73E:: @ 81AC73E SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC77C msgbox Text_18BF6C, 6 end @@ -7272,7 +7272,7 @@ EventScript_1AC77C:: @ 81AC77C SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LARRY, 0, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC7BA msgbox Text_18C04C, 6 end @@ -7285,7 +7285,7 @@ EventScript_1AC7BA:: @ 81AC7BA SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DARYL, 0, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC7F8 msgbox Text_18C0EA, 6 end @@ -7298,7 +7298,7 @@ EventScript_1AC7F8:: @ 81AC7F8 SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HECTOR, 0, Text_18C10A, Text_18C140 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC836 msgbox Text_18C17A, 6 end @@ -7311,7 +7311,7 @@ EventScript_1AC836:: @ 81AC836 SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_DARIO, 0, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC874 msgbox Text_18C20E, 6 end @@ -7324,7 +7324,7 @@ EventScript_1AC874:: @ 81AC874 SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_RODETTE, 0, Text_18C283, Text_18C2BC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC8B2 msgbox Text_18C2D5, 6 end @@ -7337,7 +7337,7 @@ EventScript_1AC8B2:: @ 81AC8B2 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_MIAH, 0, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC8F0 msgbox Text_18C3FF, 6 end @@ -7350,7 +7350,7 @@ EventScript_1AC8F0:: @ 81AC8F0 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC932 msgbox Text_18C683, 6 end @@ -7363,7 +7363,7 @@ EventScript_1AC932:: @ 81AC932 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC978 msgbox Text_18C773, 6 end @@ -7376,7 +7376,7 @@ EventScript_1AC978:: @ 81AC978 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_MASON, 0, Text_18C44B, Text_18C473 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC9BA msgbox Text_18C4BA, 6 end @@ -7389,7 +7389,7 @@ EventScript_1AC9BA:: @ 81AC9BA SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_18C500, Text_18C543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC9F8 msgbox Text_18C54B, 6 end @@ -7402,7 +7402,7 @@ EventScript_1AC9F8:: @ 81AC9F8 SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_MADELINE, 0, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACA36 msgbox Text_18C5F5, 6 end @@ -7415,7 +7415,7 @@ EventScript_1ACA36:: @ 81ACA36 SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACA74 msgbox Text_18C8C2, 6 end @@ -7428,7 +7428,7 @@ EventScript_1ACA74:: @ 81ACA74 SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EVAN, 0, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACAB2 msgbox Text_18C999, 6 end @@ -7441,7 +7441,7 @@ EventScript_1ACAB2:: @ 81ACAB2 SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_JACKSON, 0, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACAF0 msgbox Text_18CA9C, 6 end @@ -7454,7 +7454,7 @@ EventScript_1ACAF0:: @ 81ACAF0 SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_KATELYN, 0, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACB2E msgbox Text_18CB6C, 6 end @@ -7467,7 +7467,7 @@ EventScript_1ACB2E:: @ 81ACB2E SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_LEROY, 0, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACB6C msgbox Text_18CC09, 6 end @@ -7480,7 +7480,7 @@ EventScript_1ACB6C:: @ 81ACB6C SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MICHELLE, 0, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACBAA msgbox Text_18CCEA, 6 end @@ -7493,7 +7493,7 @@ EventScript_1ACBAA:: @ 81ACBAA SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACBEC msgbox Text_18CD9C, 6 end @@ -7506,7 +7506,7 @@ EventScript_1ACBEC:: @ 81ACBEC SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACC32 msgbox Text_18CE78, 6 end @@ -7519,7 +7519,7 @@ EventScript_1ACC32:: @ 81ACC32 SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_18CFFB, Text_18D02A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACC74 msgbox Text_18D061, 6 end @@ -7532,7 +7532,7 @@ EventScript_1ACC74:: @ 81ACC74 SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_18D0D9, Text_18D108 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACCB2 msgbox Text_18D125, 6 end @@ -7545,7 +7545,7 @@ EventScript_1ACCB2:: @ 81ACCB2 SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_EDNA, 0, Text_18D18F, Text_18D1B5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACCF0 msgbox Text_18D1E3, 6 end @@ -7558,7 +7558,7 @@ EventScript_1ACCF0:: @ 81ACCF0 SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_18D22F, Text_18D26D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACD2E msgbox Text_18D284, 6 end @@ -7867,10 +7867,10 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 lockall showmoneybox 0, 0, 0 msgbox gUnknown_81B1D7D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1B2926 checkmoney 50, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1B292B playse SE_SHOP takemoney 50, 0 @@ -7956,7 +7956,7 @@ EventScript_1B2951:: @ 81B2951 waitmovement 0 applymovement 1, Movement_1A75DD waitmovement 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_if eq, EventScript_1B2B8E message gUnknown_81B1EF8 waitmessage @@ -7969,10 +7969,10 @@ EventScript_1B2994:: @ 81B2994 applymovement 1, Movement_1A75E1 waitmovement 0 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_if eq, EventScript_1B29C6 message gUnknown_81B2025 waitmessage @@ -8064,18 +8064,18 @@ EventScript_1B2B8E:: @ 81B2B8E end EventScript_1B2B98:: @ 81B2B98 - compare_var_to_value VAR_0x8004, 39 + compare VAR_0x8004, 39 goto_if le, EventScript_1B2BC5 - compare_var_to_value VAR_0x8004, 99 + compare VAR_0x8004, 99 goto_if le, EventScript_1B2BE3 - compare_var_to_value VAR_0x8004, 199 + compare VAR_0x8004, 199 goto_if le, EventScript_1B2C01 - compare_var_to_value VAR_0x8004, 200 + compare VAR_0x8004, 200 goto_if ge, EventScript_1B2C1F end EventScript_1B2BC5:: @ 81B2BC5 - compare_var_to_value VAR_HOF_BRAG_STATE, 1 + compare VAR_HOF_BRAG_STATE, 1 goto_if eq, EventScript_1B2C3D setvar VAR_HOF_BRAG_STATE, 1 msgbox gUnknown_81B206E @@ -8085,7 +8085,7 @@ EventScript_1B2BE2:: @ 81B2BE2 end EventScript_1B2BE3:: @ 81B2BE3 - compare_var_to_value VAR_HOF_BRAG_STATE, 2 + compare VAR_HOF_BRAG_STATE, 2 goto_if eq, EventScript_1B2C3D setvar VAR_HOF_BRAG_STATE, 2 msgbox gUnknown_81B20CF @@ -8095,7 +8095,7 @@ EventScript_1B2C00:: @ 81B2C00 end EventScript_1B2C01:: @ 81B2C01 - compare_var_to_value VAR_HOF_BRAG_STATE, 3 + compare VAR_HOF_BRAG_STATE, 3 goto_if eq, EventScript_1B2C3D setvar VAR_HOF_BRAG_STATE, 3 msgbox gUnknown_81B2133 @@ -8105,7 +8105,7 @@ EventScript_1B2C1E:: @ 81B2C1E end EventScript_1B2C1F:: @ 81B2C1F - compare_var_to_value VAR_HOF_BRAG_STATE, 4 + compare VAR_HOF_BRAG_STATE, 4 goto_if eq, EventScript_1B2C47 setvar VAR_HOF_BRAG_STATE, 4 msgbox gUnknown_81B21C4 @@ -8135,18 +8135,18 @@ EventScript_1B2C51:: @ 81B2C51 end EventScript_1B2C62:: @ 81B2C62 - compare_var_to_value VAR_0x8005, 99 + compare VAR_0x8005, 99 goto_if le, EventScript_1B2C8F - compare_var_to_value VAR_0x8005, 199 + compare VAR_0x8005, 199 goto_if le, EventScript_1B2CAD - compare_var_to_value VAR_0x8005, 299 + compare VAR_0x8005, 299 goto_if le, EventScript_1B2CCB - compare_var_to_value VAR_0x8005, 300 + compare VAR_0x8005, 300 goto_if ge, EventScript_1B2CE9 end EventScript_1B2C8F:: @ 81B2C8F - compare_var_to_value VAR_EGG_BRAG_STATE, 1 + compare VAR_EGG_BRAG_STATE, 1 goto_if eq, EventScript_1B2D07 setvar VAR_EGG_BRAG_STATE, 1 msgbox gUnknown_81B2308 @@ -8156,7 +8156,7 @@ EventScript_1B2CAC:: @ 81B2CAC end EventScript_1B2CAD:: @ 81B2CAD - compare_var_to_value VAR_EGG_BRAG_STATE, 2 + compare VAR_EGG_BRAG_STATE, 2 goto_if eq, EventScript_1B2D07 setvar VAR_EGG_BRAG_STATE, 2 msgbox gUnknown_81B2372 @@ -8166,7 +8166,7 @@ EventScript_1B2CCA:: @ 81B2CCA end EventScript_1B2CCB:: @ 81B2CCB - compare_var_to_value VAR_EGG_BRAG_STATE, 3 + compare VAR_EGG_BRAG_STATE, 3 goto_if eq, EventScript_1B2D07 setvar VAR_EGG_BRAG_STATE, 3 msgbox gUnknown_81B23E0 @@ -8176,7 +8176,7 @@ EventScript_1B2CE8:: @ 81B2CE8 end EventScript_1B2CE9:: @ 81B2CE9 - compare_var_to_value VAR_EGG_BRAG_STATE, 4 + compare VAR_EGG_BRAG_STATE, 4 goto_if eq, EventScript_1B2D11 setvar VAR_EGG_BRAG_STATE, 4 msgbox gUnknown_81B2448 @@ -8206,18 +8206,18 @@ EventScript_1B2D1B:: @ 81B2D1B end EventScript_1B2D2C:: @ 81B2D2C - compare_var_to_value VAR_0x8006, 19 + compare VAR_0x8006, 19 goto_if le, EventScript_1B2D59 - compare_var_to_value VAR_0x8006, 49 + compare VAR_0x8006, 49 goto_if le, EventScript_1B2D77 - compare_var_to_value VAR_0x8006, 99 + compare VAR_0x8006, 99 goto_if le, EventScript_1B2D95 - compare_var_to_value VAR_0x8006, 100 + compare VAR_0x8006, 100 goto_if ge, EventScript_1B2DB3 end EventScript_1B2D59:: @ 81B2D59 - compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 1 + compare VAR_LINK_WIN_BRAG_STATE, 1 goto_if eq, EventScript_1B2DD1 setvar VAR_LINK_WIN_BRAG_STATE, 1 msgbox gUnknown_81B25A7 @@ -8227,7 +8227,7 @@ EventScript_1B2D76:: @ 81B2D76 end EventScript_1B2D77:: @ 81B2D77 - compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 2 + compare VAR_LINK_WIN_BRAG_STATE, 2 goto_if eq, EventScript_1B2DD1 setvar VAR_LINK_WIN_BRAG_STATE, 2 msgbox gUnknown_81B2609 @@ -8237,7 +8237,7 @@ EventScript_1B2D94:: @ 81B2D94 end EventScript_1B2D95:: @ 81B2D95 - compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 3 + compare VAR_LINK_WIN_BRAG_STATE, 3 goto_if eq, EventScript_1B2DD1 setvar VAR_LINK_WIN_BRAG_STATE, 3 msgbox gUnknown_81B267B @@ -8247,7 +8247,7 @@ EventScript_1B2DB2:: @ 81B2DB2 end EventScript_1B2DB3:: @ 81B2DB3 - compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 4 + compare VAR_LINK_WIN_BRAG_STATE, 4 goto_if eq, EventScript_1B2DDB setvar VAR_LINK_WIN_BRAG_STATE, 4 msgbox gUnknown_81B26F6 @@ -8306,7 +8306,7 @@ ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 EventScript_1BB1BA:: @ 81BB1BA specialvar VAR_RESULT, ValidateReceivedWonderCard - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB1CE clearflag FLAG_HIDE_MG_DELIVERYMEN return @@ -8336,7 +8336,7 @@ CeladonCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 LavenderTown_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 ViridianCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 execram @@ -8374,7 +8374,7 @@ ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED .2byte 0 EventScript_1BB227:: @ 81BB227 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_1BB236 turnobject VAR_0x8007, 3 EventScript_1BB236: @@ -8400,19 +8400,19 @@ TwoIsland_JoyfulGameCorner_MapScript4_1BB237:: @ 81BB237 TwoIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 VermilionCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 ViridianCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 - compare_var_to_value VAR_0x406F, 1 + compare VAR_0x406F, 1 goto_if eq, EventScript_1BB285 - compare_var_to_value VAR_0x406F, 2 + compare VAR_0x406F, 2 goto_if eq, EventScript_1BB285 - compare_var_to_value VAR_0x406F, 5 + compare VAR_0x406F, 5 goto_if eq, EventScript_1BB285 - compare_var_to_value VAR_0x406F, 3 + compare VAR_0x406F, 3 goto_if eq, EventScript_1BB28B - compare_var_to_value VAR_0x406F, 6 + compare VAR_0x406F, 6 goto_if eq, EventScript_1BB291 - compare_var_to_value VAR_0x406F, 7 + compare VAR_0x406F, 7 goto_if eq, EventScript_1BB297 - compare_var_to_value VAR_0x406F, 8 + compare VAR_0x406F, 8 goto_if eq, EventScript_1BB29D end @@ -8491,7 +8491,7 @@ EventScript_1BB315:: @ 81BB315 special sub_811390C setvar VAR_0x406F, 0 textcolor 1 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_1BB40A applymovement VAR_0x8007, Movement_1BB88F waitmovement 0 @@ -8517,7 +8517,7 @@ EventScript_1BB367:: @ 81BB367 special sub_811390C setvar VAR_0x406F, 0 textcolor 1 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_1BB40A applymovement 255, Movement_1BB8A0 waitmovement 0 @@ -8541,7 +8541,7 @@ EventScript_1BB3B4:: @ 81BB3B4 special sub_811390C setvar VAR_0x406F, 0 textcolor 1 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_1BB40A applymovement 255, Movement_1BB8A0 waitmovement 0 @@ -8645,7 +8645,7 @@ EventScript_1BB519:: @ 81BB519 EventScript_1BB51A:: @ 81BB51A special CheckForAlivePartyMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1BB533 setvar VAR_0x8004, 2 goto EventScript_1BB54C @@ -8669,7 +8669,7 @@ EventScript_1BB54B:: @ 81BB54B EventScript_1BB54C:: @ 81BB54C call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F message gUnknown_81BC4AC waitmessage @@ -8678,17 +8678,17 @@ EventScript_1BB54C:: @ 81BB54C special sub_8081064 waitstate call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB5B3 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1BB80F - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_1BB81F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if eq, EventScript_1BB63C - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BB82F - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BB7FF end @@ -8716,7 +8716,7 @@ EventScript_1BB5B3:: @ 81BB5B3 closedoor 9, 1 waitdooranim release - compare_var_to_value VAR_0x8004, 5 + compare VAR_0x8004, 5 goto_if eq, EventScript_1BB62C special SetCableClubWarp warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 @@ -8780,10 +8780,10 @@ EventScript_1BB69B:: @ 81BB69B EventScript_1BB6AB:: @ 81BB6AB copyvar VAR_0x8007, VAR_LAST_TALKED call EventScript_1BB79C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F message gUnknown_81BC4AC waitmessage @@ -8792,21 +8792,21 @@ EventScript_1BB6AB:: @ 81BB6AB special sub_80810CC waitstate call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB73D - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1BB80F - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_1BB81F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if eq, EventScript_1BB857 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BB82F - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BB7FF - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_1BB7DF - compare_var_to_value VAR_RESULT, 9 + compare VAR_RESULT, 9 goto_if eq, EventScript_1BB7EF end @@ -8840,10 +8840,10 @@ EventScript_1BB73D:: @ 81BB73D EventScript_1BB79C:: @ 81BB79C specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if lt, EventScript_1BB7C2 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB7D0 setvar VAR_RESULT, 1 return @@ -8990,7 +8990,7 @@ Movement_1BB8A2:: @ 81BB8A2 gUnknown_81BB8A7:: @ 81BB8A7 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall fadescreen 1 @@ -9021,7 +9021,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB fadescreen 1 special sub_80A0334 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 0 textcolor 3 @@ -9034,7 +9034,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 fadescreen 1 special sub_80A0334 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 1 textcolor 3 @@ -9047,7 +9047,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 fadescreen 1 special sub_80A0334 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 2 textcolor 3 @@ -9060,7 +9060,7 @@ UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 fadescreen 1 special sub_80A0334 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 3 textcolor 3 @@ -9149,7 +9149,7 @@ UnknownMap_00_02_EventScript_1BB9D3:: @ 81BB9D3 gUnknown_81BB9D4:: @ 81BB9D4 textcolor 3 msgbox gUnknown_81BC7A1, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB9F0 erasebox 0, 0, 29, 19 releaseall @@ -9170,7 +9170,7 @@ gUnknown_81BB9FC:: @ 81BB9FC EventScript_1BBA04:: @ 81BBA04 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -9178,11 +9178,11 @@ EventScript_1BBA04:: @ 81BBA04 checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB877 specialvar VAR_RESULT, Special_BadEggInParty - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB867 copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BBB60 message Text_1BD65B waitmessage @@ -9210,10 +9210,10 @@ EventScript_1BBA93:: @ 81BBA93 EventScript_1BBA94:: @ 81BBA94 call EventScript_1BBB1E - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F msgbox gUnknown_81BD86A closemessage @@ -9246,10 +9246,10 @@ EventScript_1BBA94:: @ 81BBA94 EventScript_1BBB1E:: @ 81BBB1E specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if lt, EventScript_1BBB44 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBB52 setvar VAR_RESULT, 1 return @@ -9279,7 +9279,7 @@ EventScript_1BBB6A:: @ 81BBB6A checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB877 msgbox gUnknown_81BDB85, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BBB92 msgbox gUnknown_81BDBF8 release @@ -9292,7 +9292,7 @@ EventScript_1BBB92:: @ 81BBB92 EventScript_1BBB9C:: @ 81BBB9C special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -9300,10 +9300,10 @@ EventScript_1BBB9C:: @ 81BBB9C checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB877 specialvar VAR_RESULT, Special_BadEggInParty - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB867 specialvar VAR_RESULT, IsWirelessAdapterConnected - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB44A message Text_1BD28D waitmessage @@ -9336,10 +9336,10 @@ EventScript_1BBC32:: @ 81BBC32 EventScript_1BBC69:: @ 81BBC69 msgbox gUnknown_81BD317, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F call EventScript_1BB79C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F setvar VAR_0x8004, 3 goto EventScript_1BBD6F @@ -9369,7 +9369,7 @@ EventScript_1BBCF4:: @ 81BBCF4 EventScript_1BBCF5:: @ 81BBCF5 special CheckForAlivePartyMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1BBD0E setvar VAR_0x8004, 1 goto EventScript_1BBD6F @@ -9400,10 +9400,10 @@ EventScript_1BBD34:: @ 81BBD34 EventScript_1BBD35:: @ 81BBD35 msgbox gUnknown_81BD362, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F special CheckHasAtLeastOneBerry - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BBD61 setvar VAR_0x8004, 5 goto EventScript_1BBD6F @@ -9420,7 +9420,7 @@ EventScript_1BBD6E:: @ 81BBD6E EventScript_1BBD6F:: @ 81BBD6F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F switch VAR_0x8004 case 3, EventScript_1BBDBC @@ -9445,22 +9445,22 @@ EventScript_1BBDBC:: @ 81BBDBC EventScript_1BBE00:: @ 81BBE00 call EventScript_1BBF78 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBDBC - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBE00 release return EventScript_1BBE28:: @ 81BBE28 call EventScript_1BBF80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBDBC - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBE28 release return @@ -9480,22 +9480,22 @@ EventScript_1BBE50:: @ 81BBE50 EventScript_1BBE94:: @ 81BBE94 call EventScript_1BBF78 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBE50 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBE94 release return EventScript_1BBEBC:: @ 81BBEBC call EventScript_1BBF80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBE50 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBEBC release return @@ -9515,22 +9515,22 @@ EventScript_1BBEE4:: @ 81BBEE4 EventScript_1BBF28:: @ 81BBF28 call EventScript_1BBF78 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBEE4 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBF28 release return EventScript_1BBF50:: @ 81BBF50 call EventScript_1BBF80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBEE4 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBF50 release return @@ -9575,13 +9575,13 @@ EventScript_1BBF88:: @ 81BBF88 gUnknown_81BBFD8:: @ 81BBFD8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB881 specialvar VAR_RESULT, IsWirelessAdapterConnected - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BC016 special HelpSystem_Disable fadescreen 1 @@ -9645,7 +9645,7 @@ ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C EventScript_1BC060:: @ 81BC060 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -9677,7 +9677,7 @@ EventScript_1BC0C4:: @ 81BC0C4 EventScript_1BC0CE:: @ 81BC0CE special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -9685,7 +9685,7 @@ EventScript_1BC0CE:: @ 81BC0CE message Text_1BCF69 waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BC29C delay 60 special HelpSystem_Disable @@ -9702,16 +9702,16 @@ EventScript_1BC0CE:: @ 81BC0CE EventScript_1BC13A:: @ 81BC13A setvar VAR_0x8005, 0 special sub_8149A18 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 0 special ChooseMonForWirelessMinigame waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1BB83F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB83F setvar VAR_0x8004, 4 goto EventScript_1BC1CE @@ -9722,16 +9722,16 @@ EventScript_1BC183:: @ 81BC183 EventScript_1BC184:: @ 81BC184 setvar VAR_0x8005, 1 special sub_81537C0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 1 special ChooseMonForWirelessMinigame waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1BB83F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB83F setvar VAR_0x8004, 6 goto EventScript_1BC1CE @@ -9754,22 +9754,22 @@ EventScript_1BC1CE:: @ 81BC1CE EventScript_1BC212:: @ 81BC212 call EventScript_1BBF78 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BC262 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BC1CE - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BC212 release return EventScript_1BC23A:: @ 81BC23A call EventScript_1BBF80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BC262 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BC1CE - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BC23A release return @@ -9801,11 +9801,11 @@ EventScript_1BC29C:: @ 81BC29C EventScript_1BC2A6:: @ 81BC2A6 msgbox gUnknown_81BD0CF, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB83F - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if eq, EventScript_1BC2D5 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if eq, EventScript_1BC2DE goto EventScript_1BB83F @@ -9822,7 +9822,7 @@ EventScript_1BC2DE:: @ 81BC2DE TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall special sub_814B504 @@ -9832,7 +9832,7 @@ TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall special sub_8153810 @@ -10296,19 +10296,19 @@ gUnknown_81BDEDF:: @ 81BDEDF EventScript_InteractWithCutTreeObject:: @ 81BDF13 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE02_GET goto_if FALSE, EventScript_1BDF87 checkpartymove MOVE_CUT - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BDF87 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_CUT msgbox gUnknown_81BDF94, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BDF91 msgbox gUnknown_81BDFD7 closemessage @@ -10359,19 +10359,19 @@ gUnknown_81BDFE3:: @ 81BDFE3 EventScript_InteractWithRockSmashRockObject:: @ 81BE00C special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE06_GET goto_if FALSE, EventScript_1BE091 checkpartymove MOVE_ROCK_SMASH - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE091 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_ROCK_SMASH msgbox Text_1BE09D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE09A msgbox gUnknown_81BDFD7 closemessage @@ -10392,7 +10392,7 @@ EventScript_1BE06F:: @ 81BE06F waitmovement 0 removeobject VAR_LAST_TALKED special ScrSpecial_RockSmashWildEncounter - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE08D waitstate releaseall @@ -10425,7 +10425,7 @@ gUnknown_81BE0E2:: @ 81BE0E2 EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE04_GET @@ -10433,11 +10433,11 @@ EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D checkflag FLAG_SYS_STRENGTH_ACTIVE goto_if TRUE, EventScript_1BE18E checkpartymove MOVE_STRENGTH - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE185 setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE19A, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE197 closemessage dofieldeffect FLDEFF_USE_STRENGTH @@ -10490,16 +10490,16 @@ gUnknown_81BE284:: @ 81BE284 gUnknown_81BE2B7:: @ 81BE2B7 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkpartymove MOVE_WATERFALL - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE300 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE33F, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE308 msgbox gUnknown_81BE378 dofieldeffect FLDEFF_USE_WATERFALL @@ -10528,13 +10528,13 @@ gUnknown_81BE378:: @ 81BE378 EventScript_1BE38B:: @ 81BE38B lockall checkpartymove MOVE_DIVE - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE3CA getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE469, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE3D2 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -10551,13 +10551,13 @@ EventScript_1BE3D2: EventScript_1BE3D4:: @ 81BE3D4 lockall checkpartymove MOVE_DIVE - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE412 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE4EF, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE429 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -11280,7 +11280,7 @@ SilphCo_4F_EventScript_1BEE09:: @ 81BEE09 PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 lock faceplayer - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_if eq, EventScript_1BEE3A checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE goto_if TRUE, EventScript_1BEECD @@ -11382,11 +11382,11 @@ EventScript_1BEF5A:: @ 81BEF5A call EventScript_1A6AC0 lock faceplayer - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_if eq, EventScript_1BEF3F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BEE9E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BEEA8 end @@ -11460,16 +11460,16 @@ gUnknown_81BF36A:: @ 81BF36A Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 specialvar VAR_RESULT, IsThereMonInRoute5Daycare - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF46E msgbox Text_19DD66, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF3DD msgbox Text_19DDB2 goto EventScript_1BF541 @@ -11477,7 +11477,7 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 EventScript_1BF3DD:: @ 81BF3DD specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF452 msgbox Text_19DDBE fadescreen 1 @@ -11485,10 +11485,10 @@ EventScript_1BF3DD:: @ 81BF3DD special ChooseSendDaycareMon waitstate showmoneybox 0, 0, 0 - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1BF444 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BF460 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies msgbox Text_19DDF9 @@ -11519,13 +11519,13 @@ EventScript_1BF460:: @ 81BF460 EventScript_1BF46E:: @ 81BF46E setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if ne, EventScript_1BF4AA - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1BF4B3 special GetCostToWithdrawRoute5DaycareMon msgbox Text_19DE80, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF4BC goto EventScript_1BF444 end @@ -11540,10 +11540,10 @@ EventScript_1BF4B3:: @ 81BF4B3 EventScript_1BF4BC:: @ 81BF4BC specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BF533 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF4EA msgbox Text_19E001 goto EventScript_1BF541 @@ -11744,7 +11744,7 @@ EventScript_1BFB98:: @ 81BFB98 EventScript_SafariRetire:: @ 81BFBAA lockall msgbox Text_1BFBE9, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BFBC0 releaseall end @@ -13405,15 +13405,15 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE checkflag FLAG_TUTOR_DOUBLE_EDGE goto_if TRUE, EventScript_1C480C msgbox Text_1749F9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4802 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4802 msgbox Text_174AE2 setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4802 setflag FLAG_TUTOR_DOUBLE_EDGE goto EventScript_1C480C @@ -13435,15 +13435,15 @@ EventScript_1C4816:: @ 81C4816 checkflag FLAG_TUTOR_THUNDER_WAVE goto_if TRUE, EventScript_1C4874 msgbox Text_175711, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C486A call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C486A msgbox Text_1757C1 setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C486A setflag FLAG_TUTOR_THUNDER_WAVE goto EventScript_1C4874 @@ -13465,15 +13465,15 @@ RockTunnel_B1F_EventScript_1C487E:: @ 81C487E checkflag FLAG_TUTOR_ROCK_SLIDE goto_if TRUE, EventScript_1C48DC msgbox Text_1799E0, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C48D2 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C48D2 msgbox Text_179AE1 setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C48D2 setflag FLAG_TUTOR_ROCK_SLIDE goto EventScript_1C48DC @@ -13495,15 +13495,15 @@ MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 checkflag FLAG_TUTOR_EXPLOSION goto_if TRUE, EventScript_1C4944 msgbox Text_17A642, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C493A call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C493A msgbox Text_17A717 setvar VAR_0x8005, MOVETUTOR_EXPLOSION call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C493A setflag FLAG_TUTOR_EXPLOSION goto EventScript_1C4944 @@ -13525,15 +13525,15 @@ Route4_EventScript_1C494E:: @ 81C494E checkflag FLAG_TUTOR_META_PUNCH goto_if TRUE, EventScript_1C49AC msgbox Text_1839D5, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C49A2 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C49A2 msgbox Text_183ABF setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C49A2 setflag FLAG_TUTOR_META_PUNCH goto EventScript_1C49AC @@ -13555,15 +13555,15 @@ Route4_EventScript_1C49B6:: @ 81C49B6 checkflag FLAG_TUTOR_MEGA_KICK goto_if TRUE, EventScript_1C4A14 msgbox Text_183B74, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A0A call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A0A msgbox Text_183C68 setvar VAR_0x8005, MOVETUTOR_MEGA_KICK call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A0A setflag FLAG_TUTOR_MEGA_KICK goto EventScript_1C4A14 @@ -13585,15 +13585,15 @@ EventScript_1C4A1E:: @ 81C4A1E checkflag FLAG_TUTOR_DREAM_EATER goto_if TRUE, EventScript_1C4A7C msgbox Text_17E316, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A72 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A72 msgbox Text_17E3F1 setvar VAR_0x8005, MOVETUTOR_DREAM_EATER call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A72 setflag FLAG_TUTOR_DREAM_EATER goto EventScript_1C4A7C @@ -13615,15 +13615,15 @@ EventScript_1C4A86:: @ 81C4A86 checkflag FLAG_TUTOR_SOFT_BOILED goto_if TRUE, EventScript_1C4AE4 msgbox Text_180388, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4ADA call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4ADA msgbox Text_180484 setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4ADA setflag FLAG_TUTOR_SOFT_BOILED goto EventScript_1C4AE4 @@ -13645,15 +13645,15 @@ FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE checkflag FLAG_TUTOR_SUBSTITUTE goto_if TRUE, EventScript_1C4B4C msgbox Text_180948, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4B42 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4B42 msgbox Text_180A57 setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4B42 setflag FLAG_TUTOR_SUBSTITUTE goto EventScript_1C4B4C @@ -13675,15 +13675,15 @@ SevenIsland_EventScript_1C4B56:: @ 81C4B56 checkflag FLAG_TUTOR_SWORDS_DANCE goto_if TRUE, EventScript_1C4BB4 msgbox Text_182F01, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4BAA call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4BAA msgbox Text_182FD9 setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4BAA setflag FLAG_TUTOR_SWORDS_DANCE goto EventScript_1C4BB4 @@ -13705,15 +13705,15 @@ PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE checkflag FLAG_TUTOR_SEISMIC_TOSS goto_if TRUE, EventScript_1C4C1C msgbox Text_1909A3, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C12 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C12 msgbox Text_190AD5 setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C12 setflag FLAG_TUTOR_SEISMIC_TOSS goto EventScript_1C4C1C @@ -13735,15 +13735,15 @@ EventScript_1C4C26:: @ 81C4C26 checkflag FLAG_TUTOR_COUNTER goto_if TRUE, EventScript_1C4C84 msgbox Text_195928, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C7A call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C7A msgbox Text_195A08 setvar VAR_0x8005, MOVETUTOR_COUNTER call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C7A setflag FLAG_TUTOR_COUNTER goto EventScript_1C4C84 @@ -13765,15 +13765,15 @@ EventScript_1C4C8E:: @ 81C4C8E checkflag FLAG_TUTOR_METRONOME goto_if TRUE, EventScript_1C4CEC msgbox Text_19A137, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4CE2 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4CE2 msgbox Text_19A1EA setvar VAR_0x8005, MOVETUTOR_METRONOME call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4CE2 setflag FLAG_TUTOR_METRONOME goto EventScript_1C4CEC @@ -13793,17 +13793,17 @@ EventScript_1C4CF6:: @ 81C4CF6 checkflag FLAG_TUTOR_MIMIC goto_if TRUE, EventScript_1C4D59 msgbox Text_19AD85, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4D4F call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4D4F msgbox Text_19ADEE setvar VAR_0x8005, MOVETUTOR_MIMIC call EventScript_1C4F30 lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4D4F removeitem ITEM_POKE_DOLL, 1 setflag FLAG_TUTOR_MIMIC @@ -13817,9 +13817,9 @@ EventScript_1C4D4F:: @ 81C4D4F EventScript_1C4D59:: @ 81C4D59 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1C4D72 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1C4D7B release end @@ -13838,15 +13838,15 @@ FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 checkflag FLAG_TUTOR_BODY_SLAM goto_if TRUE, EventScript_1C4DE2 msgbox Text_1A3505, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4DD8 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4DD8 msgbox Text_1A35DA setvar VAR_0x8005, MOVETUTOR_BODY_SLAM call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4DD8 setflag FLAG_TUTOR_BODY_SLAM goto EventScript_1C4DE2 @@ -13864,7 +13864,7 @@ EventScript_1C4DE2:: @ 81C4DE2 TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -13876,22 +13876,22 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC getfirstpartymonname 0 msgbox Text_1A46C6 specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F26 copyvar VAR_0x8009, VAR_0x8005 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1C4EF0 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1C4EFB - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_1C4F06 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_1C4F11 msgbox Text_1A4751, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F1C call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F1C msgbox Text_1A4814 closemessage @@ -13916,7 +13916,7 @@ EventScript_1C4EA1:: @ 81C4EA1 EventScript_1C4EAB:: @ 81C4EAB copyvar VAR_0x8005, VAR_0x8009 specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1C4ECD msgbox Text_1A4865 setflag FLAG_TEMP_2 @@ -13931,7 +13931,7 @@ EventScript_1C4ECD:: @ 81C4ECD EventScript_1C4EDA:: @ 81C4EDA call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F1C goto EventScript_1C4EAB end @@ -14050,7 +14050,7 @@ EventScript_1C4FC5:: @ 81C4FC5 setvar VAR_0x400E, 1 setvar VAR_0x8004, 5 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1C4FFE setobjectxyperm 2, 10, 12 setobjectmovementtype 2, 9 @@ -14095,14 +14095,14 @@ EventScript_1C5050:: @ 81C5050 setvar VAR_0x4002, 1 setvar VAR_0x8004, 5 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C5072 setvar VAR_0x400E, 1 setvar VAR_0x400F, 1 EventScript_1C5072: setvar VAR_0x8004, 18 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1C5086 end @@ -14144,7 +14144,7 @@ EventScript_1C510D:: @ 81C510D setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 addvar VAR_0x4003, 1 - compare_var_to_value VAR_0x4003, 1 + compare VAR_0x4003, 1 goto_if eq, EventScript_1C5146 setvar VAR_0x4003, 0 EventScript_1C5146: @@ -14377,7 +14377,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 setvar VAR_0x4003, 0 setvar VAR_0x8004, 16 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 @@ -14397,7 +14397,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA setvar VAR_0x4003, 1 setvar VAR_0x8004, 16 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 0d7c001ee..9959c058d 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -38,7 +38,7 @@ BirthIsland_Exterior_MapScript2_165253:: @ 8165253 EventScript_16525D:: @ 816525D specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject 2 return @@ -47,7 +47,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 lock faceplayer special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 special Special_DeoxysSound @@ -96,11 +96,11 @@ EventScript_1652C0:: @ 81652C0 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_16533A - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_165348 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_165348 setflag FLAG_FOUGHT_DEOXYS release diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index fe1da2c67..11a685e53 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -13,7 +13,7 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 msgbox gUnknown_81960C9 setflag FLAG_GOT_TEA giveitem ITEM_TEA - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 msgbox gUnknown_8196109 release diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 258846f29..5bdf8bf20 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -17,7 +17,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 lock faceplayer specialvar VAR_RESULT, HasAllKantoMons - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16C412 msgbox gUnknown_8196356 release @@ -32,7 +32,7 @@ EventScript_16C418:: @ 816C418 waitmessage delay 60 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special Special_ShowDiploma waitstate diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index a18215910..1d5879580 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -10,11 +10,11 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D faceplayer setvar VAR_0x4001, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C4A6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16C4DA - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C release end @@ -27,7 +27,7 @@ EventScript_16C4A6:: @ 816C4A6 waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB @@ -42,7 +42,7 @@ EventScript_16C4DA:: @ 816C4DA waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 0627bf3a0..8f4c34162 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -43,7 +43,7 @@ Items_16BB38:: @ 816BB38 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 84f290500..7d358f621 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 66bc95b26..8556833c7 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -41,7 +41,7 @@ Items_16BC84:: @ 816BC84 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 3fcd14e8a..06963d348 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -61,7 +61,7 @@ EventScript_16C1F3:: @ 816C1F3 EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 4 + compare VAR_ELEVATOR_FLOOR, 4 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 4 @@ -71,7 +71,7 @@ EventScript_16C246:: @ 816C246 EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 5 + compare VAR_ELEVATOR_FLOOR, 5 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 5 @@ -81,7 +81,7 @@ EventScript_16C26E:: @ 816C26E EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 6 + compare VAR_ELEVATOR_FLOOR, 6 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 6 @@ -91,7 +91,7 @@ EventScript_16C296:: @ 816C296 EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 7 + compare VAR_ELEVATOR_FLOOR, 7 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 7 @@ -101,7 +101,7 @@ EventScript_16C2BE:: @ 816C2BE EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 8 + compare VAR_ELEVATOR_FLOOR, 8 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 8 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index da6ec9c0b..68dd32b65 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -3,13 +3,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer call EventScript_16BCF6 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if eq, EventScript_16C00E goto EventScript_16BD3E end @@ -17,13 +17,13 @@ CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD EventScript_16BCF6:: @ 816BCF6 setvar VAR_0x4001, 0 checkitem ITEM_FRESH_WATER, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16BD2C checkitem ITEM_SODA_POP, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16BD32 checkitem ITEM_LEMONADE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16BD38 return @@ -41,7 +41,7 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C00C textcolor 3 message Text_195D5F @@ -150,7 +150,7 @@ EventScript_16BF7C:: @ 816BF7C getitemname 1, VAR_0x8009 removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C002 additem VAR_0x8009, 1 textcolor 3 @@ -160,11 +160,11 @@ EventScript_16BF7C:: @ 816BF7C waitfanfare giveitem VAR_0x8009, 1, 8 call EventScript_1A6675 - compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER + compare VAR_0x8008, ITEM_FRESH_WATER call_if eq, EventScript_16BFDE - compare_var_to_value VAR_0x8008, ITEM_SODA_POP + compare VAR_0x8008, ITEM_SODA_POP call_if eq, EventScript_16BFEA - compare_var_to_value VAR_0x8008, ITEM_LEMONADE + compare VAR_0x8008, ITEM_LEMONADE call_if eq, EventScript_16BFF6 release end @@ -261,16 +261,16 @@ EventScript_16C0C4:: @ 816C0C4 return EventScript_16C0CB:: @ 816C0CB - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C131 checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C13F - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16C0B6 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16C0BD - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16C0C4 updatemoneybox 0, 0, 0 getitemname 0, VAR_0x4000 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 65aa9a529..1a2403837 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -21,7 +21,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -41,18 +41,18 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D EventScript_16C6E6:: @ 816C6E6 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C790 - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 goto_if eq, EventScript_16C734 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 goto_if eq, EventScript_16C706 end EventScript_16C706:: @ 816C706 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9500 + compare VAR_0x4001, 9500 goto_if ge, EventScript_16C79E checkmoney 10000, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C7AC givecoins 500 takemoney 10000, 0 @@ -61,10 +61,10 @@ EventScript_16C706:: @ 816C706 EventScript_16C734:: @ 816C734 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9950 + compare VAR_0x4001, 9950 goto_if ge, EventScript_16C79E checkmoney 1000, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C7AC givecoins 50 takemoney 1000, 0 @@ -135,7 +135,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9990 + compare VAR_0x4001, 9990 goto_if ge, EventScript_16C82B givecoins 10 textcolor 3 @@ -199,7 +199,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9980 + compare VAR_0x4001, 9980 goto_if ge, EventScript_16C8E2 givecoins 20 textcolor 3 @@ -229,7 +229,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9980 + compare VAR_0x4001, 9980 goto_if ge, EventScript_16C942 givecoins 20 textcolor 3 @@ -264,7 +264,7 @@ EventScript_16C96C:: @ 816C96C checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 @@ -434,9 +434,9 @@ CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16CB34 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if ne, EventScript_16CB3F removeobject 11 release diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 33f5da4bb..4a037e9eb 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16CD99 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 @@ -109,10 +109,10 @@ EventScript_16CC55:: @ 816CC55 EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 checkcoins VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x4002 + compare VAR_RESULT, VAR_0x4002 goto_if lt, EventScript_16CDA5 textcolor 3 switch VAR_0x4001 @@ -179,11 +179,11 @@ EventScript_16CD3D:: @ 816CD3D end EventScript_16CD52:: @ 816CD52 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CDB3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16CDE0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_16CD74 end @@ -222,7 +222,7 @@ EventScript_16CDB3:: @ 816CDB3 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16CD83 goto EventScript_16CC10 end @@ -236,7 +236,7 @@ EventScript_16CDE0:: @ 816CDE0 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 @@ -253,7 +253,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16CD99 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 @@ -311,7 +311,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 goto EventScript_16CF3F end @@ -319,7 +319,7 @@ EventScript_16CF09:: @ 816CF09 EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 goto EventScript_16CF3F end @@ -327,10 +327,10 @@ EventScript_16CF22:: @ 816CF22 EventScript_16CF3F:: @ 816CF3F getitemname 0, VAR_0x4001 checkcoins VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x4002 + compare VAR_RESULT, VAR_0x4002 goto_if lt, EventScript_16CDA5 checkitemspace VAR_0x4001, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CF79 takecoins VAR_0x4002 updatecoinsbox 0, 5 @@ -351,7 +351,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16CD99 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index b92e99fe1..d7c14ecd3 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -23,7 +23,7 @@ EventScript_16D0A0:: @ 816D0A0 EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D107 additem ITEM_TM19, 1 giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19 diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 82ecb417e..9b85b36f3 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD goto_if TRUE, EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D241 additem ITEM_COIN_CASE, 1 giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 5c51d2601..01e077b3c 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -10,7 +10,7 @@ CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 EventScript_1624D3:: @ 81624D3 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return @@ -26,7 +26,7 @@ EventScript_1624F1:: @ 81624F1 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -45,11 +45,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_162558 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_162561 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_162561 setflag FLAG_FOUGHT_MEWTWO release diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index bd660c660..dd68b4bcc 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -43,21 +43,21 @@ EventScript_1664CC:: @ 81664CC waitmovement 0 msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_166582 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_16658D - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_166598 famechecker FAMECHECKER_BILL, 0 msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 @@ -185,7 +185,7 @@ CeruleanCity_EventScript_166603:: @ 8166603 EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_166677 additem ITEM_TM28, 1 giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 @@ -283,11 +283,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F lock random 3 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_1667B0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_1667B6 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_1667BC waitmessage delay 40 @@ -295,11 +295,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F applymovement 5, Movement_1A75D9 waitmovement 0 delay 30 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_1667C2 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_1667CB - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_1667D4 release end @@ -332,13 +332,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD lock random 4 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_166814 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_16681D - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_166826 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if eq, EventScript_16682F release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index a37d3435b..fedec7e89 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -22,7 +22,7 @@ EventScript_16AAD3:: @ 816AAD3 EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AB3A additem ITEM_TM03, 1 giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 36ce99bdb..13ec2b2fd 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -13,13 +13,13 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 checkflag FLAG_DID_ZYNX_TRADE goto_if TRUE, EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AA0B call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16AA0B call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16AA15 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index afbb35c5f..174bf6a7c 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -3,25 +3,25 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_if eq, EventScript_CeruleanCity_House4_NoNews - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_if eq, EventScript_CeruleanCity_House4_News1 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_if eq, EventScript_CeruleanCity_House4_News2 - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread - compare_var_to_value VAR_0x8004, 4 + compare VAR_0x8004, 4 goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1 - compare_var_to_value VAR_0x8004, 5 + compare VAR_0x8004, 5 goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2 - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if eq, EventScript_CeruleanCity_House4_NewsDone end @@ -34,7 +34,7 @@ EventScript_CeruleanCity_House4_News1:: @ 816AD63 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192B43 giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AE45 release end @@ -43,7 +43,7 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192C07 giveitem VAR_0x8008, 4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AE45 release end @@ -59,7 +59,7 @@ EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192D4B giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AE45 release end @@ -68,7 +68,7 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192DE3 giveitem VAR_0x8008, 4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AE45 release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 79cd75785..ae2c8cad5 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -7,14 +7,14 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 checkflag FLAG_GOT_POWDER_JAR goto_if TRUE, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AEAD checkflag FLAG_SYS_GOT_BERRY_POUCH goto_if FALSE, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_GOT_POWDER_JAR giveitem ITEM_POWDER_JAR - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 msgbox gUnknown_8193033 release @@ -143,20 +143,20 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B0CC giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 @@ -177,7 +177,7 @@ EventScript_16B0CC:: @ 816B0CC CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_814EA7C waitstate diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index c99795d35..eda64ebfe 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -11,7 +11,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 2ebce51b7..4a971c1a5 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -6,11 +6,11 @@ CinnabarIsland_MapScripts:: @ 8166ED6 CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1 call_if eq, EventScript_166F24 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3 call_if eq, EventScript_166F52 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 call_if eq, EventScript_166F0B end @@ -24,7 +24,7 @@ EventScript_166F0B:: @ 8166F0B EventScript_166F24:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 18 + compare VAR_0x8004, 18 goto_if ge, EventScript_166F4A setflag FLAG_TEMP_2 setobjectxyperm 3, 18, 12 @@ -108,9 +108,9 @@ EventScript_166FCD:: @ 8166FCD call_if TRUE, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_167068 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_167078 end diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 9e67b156d..f2959212c 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -75,7 +75,7 @@ EventScript_16DA06:: @ 816DA06 EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DA75 additem ITEM_TM38, 1 giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 @@ -227,9 +227,9 @@ CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DC43 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DC6A end @@ -275,9 +275,9 @@ EventScript_16DC6A:: @ 816DC6A end EventScript_16DC7A:: @ 816DC7A - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16DCB4 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F @@ -324,9 +324,9 @@ CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DD41 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DD1C end @@ -354,9 +354,9 @@ EventScript_16DD41:: @ 816DD41 end EventScript_16DD51:: @ 816DD51 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16DD8B - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD @@ -412,9 +412,9 @@ CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DE1F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DDFA end @@ -442,9 +442,9 @@ EventScript_16DE1F:: @ 816DE1F end EventScript_16DE2F:: @ 816DE2F - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16DE69 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 @@ -491,9 +491,9 @@ CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DEF6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DED1 end @@ -521,9 +521,9 @@ EventScript_16DEF6:: @ 816DEF6 end EventScript_16DF06:: @ 816DF06 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16DF40 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 @@ -570,9 +570,9 @@ CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DFA8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DFCD end @@ -600,9 +600,9 @@ EventScript_16DFCD:: @ 816DFCD end EventScript_16DFDD:: @ 816DFDD - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16E017 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F @@ -649,9 +649,9 @@ CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E0A4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E07F end @@ -679,9 +679,9 @@ EventScript_16E0A4:: @ 816E0A4 end EventScript_16E0B4:: @ 816E0B4 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16E0EE - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index 85ad79e4e..a303f9b27 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -11,7 +11,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 640446bf0..77f003f56 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -30,7 +30,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A lock faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E9A5 msgbox gUnknown_819A785 closemessage @@ -39,11 +39,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_16E96F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16E981 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 780103629..275161475 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -3,7 +3,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 .byte 0 CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 call_if eq, EventScript_16E285 end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 27fb47f63..03562d9c1 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -9,13 +9,13 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 checkflag FLAG_DID_SEELOR_TRADE goto_if TRUE, EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E45B call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16E45B call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16E465 call EventScript_1A8CD9 msgbox gUnknown_81A59DA @@ -45,20 +45,20 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D setvar VAR_RESULT, 0 checkflag FLAG_REVIVED_AMBER call_if TRUE, EventScript_16E8A1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E897 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 goto_if eq, EventScript_16E736 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 goto_if eq, EventScript_16E72C call EventScript_16E4EC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E544 call EventScript_16E504 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E586 call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E5C8 msgbox gUnknown_819A282 goto EventScript_16E53A @@ -101,7 +101,7 @@ EventScript_16E544:: @ 816E544 message Text_19A282 waitmessage call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E5FA multichoice 0, 0, MULTICHOICE_HELIX, FALSE switch VAR_RESULT @@ -114,7 +114,7 @@ EventScript_16E586:: @ 816E586 message Text_19A282 waitmessage call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E631 multichoice 0, 0, MULTICHOICE_DOME, FALSE switch VAR_RESULT @@ -155,7 +155,7 @@ EventScript_16E668:: @ 816E668 getspeciesname 0, SPECIES_OMANYTE getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -170,7 +170,7 @@ EventScript_16E6A6:: @ 816E6A6 getspeciesname 0, SPECIES_KABUTO getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -185,7 +185,7 @@ EventScript_16E6E4:: @ 816E6E4 getspeciesname 0, SPECIES_AERODACTYL getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -207,11 +207,11 @@ EventScript_16E72C:: @ 816E72C end EventScript_16E736:: @ 816E736 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 goto_if eq, EventScript_16E758 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 goto_if eq, EventScript_16E79D - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 goto_if eq, EventScript_16E7E2 end @@ -220,12 +220,12 @@ EventScript_16E758:: @ 816E758 getspeciesname 0, SPECIES_OMANYTE msgbox gUnknown_819A34F givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C setflag FLAG_REVIVED_HELIX - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E85B end @@ -234,12 +234,12 @@ EventScript_16E79D:: @ 816E79D getspeciesname 0, SPECIES_KABUTO msgbox gUnknown_819A34F givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C setflag FLAG_REVIVED_DOME - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E85B end @@ -248,12 +248,12 @@ EventScript_16E7E2:: @ 816E7E2 getspeciesname 0, SPECIES_AERODACTYL msgbox gUnknown_819A34F givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C setflag FLAG_REVIVED_AMBER - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E85B end @@ -265,7 +265,7 @@ EventScript_16E827:: @ 816E827 waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB @@ -280,7 +280,7 @@ EventScript_16E85B:: @ 816E85B waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 8a7dc8df1..5eaf24fa4 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -13,13 +13,13 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 checkflag FLAG_DID_ESPHERE_TRADE goto_if TRUE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E31C call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16E31C call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16E326 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D @@ -53,17 +53,17 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E checkflag FLAG_DID_TANGENY_TRADE goto_if TRUE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E3BC special Special_ChooseMonFromParty waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index b214279d1..cb7b90267 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -26,7 +26,7 @@ EventScript_164C52:: @ 8164C52 waitmovement 0 msgbox gUnknown_817D062 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_164CB6 trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_LADY_SELPHY, 0, Text_17D086 msgbox gUnknown_817D0B2 diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index a47767ca0..45d8694e4 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -27,7 +27,7 @@ EventScript_168A18:: @ 8168A18 EventScript_168A22:: @ 8168A22 msgbox gUnknown_818B282 giveitem ITEM_TM42 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168AFE call EventScript_168AE8 release @@ -35,7 +35,7 @@ EventScript_168A22:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall @@ -45,14 +45,14 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 goto_if TRUE, EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_168A86 releaseall end EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_168A9B releaseall end @@ -69,7 +69,7 @@ EventScript_168A9B:: @ 8168A9B textcolor 0 msgbox gUnknown_818B171 giveitem ITEM_TM42 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168AFE call EventScript_168AE8 releaseall diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 1d1610ace..c46cd1b33 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -3,16 +3,16 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_172043 - compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF + compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF goto_if eq, EventScript_171F0B - compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE + compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE goto_if ne, EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE @@ -32,7 +32,7 @@ EventScript_171F0B:: @ 8171F0B EventScript_171F19:: @ 8171F19 copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171F34 goto EventScript_171EFE end @@ -52,18 +52,18 @@ EventScript_171F34:: @ 8171F34 textcolor 0 msgbox gUnknown_81A4566 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_171FCD - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_171FE9 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_171FFE - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E giveitem VAR_RESORT_GORGEOUS_REWARD - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_172025 setflag FLAG_TEMP_2 setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index e6fb90088..1215fb092 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -78,7 +78,7 @@ FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 EventScript_16402F:: @ 816402F getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 24 + compare VAR_0x8004, 24 call_if le, EventScript_164065 msgbox gUnknown_817BA64 closemessage @@ -112,36 +112,36 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if eq, EventScript_16412E msgbox gUnknown_817B7AE closemessage - compare_var_to_value VAR_0x8004, 24 + compare VAR_0x8004, 24 call_if le, EventScript_164144 - compare_var_to_value VAR_0x8004, 25 + compare VAR_0x8004, 25 call_if eq, EventScript_16414F - compare_var_to_value VAR_0x8004, 26 + compare VAR_0x8004, 26 call_if eq, EventScript_16415A - compare_var_to_value VAR_0x8004, 27 + compare VAR_0x8004, 27 call_if eq, EventScript_16415A playse SE_PIN call EventScript_163F47 special DrawWholeMapView waitse - compare_var_to_value VAR_0x8004, 24 + compare VAR_0x8004, 24 call_if le, EventScript_164165 - compare_var_to_value VAR_0x8004, 25 + compare VAR_0x8004, 25 call_if eq, EventScript_164165 - compare_var_to_value VAR_0x8004, 26 + compare VAR_0x8004, 26 call_if eq, EventScript_164165 - compare_var_to_value VAR_0x8004, 27 + compare VAR_0x8004, 27 call_if eq, EventScript_164170 msgbox gUnknown_817B7FA release end EventScript_16412E:: @ 816412E - compare_var_to_value VAR_0x8004, 27 + compare VAR_0x8004, 27 goto_if eq, EventScript_1A77A9 applymovement 255, Movement_1A75EB waitmovement 0 diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index a334ab2df..def665782 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -3,7 +3,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -14,7 +14,7 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E goto_if TRUE, EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, Special_GetLeadMonFriendship - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1688AC msgbox gUnknown_818A88F release @@ -33,7 +33,7 @@ EventScript_1688AC:: @ 81688AC EventScript_1688BA:: @ 81688BA countpokemon - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_16891F setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI @@ -50,12 +50,12 @@ EventScript_1688E3:: @ 81688E3 getspeciesname 1, SPECIES_TOGEPI setvar VAR_0x8004, SPECIES_TOGEPI specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_168895 msgbox gUnknown_818A9C0 release diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 68788f93a..0515c29b5 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -5,7 +5,7 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_MapScript1_167CB9:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND - compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0 + compare VAR_MAP_SCENE_FOUR_ISLAND, 0 call_if eq, EventScript_167CCD call EventScript_167CD1 end @@ -72,18 +72,18 @@ Movement_167D52:: @ 8167D52 FourIsland_EventScript_167D55:: @ 8167D55 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_167D9B - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_167E0C - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_167E19 msgbox gUnknown_81BF555 release @@ -91,10 +91,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG @@ -104,7 +104,7 @@ EventScript_167D9B:: @ 8167D9B EventScript_167DD1:: @ 8167DD1 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if ne, EventScript_167DEB msgbox gUnknown_81BF6F0 release diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 684c7506c..582b068ec 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -3,7 +3,7 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 .byte 0 FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 - compare_var_to_value VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 + compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 call_if eq, EventScript_163D94 end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index c74ac396a..fc3664764 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -3,7 +3,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD FourIsland_Mart_EventScript_171CAE:: @ 8171CAE special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index c91cc86e5..3b82f3521 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -3,19 +3,19 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A2E - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_171A52 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171993 msgbox gUnknown_81BF916 release @@ -23,16 +23,16 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 EventScript_171993:: @ 8171993 specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A1A msgbox gUnknown_81BF839 fadescreen 1 special ChooseSendDaycareMon waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_171A24 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse @@ -42,7 +42,7 @@ EventScript_171993:: @ 8171993 special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_171A01 release end @@ -54,7 +54,7 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171993 goto EventScript_1719F7 end @@ -80,7 +80,7 @@ EventScript_171A38:: @ 8171A38 EventScript_171A41:: @ 8171A41 specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if ne, EventScript_171A38 return @@ -89,26 +89,26 @@ EventScript_171A52:: @ 8171A52 setvar VAR_0x8004, 0 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A90 goto EventScript_1719F7 end EventScript_171A90:: @ 8171A90 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_171B67 specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_171ACF special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1719F7 goto EventScript_171ACF end @@ -116,14 +116,14 @@ EventScript_171A90:: @ 8171A90 EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171AEB goto EventScript_1719F7 end EventScript_171AEB:: @ 8171AEB specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171B05 msgbox gUnknown_81BF932 release @@ -143,14 +143,14 @@ EventScript_171B05:: @ 8171B05 call EventScript_1A6675 waitmoncry specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_171B4E goto EventScript_1719F7 end EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A90 goto EventScript_1719F7 end @@ -192,7 +192,7 @@ EventScript_171B86:: @ 8171B86 setvar VAR_0x8004, 1 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A90 msgbox gUnknown_81BF976 release @@ -201,7 +201,7 @@ EventScript_171B86:: @ 8171B86 EventScript_171BBF:: @ 8171BBF special ShowDaycareLevelMenu waitstate - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1719F7 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index 2a07b6bb0..f4c0c1625 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -9,9 +9,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH goto_if TRUE, EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16D7E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16D7F1 release end @@ -25,9 +25,9 @@ EventScript_16D780:: @ 816D780 msgbox gUnknown_8198EAA call EventScript_1A6675 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16D7D6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16D7DF additem ITEM_HM04, 1 giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 8160e0fb3..21bb1e306 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -22,7 +22,7 @@ EventScript_16D580:: @ 816D580 EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D5E7 additem ITEM_TM06, 1 giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 4470655ff..e8116fc69 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -7,7 +7,7 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817 checkflag FLAG_GOT_GOOD_ROD goto_if TRUE, EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D849 msgbox gUnknown_8199337 release @@ -21,7 +21,7 @@ EventScript_16D83F:: @ 816D83F EventScript_16D849:: @ 816D849 msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D88A additem ITEM_GOOD_ROD, 1 giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index da4f19e60..058fc44f6 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -5,7 +5,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 lock faceplayer msgbox gUnknown_81993B9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D8B0 goto EventScript_16D941 end @@ -14,23 +14,23 @@ EventScript_16D8B0:: @ 816D8B0 msgbox gUnknown_8199421 special Special_ChooseMonFromParty waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16D941 special IsSelectedMonEgg - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D937 special ScrSpecial_CountPokemonMoves - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 special SelectMove fadescreen 0 - compare_var_to_value VAR_0x8005, 4 + compare VAR_0x8005, 4 goto_if eq, EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D919 goto EventScript_16D941 end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index dea51b320..04854d419 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -11,7 +11,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 777e88a96..e521d70d4 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -38,7 +38,7 @@ EventScript_16D312:: @ 816D312 lockall textcolor 0 msgbox gUnknown_8197E1A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D345 msgbox gUnknown_8197E48 closemessage @@ -102,7 +102,7 @@ EventScript_16D391:: @ 816D391 waitmovement 0 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A @@ -111,7 +111,7 @@ EventScript_16D391:: @ 816D391 EventScript_16D3CA:: @ 816D3CA call EventScript_16D462 checkmoney 500, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 @@ -124,11 +124,11 @@ EventScript_16D3CA:: @ 816D3CA msgbox gUnknown_8197D80 closemessage hidemoneybox 0, 0 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 call_if eq, EventScript_16D44C - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if eq, EventScript_16D441 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if eq, EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 @@ -153,10 +153,10 @@ EventScript_16D457:: @ 816D457 EventScript_16D462:: @ 816D462 countpokemon - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if ne, EventScript_1A77A9 specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A77A9 msgbox gUnknown_81BFEAC goto EventScript_16D49A @@ -200,7 +200,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 lock faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D4D6 msgbox gUnknown_819809E release diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 01f9f6a62..c8bd4aa30 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -5,7 +5,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR - compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 + compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index f3c9c7c3f..8d15b25fe 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16EA79 end @@ -20,7 +20,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A lock faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16EAA6 msgbox gUnknown_819A8D8 release @@ -44,7 +44,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index dfd6cb3d7..f290f8d14 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -12,7 +12,7 @@ LavenderTown_EventScript_16687D:: @ 816687D lock faceplayer msgbox gUnknown_817F52E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16689C msgbox gUnknown_817F568 release diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index cd9e5e8d7..3b5cd8d4c 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -5,9 +5,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 lock faceplayer msgbox gUnknown_8193A4B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B287 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B2AA end @@ -15,9 +15,9 @@ EventScript_16B287:: @ 816B287 msgbox gUnknown_8193AA6 special Special_ChooseMonFromParty waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if lt, EventScript_16B2B4 - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16B2AA end @@ -28,20 +28,20 @@ EventScript_16B2AA:: @ 816B2AA EventScript_16B2B4:: @ 816B2B4 specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 - compare_var_to_value VAR_RESULT, SPECIES_EGG + compare VAR_RESULT, SPECIES_EGG goto_if eq, EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B311 specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B31B - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B2AA end @@ -60,7 +60,7 @@ EventScript_16B31B:: @ 816B31B call EventScript_1A74EB specialvar VAR_RESULT, NameRaterWasNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B345 msgbox gUnknown_8193BF0 release diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 47cef8633..f5ebc9bc8 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -15,7 +15,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362 LavenderTown_Mart_EventScript_16B36B:: @ 816B36B special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index d82308203..328ba64de 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -8,7 +8,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A goto_if TRUE, EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B1A0 setflag FLAG_GOT_POKE_FLUTE additem ITEM_POKE_FLUTE, 1 diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 1ee18f696..b76eb8502 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -5,7 +5,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946 MtEmber_Exterior_MapScript1_163951:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR - compare_var_to_value VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 + compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 call_if eq, EventScript_163960 end @@ -15,7 +15,7 @@ EventScript_163960:: @ 8163960 return MtEmber_Exterior_MapScript2_163969:: @ 8163969 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 call_if ge, EventScript_163975 end @@ -27,7 +27,7 @@ MtEmber_Exterior_EventScript_16397F:: @ 816397F lock checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 goto_if eq, EventScript_16399E - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if eq, EventScript_1639A8 msgbox gUnknown_817A82A release @@ -65,7 +65,7 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 faceplayer checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 goto_if eq, EventScript_163A1B - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if eq, EventScript_163A25 msgbox gUnknown_817A88C closemessage diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 3f8256837..4d4662e6e 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -10,7 +10,7 @@ MtEmber_Summit_MapScript2_163B07:: @ 8163B07 EventScript_163B11:: @ 8163B11 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return @@ -26,7 +26,7 @@ EventScript_163B2F:: @ 8163B2F MtEmber_Summit_EventScript_163B33:: @ 8163B33 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -45,11 +45,11 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_163B96 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_163B9F - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_163B9F setflag FLAG_FOUGHT_MOLTRES release diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 5c26a3ad1..f0e2ff9f8 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -57,7 +57,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B lock faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1607DE removeobject 1 additem ITEM_DOME_FOSSIL, 1 @@ -90,7 +90,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F lock faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1607DE removeobject 2 additem ITEM_HELIX_FOSSIL, 1 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 20cff0f8f..dfe55b6b2 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -27,14 +27,14 @@ NavelRock_Base_MapScript2_165116:: @ 8165116 EventScript_165120:: @ 8165120 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject 1 return NavelRock_Base_EventScript_165134:: @ 8165134 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -69,11 +69,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_1651D9 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_1651E7 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_1651E7 setflag FLAG_FOUGHT_LUGIA release diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 26ef2885c..20e7fdcbe 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,7 +1,7 @@ NavelRock_Exterior_MapScripts:: @ 81646AE - map_script 3, NavelRock_Exterior_MapScript1_1646B4 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_OnTransition .byte 0 -NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4 +NavelRock_Exterior_OnTransition:: @ 81646B4 setworldmapflag FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 563ef520f..050f05518 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -30,14 +30,14 @@ NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD EventScript_164FE7:: @ 8164FE7 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject 1 return NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall @@ -74,11 +74,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB clearflag FLAG_SYS_SPECIAL_WILD_BATTLE setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_1650B4 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_1650C2 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_1650C2 setflag FLAG_FOUGHT_HO_OH releaseall diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index a1d5b25a7..778f63fed 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 .byte 0 OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 call_if ge, EventScript_170C22 checkflag FLAG_SYS_CAN_LINK_WITH_RS call_if TRUE, EventScript_170C36 @@ -28,11 +28,11 @@ EventScript_170C36:: @ 8170C36 OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 call_if eq, EventScript_170C73 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 call_if eq, EventScript_170C79 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 call_if eq, EventScript_170C90 end @@ -112,9 +112,9 @@ EventScript_170CB1:: @ 8170CB1 additem ITEM_TRI_PASS, 1 giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if ge, EventScript_170E46 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if lt, EventScript_170E58 setflag FLAG_SYS_SEVII_MAP_123 msgbox gUnknown_81A1230 @@ -208,22 +208,22 @@ EventScript_170EB1:: @ 8170EB1 OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 goto_if eq, EventScript_170F35 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 goto_if eq, EventScript_170F9B checkflag FLAG_RECOVERED_SAPPHIRE goto_if TRUE, EventScript_170FA5 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if eq, EventScript_17103A checkflag FLAG_GOT_RUBY goto_if TRUE, EventScript_171044 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if eq, EventScript_1710F2 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1710FC - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 goto_if eq, EventScript_171134 msgbox gUnknown_81A1321 closemessage @@ -235,9 +235,9 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 EventScript_170F35:: @ 8170F35 msgbox gUnknown_81A1EBD random 3 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170F6D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_170F84 famechecker FAMECHECKER_BILL, 5 msgbox gUnknown_81A2076 @@ -324,14 +324,14 @@ EventScript_171044:: @ 8171044 applymovement 3, Movement_1A75E1 waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_171099 goto EventScript_1710B2 end @@ -466,13 +466,13 @@ EventScript_1711DA:: @ 81711DA waitmovement 0 msgbox gUnknown_81A13B8 closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1712E4 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1712EF - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_1712FA - compare_var_to_value VAR_0x4001, 4 + compare VAR_0x4001, 4 call_if eq, EventScript_171305 delay 10 msgbox gUnknown_81A13CB diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index d4e6c0cf3..852c6425f 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -7,16 +7,16 @@ PalletTown_MapScript1_165465:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN call_if TRUE, EventScript_165488 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 call_if eq, EventScript_1654A8 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 call_if eq, EventScript_1654A2 end EventScript_165488:: @ 8165488 checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN goto_if FALSE, EventScript_1A77A9 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if ge, EventScript_1A77A9 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return @@ -59,7 +59,7 @@ EventScript_1654D8:: @ 81654D8 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 - compare_var_to_value VAR_0x8009, 60 + compare VAR_0x8009, 60 goto_if lt, EventScript_165593 msgbox gUnknown_817D9AA closemessage @@ -199,17 +199,17 @@ EventScript_165605:: @ 8165605 waitmovement 0 delay 30 addobject 3 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1656B8 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1656CE - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1656E0 opendoor 16, 13 waitdooranim @@ -374,11 +374,11 @@ Movement_165758:: @ 8165758 PalletTown_EventScript_16575C:: @ 816575C lock - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 goto_if eq, EventScript_1657ED - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if eq, EventScript_165815 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_if eq, EventScript_1658C2 checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_165801 @@ -392,9 +392,9 @@ PalletTown_EventScript_16575C:: @ 816575C waitmovement 0 msgbox gUnknown_81B1C9F closemessage - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_1657D7 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if ne, EventScript_1657E2 moveobjectoffscreen 1 setflag FLAG_TEMP_2 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 42c7d44ad..eb1b0d890 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -3,9 +3,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 .byte 0 PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if lt, EventScript_168D44 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if ge, EventScript_168D50 end @@ -24,13 +24,13 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkflag FLAG_SYS_GAME_CLEAR goto_if TRUE, EventScript_168DB9 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_if eq, EventScript_168EEC - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 goto_if eq, EventScript_168F59 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 goto_if eq, EventScript_168EF6 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 goto_if ge, EventScript_168DAF msgbox gUnknown_818D58C closemessage @@ -46,23 +46,23 @@ EventScript_168DAF:: @ 8168DAF EventScript_168DB9:: @ 8168DB9 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - compare_var_to_value VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 + compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 goto_if lt, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168E3C msgbox gUnknown_818D8B2 special Special_ChooseMonFromParty waitstate lock faceplayer - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_168E3C specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 - compare_var_to_value VAR_RESULT, SPECIES_EGG + compare VAR_RESULT, SPECIES_EGG goto_if eq, EventScript_168E32 msgbox gUnknown_818D8CC closemessage @@ -143,7 +143,7 @@ EventScript_168EF6:: @ 8168EF6 msgbox gUnknown_818D60A closemessage checkitemspace ITEM_TOWN_MAP, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168F4F applymovement 1, Movement_1A75EB waitmovement 0 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 900dd06aa..0ea8cf4c6 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -7,9 +7,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB goto_if TRUE, EventScript_168C4A checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_168C38 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_168C41 closemessage applymovement 1, Movement_1A75E5 @@ -35,7 +35,7 @@ EventScript_168C4A:: @ 8168C4A PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 goto_if eq, EventScript_168C78 msgbox gUnknown_818D4F9 releaseall @@ -43,9 +43,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 EventScript_168C78:: @ 8168C78 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_168C91 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_168C9A releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index dc90bc7bf..9a61ce24c 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -4,7 +4,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 .byte 0 PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 + compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 call_if eq, EventScript_168CBA end @@ -32,7 +32,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 850182c08..cd94b5929 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -6,11 +6,11 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E setflag FLAG_VISITED_OAKS_LAB - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 call_if eq, EventScript_168FC6 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 call_if eq, EventScript_168FD5 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 call_if eq, EventScript_168FC0 checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL call_if TRUE, EventScript_168FBC @@ -66,32 +66,32 @@ EventScript_169002:: @ 8169002 EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169174 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1691BB - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169194 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1691DB - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1691F1 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1691FC - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169215 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169227 addobject 9 addobject 10 @@ -101,13 +101,13 @@ EventScript_169035:: @ 8169035 removeobject 9 removeobject 10 delay 30 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169845 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169850 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16985B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16986D textcolor 3 playfanfare MUS_FAN5 @@ -120,13 +120,13 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818F1DB closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169B69 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm @@ -311,20 +311,20 @@ EventScript_16930B:: @ 816930B closemessage applymovement 4, Movement_1A75F1 waitmovement 0 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 goto_if eq, EventScript_1693D2 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 goto_if eq, EventScript_16944D - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 goto_if eq, EventScript_16935A end EventScript_16935A:: @ 816935A - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_if eq, EventScript_16937C - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_16938C - compare_var_to_value VAR_0x4002, 3 + compare VAR_0x4002, 3 goto_if eq, EventScript_16939C end @@ -376,11 +376,11 @@ Movement_1693CD:: @ 81693CD step_end EventScript_1693D2:: @ 81693D2 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_if eq, EventScript_1693F4 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_169404 - compare_var_to_value VAR_0x4002, 3 + compare VAR_0x4002, 3 goto_if eq, EventScript_169414 end @@ -435,11 +435,11 @@ Movement_169447:: @ 8169447 step_end EventScript_16944D:: @ 816944D - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_if eq, EventScript_16946F - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_16947F - compare_var_to_value VAR_0x4002, 3 + compare VAR_0x4002, 3 goto_if eq, EventScript_16948F end @@ -492,11 +492,11 @@ EventScript_1694C2:: @ 81694C2 msgbox gUnknown_818DE38 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if eq, EventScript_169504 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if eq, EventScript_169516 - compare_var_to_value VAR_0x4002, 3 + compare VAR_0x4002, 3 call_if eq, EventScript_169528 removeobject 8 playse SE_KAIDAN @@ -574,9 +574,9 @@ Movement_169559:: @ 8169559 PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if eq, EventScript_16958B - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if eq, EventScript_169581 msgbox gUnknown_818DC67 release @@ -597,21 +597,21 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 faceplayer checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_169600 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 goto_if eq, EventScript_169903 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 goto_if eq, EventScript_169A6E checkflag FLAG_SYS_GAME_CLEAR goto_if TRUE, EventScript_1699CE - compare_var_to_value VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 + compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 goto_if eq, EventScript_169903 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if eq, EventScript_1698D6 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if ge, EventScript_16961E - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 goto_if eq, EventScript_169614 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if eq, EventScript_16960A msgbox gUnknown_818E116 release @@ -645,13 +645,13 @@ EventScript_16961E:: @ 816961E playbgm MUS_RIVAL1, 0 msgbox gUnknown_818DE8D closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169A82 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169AC1 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169A9E - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 @@ -662,23 +662,23 @@ EventScript_16961E:: @ 816961E waitmovement 0 applymovement 4, Movement_1A75DD waitmovement 0 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169ADD - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169B14 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169AF5 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169B86 msgbox gUnknown_818E508 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169882 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_16988D - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_1698A6 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_1698B8 msgbox gUnknown_818E536 closemessage @@ -691,13 +691,13 @@ EventScript_16961E:: @ 816961E delay 10 removeobject 10 delay 25 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169845 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169850 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16985B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16986D delay 10 textcolor 3 @@ -716,24 +716,24 @@ EventScript_16961E:: @ 816961E famechecker FAMECHECKER_OAK, 1 msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169B33 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169B45 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169B57 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169B69 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm @@ -839,7 +839,7 @@ EventScript_1698D6:: @ 81698D6 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 goto_if eq, EventScript_1699FB goto EventScript_169903 end @@ -856,13 +856,13 @@ EventScript_169913:: @ 8169913 delay 40 message Text_1A7291 waitmessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169964 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_16996F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16997A - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169985 applymovement 4, Movement_1A75E1 waitmovement 0 @@ -970,7 +970,7 @@ Movement_1699C5: EventScript_1699CE:: @ 81699CE call EventScript_1A737B closemessage - compare_var_to_value VAR_0x8009, 60 + compare VAR_0x8009, 60 goto_if lt, EventScript_1699F9 checkflag FLAG_WORLD_MAP_ONE_ISLAND goto_if FALSE, EventScript_1699F9 @@ -985,7 +985,7 @@ EventScript_1699F9:: @ 81699F9 EventScript_1699FB:: @ 81699FB special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK @@ -993,13 +993,13 @@ EventScript_1699FB:: @ 81699FB checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL goto_if TRUE, EventScript_169A78 checkitem ITEM_POKE_BALL, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_169A34 goto EventScript_169A6E end EventScript_169A34:: @ 8169A34 - compare_var_to_value VAR_MAP_SCENE_ROUTE22, 2 + compare VAR_MAP_SCENE_ROUTE22, 2 goto_if ge, EventScript_169A45 goto EventScript_169A6E end @@ -1153,9 +1153,9 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if ge, EventScript_169DE4 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release @@ -1166,35 +1166,35 @@ EventScript_169BE1:: @ 8169BE1 waitmovement 0 drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 goto_if eq, EventScript_OakDescribesBulbasaur - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 goto_if eq, EventScript_OakDescribesCharmander - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 goto_if eq, EventScript_OakDescribesSquirtle end EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_ThisPokeIsRealyEnergetic - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_DeclinedStarter end EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_ThisPokeIsRealyEnergetic - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_DeclinedStarter end EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_ThisPokeIsRealyEnergetic - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_DeclinedStarter end @@ -1218,9 +1218,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 playfanfare MUS_FAN5 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_GiveNicknameToStarter - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_SkipGiveNicknameToStarter end @@ -1232,11 +1232,11 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC EventScript_SkipGiveNicknameToStarter:: @ 8169CDC closemessage - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 goto_if eq, EventScript_RivalWalksToCharmander - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 goto_if eq, EventScript_RivalWalksToSquirtle - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 goto_if eq, EventScript_RivalWalksToBulbasaur end @@ -1313,9 +1313,9 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if ge, EventScript_169DE4 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release @@ -1328,9 +1328,9 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if ge, EventScript_169DE4 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release @@ -1393,7 +1393,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if ge, EventScript_169E90 msgbox gUnknown_818EA84 releaseall diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 352da6d31..8328a8f04 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -13,7 +13,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage @@ -445,11 +445,11 @@ EventScript_165DBE:: @ 8165DBE msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_165E0A - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_165E26 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_165E42 msgbox gUnknown_817E6C7 closemessage @@ -1032,19 +1032,19 @@ PewterCity_EventScript_16607E:: @ 816607E lock faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 playbgm MUS_ANNAI, 0 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1660EE - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_166100 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_166112 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_166124 msgbox gUnknown_817E5AC closemessage @@ -1351,7 +1351,7 @@ PewterCity_EventScript_166244:: @ 8166244 lock faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_166263 msgbox gUnknown_817E644 release @@ -1416,11 +1416,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1 EventScript_1662DE:: @ 81662DE textcolor 0 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1663CA - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1663CA - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_1663CA waitse playse SE_PIN @@ -1429,13 +1429,13 @@ EventScript_1662DE:: @ 81662DE applymovement 7, Movement_1A75DD waitmovement 0 msgbox gUnknown_817E902 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1663D5 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1663DA - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1663E6 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 @@ -1451,13 +1451,13 @@ EventScript_1662DE:: @ 81662DE call EventScript_1A6675 msgbox gUnknown_817EA06 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_166412 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16641D - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_166428 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_166433 delay 30 textcolor 3 diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 39a6be51b..906a53650 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -24,7 +24,7 @@ EventScript_16A5C5:: @ 816A5C5 EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A634 additem ITEM_TM39, 1 giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 @@ -49,9 +49,9 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 checkflag FLAG_DEFEATED_BROCK goto_if TRUE, EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16A689 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A697 end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index e45959442..adbde2b4c 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -11,7 +11,7 @@ PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 7e4973a15..bdf57e5c0 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -4,11 +4,11 @@ PewterCity_Museum_1F_MapScripts:: @ 816A31A PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B lock faceplayer - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 goto_if eq, EventScript_16A348 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 goto_if eq, EventScript_16A348 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 goto_if eq, EventScript_16A348 msgbox gUnknown_8190539 release @@ -16,9 +16,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16A367 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A37B end @@ -64,7 +64,7 @@ EventScript_16A3D1:: @ 816A3D1 textcolor 0 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16A402 msgbox gUnknown_81904F9 closemessage @@ -76,14 +76,14 @@ EventScript_16A3D1:: @ 816A3D1 EventScript_16A402:: @ 816A402 checkmoney 50, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A476 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16A455 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16A460 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16A46B playse SE_SHOP takemoney 50, 0 @@ -156,7 +156,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE goto_if TRUE, EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A4F5 setflag FLAG_GOT_OLD_AMBER removeobject 4 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 260a2acff..e04da7f80 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -13,7 +13,7 @@ PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 checkflag FLAG_DEFEATED_AGATHA call_if TRUE, EventScript_16284B - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3 + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 call_if eq, EventScript_162845 end diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index afbaad9e6..64bbd0614 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -13,7 +13,7 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 checkflag FLAG_DEFEATED_BRUNO call_if TRUE, EventScript_1626C0 - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2 + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2 call_if eq, EventScript_1626BA end @@ -87,13 +87,13 @@ EventScript_16276E:: @ 816276E EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1627FA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1627EF - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_162805 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_162805 release end @@ -103,13 +103,13 @@ EventScript_1627B0:: @ 81627B0 call EventScript_1A7506 msgbox gUnknown_8178420 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1627FA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1627EF - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_162805 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_162805 release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 8b0fff2ce..449f0f741 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -7,11 +7,11 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_162B1E - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_162B31 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_162B44 end @@ -64,7 +64,7 @@ EventScript_162B76:: @ 8162B76 checkflag FLAG_SYS_GAME_CLEAR call_if TRUE, EventScript_162CBC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_162C68 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 @@ -116,20 +116,20 @@ EventScript_162C68:: @ 8162C68 end EventScript_162C6F:: @ 8162C6F - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_162CC5 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_162CD0 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_162CDB return EventScript_162C91:: @ 8162C91 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_162CE6 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_162CF1 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_162CFC return diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 0ec0cb7e6..4cadcee31 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -11,7 +11,7 @@ PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 end PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4 + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4 call_if eq, EventScript_162962 checkflag FLAG_DEFEATED_LANCE call_if TRUE, EventScript_162968 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index df1cf1579..dd337943d 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -14,7 +14,7 @@ PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 checkflag FLAG_DEFEATED_LORELEI call_if TRUE, EventScript_1625AC - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1 + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1 call_if eq, EventScript_1625A6 end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index e98796864..dd8b16a70 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -22,7 +22,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_163272 msgbox gUnknown_8179BFC release diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index ff5fd8b9b..908948740 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -20,9 +20,9 @@ PokemonTower_2F_EventScript_16329B:: @ 816329B EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_163339 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16334B applymovement 1, Movement_1A75DB waitmovement 0 @@ -30,18 +30,18 @@ EventScript_1632A7:: @ 81632A7 waitmovement 0 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_16335D - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_163368 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_163373 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16337E - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_163389 playse SE_KAIDAN delay 25 diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 1f889c052..65127f0ab 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -6,13 +6,13 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 textcolor 2 msgbox gUnknown_817A2F8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special ScrSpecial_StartMarowakBattle waitstate special sub_8112364 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1634F5 applymovement 255, Movement_163512 waitmovement 0 diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index f39d15c7e..5a91f843e 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -24,11 +24,11 @@ EventScript_1635A1:: @ 81635A1 msgbox gUnknown_817A3AF closemessage getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 10 + compare VAR_0x8004, 10 goto_if eq, EventScript_1635E0 - compare_var_to_value VAR_0x8004, 11 + compare VAR_0x8004, 11 goto_if eq, EventScript_1635F0 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_if eq, EventScript_163600 applymovement 2, Movement_16362C waitmovement 0 @@ -112,9 +112,9 @@ EventScript_163658:: @ 8163658 msgbox gUnknown_817A477 closemessage getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 12 + compare VAR_0x8004, 12 goto_if eq, EventScript_163699 - compare_var_to_value VAR_0x8004, 13 + compare VAR_0x8004, 13 goto_if eq, EventScript_1636A9 applymovement 3, Movement_1636C6 waitmovement 0 @@ -177,9 +177,9 @@ EventScript_1636F1:: @ 81636F1 msgbox gUnknown_817A506 closemessage getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 10 + compare VAR_0x8004, 10 goto_if eq, EventScript_163725 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_if eq, EventScript_163735 applymovement 4, Movement_163754 waitmovement 0 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index aa16e1881..9255df5e0 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -10,7 +10,7 @@ PowerPlant_MapScript1_16376F:: @ 816376F EventScript_163779:: @ 8163779 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return @@ -39,7 +39,7 @@ EventScript_1637B4:: @ 81637B4 PowerPlant_EventScript_1637B8:: @ 81637B8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -58,11 +58,11 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_16381B - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_163824 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_163824 setflag FLAG_FOUGHT_ZAPDOS release @@ -80,7 +80,7 @@ EventScript_163824:: @ 8163824 PowerPlant_EventScript_16382F:: @ 816382F special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -94,11 +94,11 @@ PowerPlant_EventScript_16382F:: @ 816382F clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_163884 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_163884 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_163884 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 release @@ -111,7 +111,7 @@ EventScript_163884:: @ 8163884 PowerPlant_EventScript_16388D:: @ 816388D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -125,11 +125,11 @@ PowerPlant_EventScript_16388D:: @ 816388D clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_1638E2 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_1638E2 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_1638E2 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 release diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index c2bb38afc..e96d22bb1 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -1,8 +1,8 @@ RockTunnel_1F_MapScripts:: @ 8162DD6 - map_script 3, RockTunnel_1F_MapScript1_162DDC + map_script MAP_SCRIPT_ON_TRANSITION, RockTunnel_1F_OnTransition .byte 0 -RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC +RockTunnel_1F_OnTransition:: @ 8162DDC setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 0ab5b0490..20b36dd57 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -8,7 +8,7 @@ RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if ne, EventScript_16146A end @@ -42,7 +42,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 faceplayer removeobject 2 giveitem ITEM_SILPH_SCOPE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 release end @@ -66,7 +66,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT removeobject 4 giveitem ITEM_LIFT_KEY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 release end @@ -82,9 +82,9 @@ EventScript_1613E9:: @ 81613E9 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1614A1 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_161462 release end @@ -100,9 +100,9 @@ EventScript_161433:: @ 8161433 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1614A1 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_161462 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 2b593b1bb..145364418 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -53,7 +53,7 @@ EventScript_161554:: @ 8161554 EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 - compare_var_to_value VAR_ELEVATOR_FLOOR, 3 + compare VAR_ELEVATOR_FLOOR, 3 goto_if eq, EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 3 @@ -65,7 +65,7 @@ EventScript_1615B8:: @ 81615B8 EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 - compare_var_to_value VAR_ELEVATOR_FLOOR, 2 + compare VAR_ELEVATOR_FLOOR, 2 goto_if eq, EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 2 @@ -77,7 +77,7 @@ EventScript_1615E0:: @ 81615E0 EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 - compare_var_to_value VAR_ELEVATOR_FLOOR, 0 + compare VAR_ELEVATOR_FLOOR, 0 goto_if eq, EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 0 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index ef784e8ee..54906ebbe 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -9,7 +9,7 @@ Route1_EventScript_167EFE:: @ 8167EFE msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 44d9939c0..9e62817c0 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -34,17 +34,17 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 checkflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE goto_if TRUE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 - compare_var_to_value VAR_0x8006, 20 + compare VAR_0x8006, 20 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_EVERSTONE, 1 giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 0140d8de3..fe9f21907 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -26,13 +26,13 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C checkflag FLAG_DID_NINA_TRADE goto_if TRUE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16FDB6 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16FDB6 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA @@ -63,17 +63,17 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 checkflag FLAG_GOT_ITEMFINDER goto_if TRUE, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FE64 - compare_var_to_value VAR_0x8006, 30 + compare VAR_0x8006, 30 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_ITEMFINDER, 1 giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 446d9047d..a468a579f 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -17,11 +17,11 @@ Route12_EventScript_168014:: @ 8168014 checkflag FLAG_GOT_POKE_FLUTE goto_if FALSE, EventScript_168099 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE @@ -35,11 +35,11 @@ Route12_EventScript_168014:: @ 8168014 dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_16808F - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_16808F - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_16808F release end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 0f0aa4f68..317ffe41c 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -7,7 +7,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C checkflag FLAG_GOT_SUPER_ROD goto_if TRUE, EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16FF34 msgbox gUnknown_819F1FA release @@ -15,7 +15,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16FF75 additem ITEM_SUPER_ROD, 1 msgbox gUnknown_819F05B @@ -32,28 +32,28 @@ EventScript_16FF75:: @ 816FF75 EventScript_16FF7F:: @ 816FF7F special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16FFF5 special GetMagikarpSizeRecordInfo msgbox gUnknown_819F2DB special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if ge, EventScript_16FFFF special CompareMagikarpSize - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_170001 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_17000B - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_170031 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if eq, EventScript_17001E release end @@ -90,7 +90,7 @@ EventScript_170031:: @ 8170031 setflag FLAG_GOT_RECORD_SETTING_MAGIKARP msgbox gUnknown_819F31B giveitem ITEM_NET_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_17005D msgbox gUnknown_819F395 release diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index fe288a6d1..44c1629fc 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -15,12 +15,12 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A checkflag FLAG_GOT_TM27 goto_if TRUE, EventScript_16FF01 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16FEE5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16FEEE checkitemspace ITEM_TM27, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16FEF7 additem ITEM_TM27, 1 giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 1b491d4e5..09983fed1 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -24,17 +24,17 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 checkflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE goto_if TRUE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_170145 - compare_var_to_value VAR_0x8006, 50 + compare VAR_0x8006, 50 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_EXP_SHARE, 1 giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 0bc8d6c8a..a69fbf22a 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -14,7 +14,7 @@ EventScript_1680FF:: @ 81680FF return Route16_MapScript2_168103:: @ 8168103 - compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 + compare VAR_MAP_SCENE_ROUTE16, 1 call_if eq, EventScript_16810F end @@ -36,11 +36,11 @@ Route16_EventScript_168121:: @ 8168121 checkflag FLAG_GOT_POKE_FLUTE goto_if FALSE, EventScript_1681A3 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE @@ -53,11 +53,11 @@ Route16_EventScript_168121:: @ 8168121 dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_168199 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_168199 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_168199 release end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 6da2bb12a..d6c4c7a9c 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -8,7 +8,7 @@ Route16_House_EventScript_17014F:: @ 817014F goto_if TRUE, EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_17019B additem ITEM_HM02, 1 giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index 32d392818..ff5c43dd3 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -53,13 +53,13 @@ EventScript_170220:: @ 8170220 applymovement 255, Movement_1A75E9 waitmovement 0 delay 20 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_170279 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_170284 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if eq, EventScript_17028F - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if eq, EventScript_17029A msgbox gUnknown_819F95F closemessage diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 777967038..da054fd84 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -24,17 +24,17 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 checkflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE goto_if TRUE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F - compare_var_to_value VAR_0x8006, 40 + compare VAR_0x8006, 40 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_AMULET_COIN, 1 giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index cc6d11221..b50bf30c1 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -4,7 +4,7 @@ Route18_MapScripts:: @ 81681F6 .byte 0 Route18_MapScript1_168201:: @ 8168201 - compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 + compare VAR_MAP_SCENE_ROUTE16, 1 call_if eq, EventScript_16820D end diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 784d1d37f..25fe611c0 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -53,13 +53,13 @@ EventScript_1703D6:: @ 81703D6 applymovement 255, Movement_1A75E9 waitmovement 0 delay 20 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_17042F - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_17043A - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if eq, EventScript_170445 - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if eq, EventScript_170450 msgbox gUnknown_819FD0C closemessage diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index d262aad30..afe1dd754 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -17,13 +17,13 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E checkflag FLAG_DID_MARC_TRADE goto_if TRUE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1704D8 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1704D8 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index be0098a71..1d277231d 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -1,8 +1,8 @@ Route20_MapScripts:: @ 816823B - map_script 3, Route20_MapScript1_168241 + map_script MAP_SCRIPT_ON_TRANSITION, Route20_OnTransition .byte 0 -Route20_MapScript1_168241:: @ 8168241 +Route20_OnTransition:: @ 8168241 checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT call_if FALSE, EventScript_168254 checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 8a775e09c..e68c25b17 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -31,29 +31,29 @@ EventScript_1682BE:: @ 81682BE textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_168350 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_168350 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16835B delay 6 msgbox gUnknown_8188890 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_16836D - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_16837C - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_16838B msgbox gUnknown_8188974 closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16839A - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16839A - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1683A5 fadedefaultbgm removeobject 1 @@ -197,19 +197,19 @@ EventScript_16841F:: @ 816841F textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16849C - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16849C - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_1684B9 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_1684C4 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_1684CF msgbox gUnknown_8188B29 closemessage diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 2760e17a3..30e5a753e 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -4,11 +4,11 @@ Route24_MapScripts:: @ 816861F Route24_EventScript_168620:: @ 8168620 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_ROUTE24, 1 + compare VAR_MAP_SCENE_ROUTE24, 1 goto_if eq, EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16864C call EventScript_1686B9 release @@ -38,15 +38,15 @@ Route24_EventScript_16866C:: @ 816866C EventScript_168678:: @ 8168678 textcolor 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1686FD - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_168708 applymovement 255, Movement_1A75EB waitmovement 0 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168713 call EventScript_1686B9 releaseall @@ -80,7 +80,7 @@ EventScript_168713:: @ 8168713 closemessage applymovement 255, Movement_168743 waitmovement 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_168733 release end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index e8d016a02..bfa331bef 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -28,9 +28,9 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE goto_if TRUE, EventScript_17064A checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170580 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_17058E end @@ -45,18 +45,18 @@ EventScript_17058E:: @ 817058E end EventScript_17059C:: @ 817059C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_170600 msgbox gUnknown_819FFD3 closemessage delay 10 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_17062A - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_170635 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_170635 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_170635 opendoor 10, 3 waitdooranim @@ -72,9 +72,9 @@ EventScript_17059C:: @ 817059C EventScript_170600:: @ 8170600 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_170618 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_170621 return @@ -104,12 +104,12 @@ EventScript_170640:: @ 8170640 EventScript_17064A:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1706AC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1706BE additem ITEM_SS_TICKET, 1 giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index de3889bf4..002c928ab 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -8,17 +8,17 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F checkflag FLAG_GOT_HM05 goto_if TRUE, EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16F70B - compare_var_to_value VAR_0x8006, 10 + compare VAR_0x8006, 10 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_HM05, 1 giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 62367586d..0f5604fa3 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -13,13 +13,13 @@ Route2_House_EventScript_16F602:: @ 816F602 checkflag FLAG_DID_MIMIEN_TRADE goto_if TRUE, EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F65C call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16F65C call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16F666 call EventScript_1A8CD9 msgbox gUnknown_81A59DA diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 4b485bbbd..23b4162a0 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -25,9 +25,9 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F goto_if TRUE, EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F786 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F794 end @@ -42,26 +42,26 @@ EventScript_16F794:: @ 816F794 end EventScript_16F7A2:: @ 816F7A2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F888 checkmoney 500, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F895 textcolor 3 setvar VAR_0x4001, 129 givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F7F6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F822 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_16F8AC end EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F861 call EventScript_1A8C27 fadescreen 1 @@ -74,7 +74,7 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F84B fadescreen 1 hidemoneybox 0, 0 diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index fd8a5f6fc..5340a57ec 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -44,11 +44,11 @@ EventScript_16F958:: @ 816F958 EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16F99C - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16F9A7 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16F9B2 msgbox gUnknown_819E0C1 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 6edd20f21..e039b9a09 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -44,11 +44,11 @@ EventScript_16FA1E:: @ 816FA1E EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16FA62 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16FA6D - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index f8885b53d..613a84bf2 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -44,11 +44,11 @@ EventScript_16FAE5:: @ 816FAE5 EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16FB29 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16FB34 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16FB3F msgbox gUnknown_819E32D setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index dfdb0b7ae..f657d318f 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -54,11 +54,11 @@ EventScript_16FBC1:: @ 816FBC1 EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16FC05 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16FC10 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16FC1B msgbox gUnknown_819E463 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index 2bede7e12..f13ffc7e9 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -5,7 +5,7 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_160C5C msgbox gUnknown_8173BA4 release diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 755c01a91..1898942d2 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -5,7 +5,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 lock faceplayer msgbox gUnknown_817445B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_160E18 closemessage call EventScript_FadeOut_Heal_FadeIn @@ -15,7 +15,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 EventScript_160E18:: @ 8160E18 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_160E2E msgbox gUnknown_8174515 release diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 82d75a686..3d67e7dd0 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -35,29 +35,29 @@ EventScript_160903:: @ 8160903 applymovement 1, Movement_1A75ED waitmovement 0 delay 20 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1609AD - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1609B8 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_1609DC - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_1609E7 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_1609F2 msgbox gUnknown_8173164 closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1609FD - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_160A08 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_160A13 fadedefaultbgm removeobject 1 diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 15cc43b1f..e2cfc4eb9 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -14,9 +14,9 @@ SSAnne_Exterior_MapScript2_16084F:: @ 816084F SSAnne_Exterior_160859:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8005, 6 + compare VAR_0x8005, 6 call_if le, EventScript_1608A1 - compare_var_to_value VAR_0x8005, 7 + compare VAR_0x8005, 7 call_if ge, EventScript_1608AC fadenewbgm MUS_NAMINORI delay 50 diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 8ab022028..97ca7f889 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -19,11 +19,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE msgbox gUnknown_8173570 random 3 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_160B03 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_160B0C - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_160B15 release end diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index a4b3b1910..fe7a4f6fa 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -8,7 +8,7 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453 goto_if TRUE, EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16249F additem ITEM_HM03, 1 giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 8481db66c..5790fce0f 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -29,7 +29,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 textcolor 0 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16EC82 erasemonpic release @@ -52,7 +52,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 textcolor 0 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16EC82 erasemonpic release @@ -61,11 +61,11 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 EventScript_16EC82:: @ 816EC82 erasemonpic givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16ECB5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16ECEC - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C release end @@ -79,7 +79,7 @@ EventScript_16ECB5:: @ 816ECB5 waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB @@ -95,7 +95,7 @@ EventScript_16ECEC:: @ 816ECEC waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 159cb1729..ad09c3e36 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -23,7 +23,7 @@ EventScript_16EE0A:: @ 816EE0A EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16EE7E additem ITEM_TM04, 1 giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 54b0a5a65..4ad832d23 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -19,18 +19,18 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkitem ITEM_POKE_DOLL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1C4CF6 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16EBB7 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16EBC0 release end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 8a1ec97b5..3e7b07c0d 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -8,7 +8,7 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F goto_if TRUE, EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F0AB additem ITEM_TM29, 1 giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 5b77e5864..b4e263da3 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -11,7 +11,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 0f2b92262..c9b2ca3a6 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -25,7 +25,7 @@ SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if eq, EventScript_16F02D msgbox gUnknown_819C0B4 release diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 426226422..dbf2c8f3f 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -71,9 +71,9 @@ Movement_16F13E:: @ 816F13E step_end SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 goto_if eq, EventScript_16F267 - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 goto_if eq, EventScript_16F15B end @@ -81,35 +81,35 @@ EventScript_16F15B:: @ 816F15B special UpdateMovedSaffronFanClubMembers setvar VAR_0x8004, 0 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F207 setvar VAR_0x8004, 1 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F213 setvar VAR_0x8004, 2 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F21F setvar VAR_0x8004, 3 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F22B setvar VAR_0x8004, 4 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F237 setvar VAR_0x8004, 5 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F243 setvar VAR_0x8004, 6 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F24F setvar VAR_0x8004, 7 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F25B end @@ -166,13 +166,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 faceplayer setvar VAR_0x8004, 0 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F2EE specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F2E4 msgbox gUnknown_819C420 release @@ -180,7 +180,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 EventScript_16F2C0:: @ 816F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F2DA msgbox gUnknown_819C390 release @@ -206,13 +206,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 faceplayer setvar VAR_0x8004, 3 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F365 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F35B msgbox gUnknown_819CBD3 release @@ -220,7 +220,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 EventScript_16F337:: @ 816F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F351 msgbox gUnknown_819CB32 release @@ -246,13 +246,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F faceplayer setvar VAR_0x8004, 1 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F3DC specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F3D2 msgbox gUnknown_819C6BA release @@ -260,7 +260,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F EventScript_16F3AE:: @ 816F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F3C8 msgbox gUnknown_819C5A9 release @@ -286,13 +286,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 faceplayer setvar VAR_0x8004, 2 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F453 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F449 msgbox gUnknown_819C986 release @@ -300,7 +300,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 EventScript_16F425:: @ 816F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F43F msgbox gUnknown_819C81E release @@ -327,10 +327,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D setvar VAR_0x8004, 5 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F4B5 msgbox gUnknown_819D01F release @@ -338,7 +338,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D EventScript_16F491:: @ 816F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F4AB msgbox gUnknown_819CEDF release @@ -360,10 +360,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF setvar VAR_0x8004, 4 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F517 msgbox gUnknown_819CDDA release @@ -371,7 +371,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF EventScript_16F4F3:: @ 816F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F50D msgbox gUnknown_819CCF3 release @@ -393,10 +393,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 setvar VAR_0x8004, 6 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F579 msgbox gUnknown_819D1AE release @@ -404,7 +404,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 EventScript_16F555:: @ 816F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F56F msgbox gUnknown_819D0E3 release @@ -426,10 +426,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 setvar VAR_0x8004, 7 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F5DB msgbox gUnknown_819D3D2 release @@ -437,7 +437,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 EventScript_16F5B7:: @ 816F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F5D1 msgbox gUnknown_819D2B4 release diff --git a/data/maps/SeafoamIslands_1F/scripts.inc b/data/maps/SeafoamIslands_1F/scripts.inc index 336c75f9f..5cb6d2208 100644 --- a/data/maps/SeafoamIslands_1F/scripts.inc +++ b/data/maps/SeafoamIslands_1F/scripts.inc @@ -1,7 +1,7 @@ SeafoamIslands_1F_MapScripts:: @ 8162F43 - map_script 3, SeafoamIslands_1F_MapScript1_162F49 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_1F_OnTransition .byte 0 -SeafoamIslands_1F_MapScript1_162F49:: @ 8162F49 +SeafoamIslands_1F_OnTransition:: @ 8162F49 setworldmapflag FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F end diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index c566ab522..0ea5df1b7 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -16,7 +16,7 @@ EventScript_162F6D:: @ 8162F6D call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if FALSE, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if eq, EventScript_162F90 return @@ -39,12 +39,12 @@ EventScript_162FA2:: @ 8162FA2 call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if FALSE, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 24 + compare VAR_0x8008, 24 call_if lt, EventScript_162FF6 - compare_var_to_value VAR_0x8008, 24 + compare VAR_0x8008, 24 call_if ge, EventScript_163001 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 8d69a4808..1a25b02f8 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -13,7 +13,7 @@ SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 EventScript_163052:: @ 8163052 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return @@ -33,7 +33,7 @@ EventScript_163082:: @ 8163082 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if eq, EventScript_1630A5 return @@ -55,7 +55,7 @@ SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_1630D4 end @@ -99,12 +99,12 @@ EventScript_163121:: @ 8163121 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if lt, EventScript_16316F - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if ge, EventScript_16317A special sub_805D1A8 setvar VAR_0x4001, 0 @@ -164,7 +164,7 @@ Movement_1631AA:: @ 81631AA SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -183,11 +183,11 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_16320F - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_163218 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_163218 setflag FLAG_FOUGHT_ARTICUNO release diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index fd83fa051..aa4e7f1ae 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -5,9 +5,9 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1708AF - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 call_if ne, EventScript_1708C3 end @@ -39,11 +39,11 @@ EventScript_1708E9:: @ 1708E9 moveobjectoffscreen 1 applymovement 255, Movement_1A75E9 waitmovement 0 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 call_if eq, EventScript_170938 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 call_if eq, EventScript_170941 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 call_if eq, EventScript_17094A special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 @@ -75,9 +75,9 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 lock faceplayer special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_17097D - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_if eq, EventScript_170987 msgbox gUnknown_81A049B release @@ -92,27 +92,27 @@ EventScript_170987:: @ 8170987 special SavePlayerParty special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170A11 call EventScript_170A1E - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170A11 special SavePlayerParty special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_170A2D - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_170A3F - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index f2928f916..03a64b8e6 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -22,11 +22,11 @@ EventScript_170A97:: @ 8170A97 setvar VAR_0x8005, 0 special StartSpecialBattle waitstate - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if eq, EventScript_170AFE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_170B0C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if eq, EventScript_170B17 closemessage special sp000_heal_pokemon diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index 58312009f..d4a17878b 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index dcf37028d..1703a174c 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -15,12 +15,12 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 msgbox gUnknown_81A4D72 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_172225 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if ne, EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 442e13942..41e452568 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -28,77 +28,77 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall - compare_var_to_value VAR_0x4001, 100 + compare VAR_0x4001, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4001, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall - compare_var_to_value VAR_0x4002, 100 + compare VAR_0x4002, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4002, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall - compare_var_to_value VAR_0x4003, 100 + compare VAR_0x4003, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4003, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall - compare_var_to_value VAR_0x4004, 100 + compare VAR_0x4004, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4004, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall - compare_var_to_value VAR_0x4005, 100 + compare VAR_0x4005, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4005, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall - compare_var_to_value VAR_0x4006, 100 + compare VAR_0x4006, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4006, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall - compare_var_to_value VAR_0x4007, 100 + compare VAR_0x4007, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4007, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index e0b5f78c0..9e3139dd3 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_TrainerTower_MapScripts:: @ 8168BD5 - map_script 3, SevenIsland_TrainerTower_MapScript1_168BDB + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_OnTransition .byte 0 -SevenIsland_TrainerTower_MapScript1_168BDB:: @ 8168BDB +SevenIsland_TrainerTower_OnTransition:: @ 8168BDB setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 end diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc index eb9475260..4987c1142 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8 - map_script 5, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_1F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_1F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8 diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc index 91107975b..9e61d0dfd 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6 - map_script 5, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_2F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_2F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6 diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc index c4ecde9a0..e9afcff6c 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714 - map_script 5, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_3F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_3F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724 diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc index 32d17a844..cfa0be11b 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742 - map_script 5, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_4F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_4F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752 diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc index 5c461c0e8..35ccdf129 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770 - map_script 5, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_5F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_5F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780 diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc index 5dd711203..361c92749 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E - map_script 5, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_6F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_6F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc index 2a74cfb91..be0036605 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC - map_script 5, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_7F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_7F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc index 1219425d0..b51982f48 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA - map_script 5, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_8F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_8F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index e8ee2450f..96d1e6be7 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 - map_script 5, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 - map_script 2, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 .byte 0 SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 @@ -40,7 +40,7 @@ EventScript_164B5E:: @ 8164B5E EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - compare_var_to_value VAR_ELEVATOR_FLOOR, 3 + compare VAR_ELEVATOR_FLOOR, 3 goto_if eq, EventScript_164BD3 call EventScript_164BD8 setvar VAR_ELEVATOR_FLOOR, 3 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 142f33ee3..e09c67109 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -1,18 +1,18 @@ SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 - map_script 5, SevenIsland_TrainerTower_Lobby_MapScript1_164853 - map_script 7, SevenIsland_TrainerTower_Lobby_MapScript2_164887 - map_script 3, SevenIsland_TrainerTower_Lobby_MapScript3_1648AD - map_script 1, SevenIsland_TrainerTower_Lobby_MapScript4_164897 - map_script 2, SevenIsland_TrainerTower_Lobby_MapScript5_1648B6 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Lobby_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, SevenIsland_TrainerTower_Lobby_OnReturnToField + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_Lobby_OnTransition + map_script MAP_SCRIPT_ON_LOAD, SevenIsland_TrainerTower_Lobby_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Lobby_OnFrame .byte 0 -SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 +SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 setvar VAR_0x4002, 0 setvar VAR_0x8004, 10 special sub_815D9E8 setvar VAR_0x8004, 18 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_164886 setvar VAR_0x4000, 0 setobjectxy 255, 9, 7 @@ -21,7 +21,7 @@ SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 EventScript_164886:: @ 8164886 end -SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 +SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 addobject 1 addobject 2 addobject 3 @@ -29,8 +29,8 @@ SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 addobject 5 end -SevenIsland_TrainerTower_Lobby_MapScript4_164897:: @ 8164897 - compare_var_to_value VAR_0x400D, 17 +SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 + compare VAR_0x400D, 17 call_if eq, EventScript_1648A3 end @@ -38,12 +38,12 @@ EventScript_1648A3:: @ 81648A3 setmetatile 17, 10, 647, 0 return -SevenIsland_TrainerTower_Lobby_MapScript3_1648AD:: @ 81648AD +SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY getplayerxy VAR_0x400D, VAR_RESULT end -SevenIsland_TrainerTower_Lobby_MapScript5_1648B6:: @ 81648B6 +SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6 map_script_2 VAR_0x4000, 0, EventScript_1648ED map_script_2 VAR_0x400D, 0x11, EventScript_1648C8 .2byte 0 @@ -111,7 +111,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 faceplayer setvar VAR_0x8004, 20 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_164988 msgbox gUnknown_817C9A2 goto EventScript_164990 @@ -125,7 +125,7 @@ EventScript_164990:: @ 8164990 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -158,7 +158,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE msgbox gUnknown_817C794 setvar VAR_0x8004, 17 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_164A00 msgbox gUnknown_817C7D9 goto EventScript_164A08 diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index f3e5abafe..7176da07c 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -143,28 +143,28 @@ "x": 12, "y": 11, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 13, "y": 11, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 12, "y": 12, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 13, "y": 12, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 0b8e0e2cb..3efd6025e 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -4,13 +4,13 @@ SilphCo_10F_MapScripts:: @ 8161D86 SilphCo_10F_MapScript1_161D8C:: @ 8161D8C checkflag FLAG_SILPH_10F_DOOR - call_if FALSE, EventScript_1A84D6 + call_if FALSE, EventScript_Close10FDoor end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161DAD msgbox gUnknown_8176DBA release diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index bd9d83597..8d34641e8 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -141,28 +141,28 @@ "x": 5, "y": 16, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 17, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 16, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 17, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 292498c7b..4465e16b7 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -4,7 +4,7 @@ SilphCo_11F_MapScripts:: @ 8161DEE SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 checkflag FLAG_SILPH_11F_DOOR - call_if FALSE, EventScript_1A8504 + call_if FALSE, EventScript_Close11FDoor end SilphCo_11F_EventScript_161DFE:: @ 8161DFE @@ -13,12 +13,12 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE checkflag FLAG_GOT_MASTER_BALL_FROM_SILPH goto_if TRUE, EventScript_161E75 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_161E59 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_161E6B additem ITEM_MASTER_BALL, 1 giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 @@ -72,9 +72,9 @@ EventScript_161EA0:: @ 8161EA0 delay 25 msgbox gUnknown_8177108 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_161F00 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_161F12 setvar VAR_LAST_TALKED, 3 trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index a2d405b3a..d937d283c 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -137,56 +137,56 @@ "x": 5, "y": 8, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 6, "y": 8, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 5, "y": 9, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 6, "y": 9, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 5, "y": 15, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 6, "y": 15, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 5, "y": 16, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 6, "y": 16, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 1d08e777b..caafb4f23 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -4,9 +4,9 @@ SilphCo_2F_MapScripts:: @ 8161641 SilphCo_2F_MapScript1_161647:: @ 8161647 checkflag FLAG_SILPH_2F_DOOR_1 - call_if FALSE, EventScript_1A8149 + call_if FALSE, EventScript_Close2FDoor1 checkflag FLAG_SILPH_2F_DOOR_2 - call_if FALSE, EventScript_1A8177 + call_if FALSE, EventScript_Close2FDoor2 end SilphCo_2F_EventScript_16165A:: @ 816165A diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 5581d6926..e4daa7636 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -145,56 +145,56 @@ "x": 10, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 10, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 21, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 21, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 9, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 9, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 20, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 20, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 8187e8e45..8ce210653 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -4,15 +4,15 @@ SilphCo_3F_MapScripts:: @ 81616C5 SilphCo_3F_MapScript1_1616CB:: @ 81616CB checkflag FLAG_SILPH_3F_DOOR_1 - call_if FALSE, EventScript_1A81A5 + call_if FALSE, EventScript_Close3FDoor1 checkflag FLAG_SILPH_3F_DOOR_2 - call_if FALSE, EventScript_1A81DC + call_if FALSE, EventScript_Close3FDoor2 end SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1616F5 msgbox gUnknown_81758AD release diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 2bfb46286..813b7cfb6 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -176,56 +176,56 @@ "x": 3, "y": 16, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 4, "y": 16, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 3, "y": 17, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 4, "y": 17, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 15, "y": 11, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 14, "y": 11, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 14, "y": 12, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 15, "y": 12, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 176b6a4d3..b5ef8541d 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -4,15 +4,15 @@ SilphCo_4F_MapScripts:: @ 8161736 SilphCo_4F_MapScript1_16173C:: @ 816173C checkflag FLAG_SILPH_4F_DOOR_1 - call_if FALSE, EventScript_1A8213 + call_if FALSE, EventScript_Close4FDoor1 checkflag FLAG_SILPH_4F_DOOR_2 - call_if FALSE, EventScript_1A8241 + call_if FALSE, EventScript_Close4FDoor2 end SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161766 msgbox gUnknown_81759F5 release diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index a59f7836b..656894ec2 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -199,84 +199,84 @@ "x": 8, "y": 9, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 8, "y": 10, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 8, "y": 18, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 8, "y": 19, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 19, "y": 13, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 19, "y": 14, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 7, "y": 9, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 7, "y": 10, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 7, "y": 19, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 7, "y": 18, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 18, "y": 13, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 18, "y": 14, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index a87e88d33..ce1f8374b 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -4,17 +4,17 @@ SilphCo_5F_MapScripts:: @ 81617BE SilphCo_5F_MapScript1_1617C4:: @ 81617C4 checkflag FLAG_SILPH_5F_DOOR_1 - call_if FALSE, EventScript_1A826F + call_if FALSE, EventScript_Close5FDoor1 checkflag FLAG_SILPH_5F_DOOR_2 - call_if FALSE, EventScript_1A82A6 + call_if FALSE, EventScript_Close5FDoor2 checkflag FLAG_SILPH_5F_DOOR_3 - call_if FALSE, EventScript_1A82DD + call_if FALSE, EventScript_Close5FDoor3 end SilphCo_5F_EventScript_1617E0:: @ 81617E0 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1617F7 msgbox gUnknown_8175B70 release diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 82eda6e92..4cc812918 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -188,28 +188,28 @@ "x": 6, "y": 15, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 16, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 15, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 16, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index fd4d470eb..131d636b7 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -4,13 +4,13 @@ SilphCo_6F_MapScripts:: @ 8161881 SilphCo_6F_MapScript1_161887:: @ 8161887 checkflag FLAG_SILPH_6F_DOOR - call_if FALSE, EventScript_1A8314 + call_if FALSE, EventScript_Close6FDoor end SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1618A8 msgbox gUnknown_817607E release @@ -24,7 +24,7 @@ EventScript_1618A8:: @ 81618A8 SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1618C9 msgbox gUnknown_8175F24 release @@ -38,7 +38,7 @@ EventScript_1618C9:: @ 81618C9 SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1618EA msgbox gUnknown_8175F70 release @@ -52,7 +52,7 @@ EventScript_1618EA:: @ 81618EA SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_16190B msgbox gUnknown_8175FAA release @@ -66,7 +66,7 @@ EventScript_16190B:: @ 816190B SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_16192C msgbox gUnknown_8176012 release diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index ec2735f05..e470111f8 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -227,84 +227,84 @@ "x": 11, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 12, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 11, "y": 9, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 12, "y": 9, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 24, "y": 7, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 25, "y": 7, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 25, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 24, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 25, "y": 13, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 26, "y": 13, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 25, "y": 14, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 26, "y": 14, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 8f1fa6648..9c0e76620 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -5,15 +5,15 @@ SilphCo_7F_MapScripts:: @ 8161984 SilphCo_7F_MapScript1_16198F:: @ 816198F checkflag FLAG_SILPH_7F_DOOR_1 - call_if FALSE, EventScript_1A834B + call_if FALSE, EventScript_Close7FDoor1 checkflag FLAG_SILPH_7F_DOOR_2 - call_if FALSE, EventScript_1A8379 + call_if FALSE, EventScript_Close7FDoor2 checkflag FLAG_SILPH_7F_DOOR_3 - call_if FALSE, EventScript_1A83A7 + call_if FALSE, EventScript_Close7FDoor3 end SilphCo_7F_MapScript2_1619AB:: @ 81619AB - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 call_if ge, EventScript_1619B7 end @@ -46,24 +46,24 @@ EventScript_1619D4:: @ 81619D4 applymovement 1, Movement_1A75DD waitmovement 0 msgbox gUnknown_8176710 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_161A73 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_161A80 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_161A8B - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_161A96 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_161AA1 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm @@ -135,11 +135,11 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 msgbox gUnknown_8176266 setvar VAR_0x4001, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_161B12 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_161B45 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C release end @@ -152,7 +152,7 @@ EventScript_161B12:: @ 8161B12 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB @@ -169,7 +169,7 @@ EventScript_161B45:: @ 8161B45 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 @@ -199,7 +199,7 @@ EventScript_161B8D:: @ 8161B8D SilphCo_7F_EventScript_161B97:: @ 8161B97 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161BAE msgbox gUnknown_8176444 release @@ -213,7 +213,7 @@ EventScript_161BAE:: @ 8161BAE SilphCo_7F_EventScript_161BB8:: @ 8161BB8 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161BCF msgbox gUnknown_81764C2 release @@ -227,7 +227,7 @@ EventScript_161BCF:: @ 8161BCF SilphCo_7F_EventScript_161BD9:: @ 8161BD9 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161BF0 msgbox gUnknown_8176532 release diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 7d1f410dc..629519c25 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -150,28 +150,28 @@ "x": 6, "y": 10, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 11, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 11, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 10, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 30b19804b..1b3b81d36 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -4,13 +4,13 @@ SilphCo_8F_MapScripts:: @ 8161C5F SilphCo_8F_MapScript1_161C65:: @ 8161C65 checkflag FLAG_SILPH_8F_DOOR - call_if FALSE, EventScript_1A83D5 + call_if FALSE, EventScript_Close8FDoor end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161C86 msgbox gUnknown_817696D release diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index b350f620c..722ca91e7 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -120,112 +120,112 @@ "x": 3, "y": 10, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 3, "y": 11, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 13, "y": 16, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 13, "y": 17, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 21, "y": 6, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 22, "y": 6, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 22, "y": 7, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 21, "y": 7, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 21, "y": 13, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 21, "y": 12, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 22, "y": 12, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 22, "y": 13, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 2, "y": 11, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 2, "y": 10, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 12, "y": 16, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 12, "y": 17, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index b19f5a182..fb8098d1c 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -4,19 +4,19 @@ SilphCo_9F_MapScripts:: @ 8161CDE SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 checkflag FLAG_SILPH_9F_DOOR_1 - call_if FALSE, EventScript_1A840C + call_if FALSE, EventScript_Close9FDoor1 checkflag FLAG_SILPH_9F_DOOR_2 - call_if FALSE, EventScript_1A8443 + call_if FALSE, EventScript_Close9FDoor2 checkflag FLAG_SILPH_9F_DOOR_3 - call_if FALSE, EventScript_1A847A + call_if FALSE, EventScript_Close9FDoor3 checkflag FLAG_SILPH_9F_DOOR_4 - call_if FALSE, EventScript_1A84A8 + call_if FALSE, EventScript_Close9FDoor4 end SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161D2E msgbox gUnknown_8176B54 closemessage diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 4d75eec38..a6ecf471a 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -33,7 +33,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 4 + compare VAR_ELEVATOR_FLOOR, 4 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 4 @@ -45,7 +45,7 @@ EventScript_162056:: @ 8162056 EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 5 + compare VAR_ELEVATOR_FLOOR, 5 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 5 @@ -57,7 +57,7 @@ EventScript_16207E:: @ 816207E EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 6 + compare VAR_ELEVATOR_FLOOR, 6 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 6 @@ -69,7 +69,7 @@ EventScript_1620A6:: @ 81620A6 EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 7 + compare VAR_ELEVATOR_FLOOR, 7 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 7 @@ -81,7 +81,7 @@ EventScript_1620CE:: @ 81620CE EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 8 + compare VAR_ELEVATOR_FLOOR, 8 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 8 @@ -93,7 +93,7 @@ EventScript_1620F6:: @ 81620F6 EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 9 + compare VAR_ELEVATOR_FLOOR, 9 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 9 @@ -105,7 +105,7 @@ EventScript_16211E:: @ 816211E EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 10 + compare VAR_ELEVATOR_FLOOR, 10 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 10 @@ -117,7 +117,7 @@ EventScript_162146:: @ 8162146 EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 11 + compare VAR_ELEVATOR_FLOOR, 11 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 11 @@ -129,7 +129,7 @@ EventScript_16216E:: @ 816216E EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 12 + compare VAR_ELEVATOR_FLOOR, 12 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 12 @@ -141,7 +141,7 @@ EventScript_162196:: @ 8162196 EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 13 + compare VAR_ELEVATOR_FLOOR, 13 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 13 @@ -153,7 +153,7 @@ EventScript_1621BE:: @ 81621BE EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 14 + compare VAR_ELEVATOR_FLOOR, 14 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 14 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 64ef24b72..afb5f0251 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -16,13 +16,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 applymovement 2, Movement_16440F waitmovement 0 playse SE_W070 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_16430F - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_16430F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16431A - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 @@ -30,43 +30,43 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 setvar VAR_0x8007, 3 special Special_ShakeScreen delay 60 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_164325 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_164330 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16433B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_164351 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_164366 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16437B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_164390 removeobject 1 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1642F9 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1642F9 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_164304 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_164304 msgbox gUnknown_817BDD4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1643A5 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1643B7 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_1643C9 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_1643DB playse SE_KAIDAN delay 35 diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 1bdf7756b..2558fc999 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -3,7 +3,7 @@ SixIsland_Mart_MapScripts:: @ 8171E65 SixIsland_Mart_EventScript_171E66:: @ 8171E66 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 11192b895..9f0d085fe 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -5,9 +5,9 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 SixIsland_PatternBush_MapScript1_16455F:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_0x4001, VAR_0x4002 - compare_var_to_value VAR_0x4001, 50 + compare VAR_0x4001, 50 call_if ge, EventScript_16457E - compare_var_to_value VAR_0x4001, 49 + compare VAR_0x4001, 49 call_if le, EventScript_164587 end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 1ad4df1ed..751b78f94 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND - compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 + compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 call_if eq, EventScript_171D89 end diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 2b7ecf655..0e315cfdf 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -27,7 +27,7 @@ SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE goto_if TRUE, EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index d38e40aac..1561e5c36 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -5,28 +5,28 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D lock faceplayer special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1720E5 special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4A3F special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if ge, EventScript_1720EF special CompareHeracrossSize - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1720F1 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1720FB - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_172121 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if eq, EventScript_17210E release end @@ -63,7 +63,7 @@ EventScript_172121:: @ 8172121 setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 msgbox gUnknown_81A4A88 giveitem ITEM_NEST_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_17214D msgbox gUnknown_81A4AD9 release diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 93fdc39a5..718524fcf 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -6,7 +6,7 @@ ThreeIsland_MapScript1_1677B3:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_RESCUED_LOSTELLE call_if TRUE, EventScript_1677CB - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 call_if eq, EventScript_1677CF end @@ -30,7 +30,7 @@ ThreeIsland_EventScript_1677E5:: @ 81677E5 lock checkflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER goto_if TRUE, EventScript_167806 - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if eq, EventScript_16781A setvar VAR_0x4001, 0 call EventScript_16786F @@ -49,7 +49,7 @@ EventScript_16781A:: @ 816781A waitmovement 0 msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_167865 giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE, 1 @@ -64,36 +64,36 @@ EventScript_167865:: @ 8167865 end EventScript_16786F:: @ 816786F - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167947 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_167931 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167931 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 @@ -122,21 +122,21 @@ EventScript_167952:: @ 8167952 EventScript_16795D:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_if ge, EventScript_167931 goto EventScript_167952 end EventScript_167973:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_if ge, EventScript_167947 goto EventScript_167931 end ThreeIsland_EventScript_167989:: @ 8167989 lock - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if eq, EventScript_1679A1 setvar VAR_0x4001, 1 call EventScript_16786F @@ -223,7 +223,7 @@ EventScript_167A59:: @ 8167A59 waitmovement 0 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 @@ -256,15 +256,15 @@ EventScript_167A59:: @ 8167A59 msgbox gUnknown_81825E2 closemessage delay 45 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_167BC6 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167BD8 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_167BEA - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_167C03 - compare_var_to_value VAR_0x4001, 4 + compare VAR_0x4001, 4 call_if eq, EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 3119a1d44..f26f7edb9 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -18,7 +18,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 waitmovement 0 msgbox gUnknown_817AE8E special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 waitse playmoncry SPECIES_HYPNO, 2 @@ -30,7 +30,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 waitmovement 0 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_163D19 special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_817AF3B diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 8d5b37ed7..0830e168c 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -6,9 +6,9 @@ ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_164D50 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_164D54 end @@ -27,7 +27,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 checkflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL goto_if TRUE, EventScript_164DC2 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_164D90 msgbox gUnknown_817D13B closemessage @@ -39,7 +39,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 EventScript_164D90:: @ 8164D90 msgbox gUnknown_817D1C9 giveitem ITEM_NUGGET - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_164DB8 setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL goto EventScript_164DC2 diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index ec0caa100..171eff139 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -3,7 +3,7 @@ ThreeIsland_Mart_MapScripts:: @ 817188C ThreeIsland_Mart_EventScript_17188D:: @ 817188D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 1aff12731..842bd794d 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -10,9 +10,9 @@ ThreeIsland_Port_MapScript1_16878F:: @ 816878F ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 goto_if ge, EventScript_1687B8 - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if ge, EventScript_1687C2 msgbox gUnknown_818A307 release diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 3d35a89c1..3ecbbaa87 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -69,15 +69,15 @@ EventScript_167606:: @ 8167606 TwoIsland_EventScript_16760F:: @ 816760F special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 + compare VAR_MAP_SCENE_TWO_ISLAND, 4 goto_if eq, EventScript_167646 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 + compare VAR_MAP_SCENE_TWO_ISLAND, 3 goto_if eq, EventScript_16765E - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 + compare VAR_MAP_SCENE_TWO_ISLAND, 2 goto_if eq, EventScript_167676 goto EventScript_16768E end @@ -121,11 +121,11 @@ EventScript_16768E:: @ 816768E EventScript_1676A6:: @ 81676A6 message Text_1A6211 waitmessage - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 + compare VAR_MAP_SCENE_TWO_ISLAND, 4 goto_if eq, EventScript_167728 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 + compare VAR_MAP_SCENE_TWO_ISLAND, 3 goto_if eq, EventScript_167708 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 + compare VAR_MAP_SCENE_TWO_ISLAND, 2 goto_if eq, EventScript_1676EC goto EventScript_1676D3 end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 40c68cb7e..f2761d7e2 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -3,7 +3,7 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_171619:: @ 8171619 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -20,10 +20,10 @@ TwoIsland_House_EventScript_171619:: @ 8171619 EventScript_17164F:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1717A8 checkitem ITEM_TINY_MUSHROOM, 2 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1717AC checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_171687 @@ -46,7 +46,7 @@ EventScript_171696:: @ 8171696 EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_17179E goto EventScript_1716BE end @@ -55,12 +55,12 @@ EventScript_1716BE:: @ 81716BE msgbox gUnknown_81A2CC3 special SelectMoveTutorMon waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_17179E special IsSelectedMonEgg - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171790 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 goto_if eq, EventScript_171782 goto EventScript_1716F4 end @@ -69,7 +69,7 @@ EventScript_1716F4:: @ 81716F4 msgbox gUnknown_81A2CE1 special DisplayMoveTutorMenu waitstate - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_if eq, EventScript_1716BE checkflag FLAG_TEMP_4 goto_if TRUE, EventScript_17175B diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 798435eaf..53b72c2db 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -125,7 +125,7 @@ Movement_17152F:: @ 817152F TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if eq, EventScript_1BC060 checkflag FLAG_RESCUED_LOSTELLE goto_if TRUE, EventScript_171555 @@ -141,11 +141,11 @@ EventScript_171555:: @ 8171555 TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if eq, EventScript_1BC0CE checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER goto_if TRUE, EventScript_1715F5 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 goto_if eq, EventScript_17158A msgbox gUnknown_81A2743 release @@ -169,7 +169,7 @@ EventScript_17158A:: @ 817158A EventScript_1715C4:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1715FF additem ITEM_MOON_STONE, 1 setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 4d5a806e2..39e8c1fcc 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -9,13 +9,13 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 checkflag FLAG_DID_MS_NIDO_TRADE goto_if TRUE, EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_160E93 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_160E93 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_160E9D call EventScript_1A8CD9 msgbox gUnknown_81A5B4A diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index fcacff2e3..cb5186fe1 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -37,7 +37,7 @@ VermilionCity_EventScript_166917:: @ 8166917 VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 + compare VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if eq, EventScript_166937 msgbox gUnknown_817F776 release @@ -51,7 +51,7 @@ EventScript_166937:: @ 8166937 VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 + compare VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if eq, EventScript_166996 msgbox gUnknown_817FA22 release @@ -61,7 +61,7 @@ EventScript_166958:: @ 8166958 checkflag FLAG_SYS_GOT_MYSTIC_TICKET goto_if FALSE, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A77B0 goto EventScript_1A77AA end @@ -70,16 +70,16 @@ EventScript_166977:: @ 8166977 checkflag FLAG_SYS_GOT_AURORA_TICKET goto_if FALSE, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A77B0 goto EventScript_1A77AA end EventScript_166996:: @ 8166996 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1669BB - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 release @@ -87,14 +87,14 @@ EventScript_166996:: @ 8166996 EventScript_1669BB:: @ 81669BB special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 call EventScript_166958 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1669FD call EventScript_166977 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_166A5F setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY message Text_17FBB8 @@ -104,7 +104,7 @@ EventScript_1669BB:: @ 81669BB EventScript_1669FD:: @ 81669FD call EventScript_166977 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_166AB1 checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN call_if FALSE, EventScript_166A53 @@ -209,7 +209,7 @@ EventScript_166BA0:: @ 8166BA0 applymovement 6, Movement_1A75E7 applymovement 255, Movement_1A75EB waitmovement 0 - compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 + compare VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if eq, EventScript_166BED msgbox gUnknown_817FA3C checkflag FLAG_GOT_SS_TICKET @@ -227,9 +227,9 @@ EventScript_166BDE:: @ 8166BDE EventScript_166BED:: @ 8166BED setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1669BB - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 closemessage diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 5d08e2b3a..a654dea5a 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -140,7 +140,7 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 copyvar VAR_0x8004, VAR_0x4000 @@ -149,7 +149,7 @@ EventScript_16B843:: @ 816B843 goto_if TRUE, EventScript_16B8E5 checkflag FLAG_TEMP_1 goto_if TRUE, EventScript_16B89E - compare_var_to_var VAR_0x8004, VAR_0x8008 + compare VAR_0x8004, VAR_0x8008 goto_if eq, EventScript_16B885 msgbox gUnknown_8195289 releaseall @@ -166,7 +166,7 @@ EventScript_16B885:: @ 816B885 end EventScript_16B89E:: @ 816B89E - compare_var_to_var VAR_0x8005, VAR_0x8008 + compare VAR_0x8005, VAR_0x8008 goto_if eq, EventScript_16B8CB msgbox gUnknown_819536C clearflag FLAG_TEMP_1 @@ -234,7 +234,7 @@ EventScript_16B9AB:: @ 816B9AB EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B9F0 additem ITEM_TM34, 1 giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 6020f9cb0..cfa7f143e 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -7,7 +7,7 @@ VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 checkflag FLAG_GOT_OLD_ROD goto_if TRUE, EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B3D9 msgbox gUnknown_8194028 release @@ -20,7 +20,7 @@ EventScript_16B3CF:: @ 816B3CF EventScript_16B3D9:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B41A additem ITEM_OLD_ROD, 1 msgbox gUnknown_8193F2A diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index fa9fd6453..e24705d6d 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -9,13 +9,13 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 checkflag FLAG_DID_CH_DING_TRADE goto_if TRUE, EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B631 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16B631 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16B63B call EventScript_1A8CD9 msgbox gUnknown_8194A44 diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index d7beb6e7e..49bf508ee 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -11,7 +11,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D VermilionCity_Mart_EventScript_16B666:: @ 816B666 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 397c174ea..bb6e7e041 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -7,7 +7,7 @@ VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F checkflag FLAG_GOT_BIKE_VOUCHER goto_if TRUE, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B4B1 msgbox gUnknown_8194860 release @@ -21,7 +21,7 @@ EventScript_16B4A7:: @ 816B4A7 EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B4F2 setflag FLAG_GOT_BIKE_VOUCHER additem ITEM_BIKE_VOUCHER, 1 diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 20759c714..cd77c97b1 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -4,7 +4,7 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 .byte 0 VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 call_if ne, EventScript_160F1C end @@ -19,7 +19,7 @@ VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 goto_if eq, EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index d2fa2e8b4..e2018c27e 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -3,9 +3,9 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 .byte 0 VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 call_if ne, EventScript_160FAF - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 call_if ne, EventScript_160FC2 end @@ -21,7 +21,7 @@ EventScript_160FC2:: @ 8160FC2 VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 goto_if eq, EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 @@ -39,7 +39,7 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 goto_if eq, EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index fe77da24d..6f6b4b5bd 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -3,7 +3,7 @@ VictoryRoad_3F_MapScripts:: @ 81610AA .byte 0 VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 call_if ne, EventScript_1610BC end @@ -14,7 +14,7 @@ EventScript_1610BC:: @ 81610BC VictoryRoad_3F_EventScript_1610CF:: @ 81610CF lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 goto_if eq, EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 070c162c6..a9bc4d4b1 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -4,13 +4,13 @@ ViridianCity_MapScripts:: @ 81658D3 ViridianCity_MapScript1_1658D9:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 call_if eq, EventScript_165920 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 call_if eq, EventScript_16590F - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 call_if ge, EventScript_165909 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 call_if eq, EventScript_165931 end @@ -90,7 +90,7 @@ ViridianCity_EventScript_1659C1:: @ 81659C1 ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 goto_if eq, EventScript_1659EC msgbox gUnknown_817DB39 closemessage @@ -109,17 +109,17 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 faceplayer checkflag FLAG_BADGE01_GET goto_if TRUE, EventScript_165A23 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 goto_if ge, EventScript_165A4A - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 goto_if eq, EventScript_165A54 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 goto_if eq, EventScript_165A84 end EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_165A40 msgbox gUnknown_817E0EA release @@ -148,7 +148,7 @@ EventScript_165A5B:: @ 8165A5B EventScript_165A65:: @ 8165A65 msgbox gUnknown_817DE9B special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 special ScrSpecial_StartOldManTutorialBattle @@ -166,9 +166,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F lock faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_165AB0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_165ABA end @@ -185,7 +185,7 @@ EventScript_165ABA:: @ 8165ABA ViridianCity_EventScript_165AC4:: @ 8165AC4 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 goto_if eq, EventScript_165ADB msgbox gUnknown_817DC99 release @@ -243,7 +243,7 @@ EventScript_165B4C:: @ 8165B4C msgbox gUnknown_817DD4E closemessage special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 special ScrSpecial_StartOldManTutorialBattle diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index f3d9bfe10..43660d1ae 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -27,7 +27,7 @@ EventScript_169F04:: @ 8169F04 EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_169F70 additem ITEM_TM26, 1 giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 1c25dd3e4..8a777331e 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -25,15 +25,15 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB lockall msgbox gUnknown_818FC65 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_1A75E9 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 95c45ea7d..f16afdd2e 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -54,10 +54,10 @@ Movement_16A262:: @ 816A262 ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if eq, EventScript_16A2A4 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 message Text_1A6211 waitmessage diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index a62ebb8b8..08655098e 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -43,7 +43,7 @@ MysteryEventScript_SurfPichu:: @ 8488EB5 SurfPichu_GiveIfPossible: @ 8488EC4 specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 + compare VAR_EVENT_PICHU_SLOT, 6 vgoto_if TRUE, SurfPichu_FullParty setflag FLAG_MYSTERY_EVENT_DONE vcall SurfPichu_GiveEgg @@ -70,15 +70,15 @@ SurfPichu_GiveEgg: @ 8488EF6 giveegg SPECIES_PICHU setmonobedient VAR_EVENT_PICHU_SLOT setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff - compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + compare VAR_EVENT_PICHU_SLOT, 1 vgoto_if TRUE, SurfPichu_Slot1 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + compare VAR_EVENT_PICHU_SLOT, 2 vgoto_if TRUE, SurfPichu_Slot2 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + compare VAR_EVENT_PICHU_SLOT, 3 vgoto_if TRUE, SurfPichu_Slot3 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + compare VAR_EVENT_PICHU_SLOT, 4 vgoto_if TRUE, SurfPichu_Slot4 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + compare VAR_EVENT_PICHU_SLOT, 5 vgoto_if TRUE, SurfPichu_Slot5 return @@ -118,7 +118,7 @@ sText_FullParty: @ 8488FE3 MysteryEventScript_VisitingTrainer:: @ 848903A setvaddress MysteryEventScript_VisitingTrainer special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 vgoto_if TRUE, MysteryEventScript_VisitingTrainerArrived lock faceplayer @@ -171,7 +171,7 @@ MysteryEventScript_BattleCard:: @ 84892B9 vgoto_if TRUE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, 2 specialvar VAR_0x8008, Special_BattleCardAction - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 vgoto_if FALSE, MysteryEventScript_BattleCardInfo lock faceplayer @@ -222,13 +222,13 @@ MysteryEventScript_AuroraTicket:: @ 84894B9 checkflag FLAG_FOUGHT_DEOXYS vgoto_if TRUE, AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 vgoto_if TRUE, AuroraTicket_Obtained vmessage sText_AuroraTicket1 waitmessage waitbuttonpress checkitemspace ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 vgoto_if TRUE, AuroraTicket_NoBagSpace giveitem ITEM_AURORA_TICKET setflag FLAG_SYS_GOT_AURORA_TICKET @@ -286,13 +286,13 @@ MysteryEventScript_MysticTicket:: @ 8489689 checkflag FLAG_FOUGHT_HO_OH vgoto_if TRUE, MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 vgoto_if TRUE, MysticTicket_Obtained vmessage sText_MysticTicket2 waitmessage waitbuttonpress checkitemspace ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 vgoto_if TRUE, MysticTicket_NoBagSpace giveitem ITEM_MYSTIC_TICKET setflag FLAG_SYS_GOT_MYSTIC_TICKET @@ -342,7 +342,7 @@ sText_MysticTicketNoPlace: @ 84897EE MysteryEventScript_AlteringCave:: @ 8489862 setvaddress MysteryEventScript_AlteringCave addvar VAR_ALTERING_CAVE_WILD_SET, 1 - compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 + compare VAR_ALTERING_CAVE_WILD_SET, 10 vgoto_if FALSE, MysteryEventScript_AlteringCave_ setvar VAR_ALTERING_CAVE_WILD_SET, 0 MysteryEventScript_AlteringCave_: @ 848987C diff --git a/data/strings.s b/data/strings.s index d1bbeef49..4e77b6063 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1557,7 +1557,7 @@ gText_KeyItems:: @ 0x8417B17 gText_PokeBalls:: @ 0x8417B21 .string "POKé BALLS$" -gText_TmsgUnknown_8417B2CHms:: @ 0x8417B2C +gText_TMsAndHMs:: @ 0x8417B2C .string "TMs & HMs$" gText_Berries:: @ 0x8417B36 diff --git a/include/constants/global.h b/include/constants/global.h index 68c4f8246..4a4c83c62 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -7,24 +7,19 @@ #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 -enum -{ - VERSION_SAPPHIRE = 1, - VERSION_RUBY = 2, - VERSION_EMERALD = 3, - VERSION_FIRE_RED = 4, - VERSION_LEAF_GREEN = 5, -}; +#define VERSION_SAPPHIRE 1 +#define VERSION_RUBY 2 +#define VERSION_EMERALD 3 +#define VERSION_FIRE_RED 4 +#define VERSION_LEAF_GREEN 5 -enum LanguageId { - LANGUAGE_JAPANESE = 1, - LANGUAGE_ENGLISH = 2, - LANGUAGE_FRENCH = 3, - LANGUAGE_ITALIAN = 4, - LANGUAGE_GERMAN = 5, +#define LANGUAGE_JAPANESE 1 +#define LANGUAGE_ENGLISH 2 +#define LANGUAGE_FRENCH 3 +#define LANGUAGE_ITALIAN 4 +#define LANGUAGE_GERMAN 5 // 6 goes unused but the theory is it was meant to be Korean - LANGUAGE_SPANISH = 7, -}; +#define LANGUAGE_SPANISH 7 #ifdef ENGLISH #define GAME_LANGUAGE (LANGUAGE_ENGLISH) @@ -37,49 +32,32 @@ enum LanguageId { #define BAG_TMHM_COUNT 58 #define BAG_BERRIES_COUNT 43 -enum -{ - MALE, - FEMALE -}; +#define MALE 0 +#define FEMALE 1 -enum -{ - OPTIONS_BUTTON_MODE_HELP, - OPTIONS_BUTTON_MODE_LR, - OPTIONS_BUTTON_MODE_L_EQUALS_A -}; +#define OPTIONS_BUTTON_MODE_HELP 0 +#define OPTIONS_BUTTON_MODE_LR 1 +#define OPTIONS_BUTTON_MODE_L_EQUALS_A 2 -enum -{ - OPTIONS_TEXT_SPEED_SLOW, - OPTIONS_TEXT_SPEED_MID, - OPTIONS_TEXT_SPEED_FAST -}; +#define OPTIONS_TEXT_SPEED_SLOW 0 +#define OPTIONS_TEXT_SPEED_MID 1 +#define OPTIONS_TEXT_SPEED_FAST 2 -enum -{ - OPTIONS_SOUND_MONO, - OPTIONS_SOUND_STEREO -}; +#define OPTIONS_SOUND_MONO 0 +#define OPTIONS_SOUND_STEREO 1 -enum -{ - OPTIONS_BATTLE_STYLE_SHIFT, - OPTIONS_BATTLE_STYLE_SET -}; +#define OPTIONS_BATTLE_STYLE_SHIFT 0 +#define OPTIONS_BATTLE_STYLE_SET 1 -enum -{ - POCKET_ITEMS = 1, - POCKET_KEY_ITEMS, - POCKET_POKE_BALLS, - POCKET_TM_CASE, - POCKET_BERRY_POUCH, -}; +#define POCKET_ITEMS 1 +#define POCKET_KEY_ITEMS 2 +#define POCKET_POKE_BALLS 3 +#define POCKET_TM_CASE 4 +#define POCKET_BERRY_POUCH 5 #define NUM_BAG_POCKETS 5 +#define PARTY_SIZE 6 #define MULTI_PARTY_SIZE PARTY_SIZE / 2 #endif //GUARD_CONSTANTS_GLOBAL_H diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h new file mode 100644 index 000000000..2ef3d2544 --- /dev/null +++ b/include/constants/map_scripts.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CONSTANTS_MAP_SCRIPTS_H +#define GUARD_CONSTANTS_MAP_SCRIPTS_H + +#define MAP_SCRIPT_ON_LOAD 1 +#define MAP_SCRIPT_ON_FRAME_TABLE 2 +#define MAP_SCRIPT_ON_TRANSITION 3 +#define MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE 4 +#define MAP_SCRIPT_ON_RESUME 5 +#define MAP_SCRIPT_ON_DIVE_WARP 6 +#define MAP_SCRIPT_ON_RETURN_TO_FIELD 7 + +#endif // GUARD_CONSTANTS_MAP_SCRIPTS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 3f171ede8..3635aef6b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -303,7 +303,10 @@ #define VAR_0x40FE 0x40FE #define VAR_0x40FF 0x40FF -#define SPECIAL_VARS_START 0x8000 +#define VARS_END 0x40FF + +#define SPECIAL_VARS_START 0x8000 + #define VAR_0x8000 0x8000 #define VAR_0x8001 0x8001 #define VAR_0x8002 0x8002 @@ -326,4 +329,6 @@ #define VAR_MON_BOX_POS 0x8013 #define VAR_TEXT_COLOR 0x8014 +#define SPECIAL_VARS_END 0x8014 + #endif // GUARD_CONSTANTS_VARS_H diff --git a/include/global.h b/include/global.h index f4d21704b..d8ea62d5c 100644 --- a/include/global.h +++ b/include/global.h @@ -295,8 +295,6 @@ struct SaveBlock2 extern struct SaveBlock2 *gSaveBlock2Ptr; -#define PARTY_SIZE 6 - struct SecretBaseParty { u32 personality[PARTY_SIZE]; @@ -406,7 +404,7 @@ struct UnkMauvilleOldManStruct u8 unk_2D95; /*0x2D96*/ u16 mauvilleOldMan_ecArray[6]; /*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6]; - /*0x2DAE*/ u8 playerName[8]; + /*0x2DAE*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x2DB6*/ u8 filler_2DB6[0x3]; /*0x2DB9*/ u8 playerTrainerId[4]; u8 unk_2DBD; diff --git a/include/strings.h b/include/strings.h index 90fd49b52..4379ebb65 100644 --- a/include/strings.h +++ b/include/strings.h @@ -823,7 +823,7 @@ extern const u8 gText_Tough_2[]; extern const u8 gText_Items[]; extern const u8 gText_KeyItems[]; extern const u8 gText_PokeBalls[]; -extern const u8 gText_TmsgUnknown_8417B2CHms[]; +extern const u8 gText_TMsAndHMs[]; extern const u8 gText_Berries[]; extern const u8 gText_Boulderbadge[]; extern const u8 gText_Cascadebadge[]; diff --git a/src/script_menu.c b/src/script_menu.c index 4ebd0f8f8..be8578cd0 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -579,7 +579,7 @@ const u8 *const gStdStringPtrs[] = { gText_Items, gText_KeyItems, gText_PokeBalls, - gText_TmsgUnknown_8417B2CHms, + gText_TMsAndHMs, gText_Berries, gText_Boulderbadge, gText_Cascadebadge, From 2e5bf6c9ef4f4406b1dd725e91a88cbdd10ad5c2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 19:16:45 -0500 Subject: [PATCH 02/20] Use map_script constants, name unique map_script labels --- data/maps/BirthIsland_Exterior/scripts.inc | 12 +++++------ data/maps/CeladonCity/scripts.inc | 4 ++-- data/maps/CeladonCity_GameCorner/scripts.inc | 4 ++-- .../CeladonCity_PokemonCenter_1F/scripts.inc | 6 +++--- .../CeladonCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/CeruleanCave_1F/scripts.inc | 4 ++-- data/maps/CeruleanCave_B1F/scripts.inc | 8 ++++---- data/maps/CeruleanCity/scripts.inc | 4 ++-- .../CeruleanCity_PokemonCenter_1F/scripts.inc | 6 +++--- .../CeruleanCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/CinnabarIsland/scripts.inc | 8 ++++---- data/maps/CinnabarIsland_Gym/scripts.inc | 4 ++-- .../scripts.inc | 6 +++--- .../scripts.inc | 8 ++++---- .../scripts.inc | 4 ++-- data/maps/DiglettsCave_B1F/scripts.inc | 4 ++-- data/maps/FiveIsland/scripts.inc | 4 ++-- .../FiveIsland_LostCave_Entrance/scripts.inc | 4 ++-- .../FiveIsland_LostCave_Room10/scripts.inc | 8 ++++---- data/maps/FiveIsland_Meadow/scripts.inc | 4 ++-- .../FiveIsland_PokemonCenter_1F/scripts.inc | 6 +++--- .../FiveIsland_PokemonCenter_2F/scripts.inc | 8 ++++---- .../FiveIsland_ResortGorgeous/scripts.inc | 8 ++++---- .../FiveIsland_RocketWarehouse/scripts.inc | 8 ++++---- data/maps/FourIsland/scripts.inc | 8 ++++---- .../FourIsland_IcefallCave_1F/scripts.inc | 12 +++++------ .../FourIsland_IcefallCave_Back/scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../maps/FourIsland_LoreleisHouse/scripts.inc | 4 ++-- .../FourIsland_PokemonCenter_1F/scripts.inc | 6 +++--- .../FourIsland_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/FuchsiaCity/scripts.inc | 4 ++-- .../FuchsiaCity_PokemonCenter_1F/scripts.inc | 6 +++--- .../FuchsiaCity_PokemonCenter_2F/scripts.inc | 8 ++++---- .../scripts.inc | 4 ++-- data/maps/IndigoPlateau_Exterior/scripts.inc | 8 ++++---- .../scripts.inc | 6 +++--- .../scripts.inc | 8 ++++---- data/maps/LavenderTown/scripts.inc | 4 ++-- .../LavenderTown_PokemonCenter_1F/scripts.inc | 6 +++--- .../LavenderTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/MtEmber_Exterior/scripts.inc | 8 ++++---- data/maps/MtEmber_Summit/scripts.inc | 8 ++++---- data/maps/MtMoon_1F/scripts.inc | 4 ++-- data/maps/MtMoon_B2F/scripts.inc | 4 ++-- data/maps/NavelRock_Base/scripts.inc | 8 ++++---- data/maps/NavelRock_Summit/scripts.inc | 8 ++++---- data/maps/OneIsland/scripts.inc | 8 ++++---- data/maps/OneIsland_Harbor/scripts.inc | 8 ++++---- .../OneIsland_PokemonCenter_1F/scripts.inc | 14 ++++++------- .../OneIsland_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/PalletTown/scripts.inc | 8 ++++---- data/maps/PalletTown_GarysHouse/scripts.inc | 4 ++-- .../PalletTown_PlayersHouse_2F/scripts.inc | 8 ++++---- .../PalletTown_ProfessorOaksLab/scripts.inc | 12 +++++------ data/maps/PewterCity/scripts.inc | 4 ++-- .../PewterCity_PokemonCenter_1F/scripts.inc | 6 +++--- .../PewterCity_PokemonCenter_2F/scripts.inc | 8 ++++---- .../PokemonLeague_AgathasRoom/scripts.inc | 16 +++++++-------- .../maps/PokemonLeague_BrunosRoom/scripts.inc | 16 +++++++-------- .../PokemonLeague_ChampionsRoom/scripts.inc | 12 +++++------ .../maps/PokemonLeague_HallOfFame/scripts.inc | 8 ++++---- .../maps/PokemonLeague_LancesRoom/scripts.inc | 16 +++++++-------- .../PokemonLeague_LoreleisRoom/scripts.inc | 20 +++++++++---------- data/maps/PokemonMansion_1F/scripts.inc | 8 ++++---- data/maps/PokemonMansion_2F/scripts.inc | 4 ++-- data/maps/PokemonMansion_3F/scripts.inc | 4 ++-- data/maps/PokemonMansion_B1F/scripts.inc | 4 ++-- data/maps/PokemonTower_1F/scripts.inc | 4 ++-- data/maps/PowerPlant/scripts.inc | 8 ++++---- data/maps/RocketHideout_B1F/scripts.inc | 8 ++++---- data/maps/RocketHideout_B4F/scripts.inc | 4 ++-- .../maps/Route10_PokemonCenter_1F/scripts.inc | 6 +++--- .../maps/Route10_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/Route12/scripts.inc | 4 ++-- data/maps/Route16/scripts.inc | 12 +++++------ .../maps/Route16_NorthEntrance_1F/scripts.inc | 4 ++-- data/maps/Route18/scripts.inc | 8 ++++---- data/maps/Route18_EastEntrance_1F/scripts.inc | 4 ++-- data/maps/Route23/scripts.inc | 4 ++-- data/maps/Route25_SeaCottage/scripts.inc | 4 ++-- data/maps/Route4_PokemonCenter_1F/scripts.inc | 6 +++--- data/maps/Route4_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/SSAnne_Exterior/scripts.inc | 8 ++++---- data/maps/SafariZone_Center/scripts.inc | 4 ++-- data/maps/SaffronCity/scripts.inc | 4 ++-- .../SaffronCity_PokemonCenter_1F/scripts.inc | 6 +++--- .../SaffronCity_PokemonCenter_2F/scripts.inc | 8 ++++---- .../scripts.inc | 8 ++++---- data/maps/SeafoamIslands_B3F/scripts.inc | 8 ++++---- data/maps/SeafoamIslands_B4F/scripts.inc | 20 +++++++++---------- data/maps/SevenIsland/scripts.inc | 4 ++-- data/maps/SevenIsland_House_Room1/scripts.inc | 8 ++++---- data/maps/SevenIsland_House_Room2/scripts.inc | 8 ++++---- .../SevenIsland_PokemonCenter_1F/scripts.inc | 6 +++--- .../SevenIsland_PokemonCenter_2F/scripts.inc | 8 ++++---- .../scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../SevenIsland_TrainerTower_Roof/scripts.inc | 4 ++-- data/maps/SilphCo_10F/scripts.inc | 4 ++-- data/maps/SilphCo_11F/scripts.inc | 4 ++-- data/maps/SilphCo_1F/scripts.inc | 4 ++-- data/maps/SilphCo_2F/scripts.inc | 4 ++-- data/maps/SilphCo_3F/scripts.inc | 4 ++-- data/maps/SilphCo_4F/scripts.inc | 4 ++-- data/maps/SilphCo_5F/scripts.inc | 4 ++-- data/maps/SilphCo_6F/scripts.inc | 4 ++-- data/maps/SilphCo_7F/scripts.inc | 8 ++++---- data/maps/SilphCo_8F/scripts.inc | 4 ++-- data/maps/SilphCo_9F/scripts.inc | 4 ++-- data/maps/SixIsland/scripts.inc | 4 ++-- data/maps/SixIsland_AlteringCave/scripts.inc | 4 ++-- data/maps/SixIsland_DottedHole_1F/scripts.inc | 4 ++-- data/maps/SixIsland_PatternBush/scripts.inc | 4 ++-- .../SixIsland_PokemonCenter_1F/scripts.inc | 10 +++++----- .../SixIsland_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/SixIsland_RuinValley/scripts.inc | 4 ++-- data/maps/ThreeIsland/scripts.inc | 4 ++-- data/maps/ThreeIsland_BerryForest/scripts.inc | 4 ++-- .../ThreeIsland_DunsparceTunnel/scripts.inc | 4 ++-- .../ThreeIsland_PokemonCenter_1F/scripts.inc | 6 +++--- .../ThreeIsland_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/ThreeIsland_Port/scripts.inc | 4 ++-- data/maps/TwoIsland/scripts.inc | 4 ++-- .../TwoIsland_JoyfulGameCorner/scripts.inc | 14 ++++++------- .../TwoIsland_PokemonCenter_1F/scripts.inc | 6 +++--- .../TwoIsland_PokemonCenter_2F/scripts.inc | 8 ++++---- .../scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- data/maps/UnknownMap_00_04/scripts.inc | 8 ++++---- data/maps/VermilionCity/scripts.inc | 8 ++++---- data/maps/VermilionCity_Gym/scripts.inc | 8 ++++---- .../scripts.inc | 6 +++--- .../scripts.inc | 8 ++++---- data/maps/VictoryRoad_1F/scripts.inc | 8 ++++---- data/maps/VictoryRoad_2F/scripts.inc | 4 ++-- data/maps/VictoryRoad_3F/scripts.inc | 4 ++-- data/maps/ViridianCity/scripts.inc | 4 ++-- data/maps/ViridianCity_Mart/scripts.inc | 8 ++++---- .../ViridianCity_PokemonCenter_1F/scripts.inc | 6 +++--- .../ViridianCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/ViridianForest/scripts.inc | 4 ++-- include/constants/map_scripts.h | 2 +- 149 files changed, 481 insertions(+), 481 deletions(-) diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 9959c058d..3598526ce 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,14 +1,14 @@ BirthIsland_Exterior_MapScripts:: @ 8165203 - map_script 3, BirthIsland_Exterior_MapScript1_165217 - map_script 5, BirthIsland_Exterior_MapScript2_165253 - map_script 7, BirthIsland_Exterior_MapScript3_165213 + map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition + map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField .byte 0 -BirthIsland_Exterior_MapScript3_165213:: @ 8165213 +BirthIsland_Exterior_OnReturnToField:: @ 8165213 special Special_SetDeoxysTriangleObjectPal end -BirthIsland_Exterior_MapScript1_165217:: @ 8165217 +BirthIsland_Exterior_OnTransition:: @ 8165217 setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 @@ -31,7 +31,7 @@ EventScript_165243:: @ 8165243 clearflag FLAG_SYS_DEOXYS_AWAKENED return -BirthIsland_Exterior_MapScript2_165253:: @ 8165253 +BirthIsland_Exterior_OnResume:: @ 8165253 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_16525D end diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index b5e32115f..6c8aea741 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -1,8 +1,8 @@ CeladonCity_MapScripts:: @ 8166C8F - map_script 3, CeladonCity_MapScript1_166C95 + map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition .byte 0 -CeladonCity_MapScript1_166C95:: @ 8166C95 +CeladonCity_OnTransition:: @ 8166C95 setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 1a2403837..d71aa6e3d 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -1,8 +1,8 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 - map_script 1, CeladonCity_GameCorner_MapScript1_16C64C + map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad .byte 0 -CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C +CeladonCity_GameCorner_OnLoad:: @ 816C64C checkflag FLAG_OPENED_ROCKET_HIDEOUT call_if FALSE, EventScript_16C656 end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 92bde48ad..10aedd1da 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC - map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7 - map_script 5, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7 +CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 setrespawn SPAWN_CELADON_CITY end diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc index 1b07679eb..cbe78efca 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F - map_script 2, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 diff --git a/data/maps/CeruleanCave_1F/scripts.inc b/data/maps/CeruleanCave_1F/scripts.inc index db76ddfd7..2113716e2 100644 --- a/data/maps/CeruleanCave_1F/scripts.inc +++ b/data/maps/CeruleanCave_1F/scripts.inc @@ -1,7 +1,7 @@ CeruleanCave_1F_MapScripts:: @ 81624B3 - map_script 3, CeruleanCave_1F_MapScript1_1624B9 + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_1F_OnTransition .byte 0 -CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9 +CeruleanCave_1F_OnTransition:: @ 81624B9 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CAVE_1F end diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 01e077b3c..036f564a5 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -1,9 +1,9 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE - map_script 5, CeruleanCave_B1F_MapScript1_1624C9 - map_script 3, CeruleanCave_B1F_MapScript2_1624E7 + map_script MAP_SCRIPT_ON_RESUME, CeruleanCave_B1F_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_B1F_OnTransition .byte 0 -CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 +CeruleanCave_B1F_OnResume:: @ 81624C9 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_1624D3 end @@ -15,7 +15,7 @@ EventScript_1624D3:: @ 81624D3 removeobject VAR_LAST_TALKED return -CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 +CeruleanCave_B1F_OnTransition:: @ 81624E7 checkflag FLAG_FOUGHT_MEWTWO call_if FALSE, EventScript_1624F1 end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index dd68b4bcc..539b1b2f5 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -1,8 +1,8 @@ CeruleanCity_MapScripts:: @ 8166471 - map_script 3, CeruleanCity_MapScript1_166477 + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition .byte 0 -CeruleanCity_MapScript1_166477:: @ 8166477 +CeruleanCity_OnTransition:: @ 8166477 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY checkflag FLAG_GOT_SS_TICKET call_if FALSE, EventScript_166484 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index 6a67f0fe1..c3bbbbe70 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D - map_script 3, CeruleanCity_PokemonCenter_1F_MapScript1_16AA38 - map_script 5, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38 +CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38 setrespawn SPAWN_CERULEAN_CITY end diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc index 3778c494d..74d3fe451 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 - map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 4a971c1a5..824f0268c 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -1,9 +1,9 @@ CinnabarIsland_MapScripts:: @ 8166ED6 - map_script 3, CinnabarIsland_MapScript1_166EE1 - map_script 2, CinnabarIsland_MapScript2_166F6E + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame .byte 0 -CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 +CinnabarIsland_OnTransition:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1 @@ -50,7 +50,7 @@ EventScript_166F68:: @ 8166F68 setvar VAR_0x4001, 1 return -CinnabarIsland_MapScript2_166F6E:: @ 8166F6E +CinnabarIsland_OnFrame:: @ 8166F6E map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88 map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index f2959212c..f46035e48 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -1,8 +1,8 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B - map_script 1, CinnabarIsland_Gym_MapScript1_16D951 + map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad .byte 0 -CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 +CinnabarIsland_Gym_OnLoad:: @ 816D951 checkflag FLAG_DEFEATED_BLAINE goto_if TRUE, EventScript_16D991 checkflag FLAG_CINNABAR_GYM_QUIZ_1 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 77f003f56..b935d812e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 - map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2 - map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2 +CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 setrespawn SPAWN_CINNABAR_ISLAND end diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 828f9296a..6ca90c913 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 - map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 275161475..89b8f9f09 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -1,8 +1,8 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 - map_script 3, CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279 + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonLab_Entrance_OnTransition .byte 0 -CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 +CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 call_if eq, EventScript_16E285 end diff --git a/data/maps/DiglettsCave_B1F/scripts.inc b/data/maps/DiglettsCave_B1F/scripts.inc index 28bd063ac..9cf544838 100644 --- a/data/maps/DiglettsCave_B1F/scripts.inc +++ b/data/maps/DiglettsCave_B1F/scripts.inc @@ -1,7 +1,7 @@ DiglettsCave_B1F_MapScripts:: @ 8160EF1 - map_script 3, DiglettsCave_B1F_MapScript1_160EF7 + map_script MAP_SCRIPT_ON_TRANSITION, DiglettsCave_B1F_OnTransition .byte 0 -DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7 +DiglettsCave_B1F_OnTransition:: @ 8160EF7 setworldmapflag FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index 916cba8a1..a26723b11 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -1,8 +1,8 @@ FiveIsland_MapScripts:: @ 8167E8E - map_script 3, FiveIsland_MapScript1_167E94 + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_OnTransition .byte 0 -FiveIsland_MapScript1_167E94:: @ 8167E94 +FiveIsland_OnTransition:: @ 8167E94 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND end diff --git a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc index e288ceff6..9292c9e5e 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC - map_script 3, FiveIsland_LostCave_Entrance_MapScript1_164BF2 + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_LostCave_Entrance_OnTransition .byte 0 -FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2 +FiveIsland_LostCave_Entrance_OnTransition:: @ 8164BF2 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index cb7b90267..4d115868c 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -1,9 +1,9 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D - map_script 5, FiveIsland_LostCave_Room10_MapScript1_164C38 - map_script 2, FiveIsland_LostCave_Room10_MapScript2_164C48 + map_script MAP_SCRIPT_ON_RESUME, FiveIsland_LostCave_Room10_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_LostCave_Room10_OnFrame .byte 0 -FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 +FiveIsland_LostCave_Room10_OnResume:: @ 8164C38 checktrainerflag TRAINER_LADY_SELPHY call_if eq, EventScript_164C42 end @@ -12,7 +12,7 @@ EventScript_164C42:: @ 8164C42 setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 return -FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48 +FiveIsland_LostCave_Room10_OnFrame:: @ 8164C48 map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, EventScript_164C52 .2byte 0 diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 51ddd9dd9..11283c81b 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -1,8 +1,8 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 - map_script 1, FiveIsland_Meadow_MapScript1_168938 + map_script MAP_SCRIPT_ON_LOAD, FiveIsland_Meadow_OnLoad .byte 0 -FiveIsland_Meadow_MapScript1_168938:: @ 8168938 +FiveIsland_Meadow_OnLoad:: @ 8168938 checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE call_if TRUE, EventScript_168983 end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index a16cb37d1..48311f359 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 - map_script 3, FiveIsland_PokemonCenter_1F_MapScript1_171CFC - map_script 5, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC +FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC setrespawn SPAWN_FIVE_ISLAND end diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc index 5c50a6092..57590e30b 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B - map_script 2, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index a4d49de1b..b4ccfd848 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -1,9 +1,9 @@ FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 - map_script 4, FiveIsland_ResortGorgeous_MapScript1_1687EF - map_script 2, FiveIsland_ResortGorgeous_MapScript2_1687FE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_ResortGorgeous_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_ResortGorgeous_OnFrame .byte 0 -FiveIsland_ResortGorgeous_MapScript1_1687EF:: @ 81687EF +FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_1687F9 .2byte 0 @@ -11,7 +11,7 @@ EventScript_1687F9:: @ 81687F9 turnobject 255, 2 end -FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE +FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_168808 .2byte 0 diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 1215fb092..62fe32a26 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -1,13 +1,13 @@ FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E - map_script 1, FiveIsland_RocketWarehouse_MapScript1_163F3D - map_script 3, FiveIsland_RocketWarehouse_MapScript2_163F39 + map_script MAP_SCRIPT_ON_LOAD, FiveIsland_RocketWarehouse_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_RocketWarehouse_OnTransition .byte 0 -FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 +FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE end -FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D +FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D checktrainerflag TRAINER_TEAM_ROCKET_ADMIN call_if eq, EventScript_163F47 end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 0515c29b5..bb2bbf330 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -1,9 +1,9 @@ FourIsland_MapScripts:: @ 8167CAE - map_script 3, FourIsland_MapScript1_167CB9 - map_script 2, FourIsland_MapScript2_167CE2 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame .byte 0 -FourIsland_MapScript1_167CB9:: @ 8167CB9 +FourIsland_OnTransition:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare VAR_MAP_SCENE_FOUR_ISLAND, 0 call_if eq, EventScript_167CCD @@ -22,7 +22,7 @@ EventScript_167CD1:: @ 8167CD1 EventScript_167CE1:: @ 8167CE1 return -FourIsland_MapScript2_167CE2:: @ 8167CE2 +FourIsland_OnFrame:: @ 8167CE2 map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC .2byte 0 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 1c3d8da1f..92bda55bf 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -1,18 +1,18 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 - map_script 5, FourIsland_IcefallCave_1F_MapScript1_163D54 - map_script 1, FourIsland_IcefallCave_1F_MapScript2_163D57 - map_script 2, FourIsland_IcefallCave_1F_MapScript3_163D5B + map_script MAP_SCRIPT_ON_RESUME, FourIsland_IcefallCave_1F_OnResume + map_script MAP_SCRIPT_ON_LOAD, FourIsland_IcefallCave_1F_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_IcefallCave_1F_OnFrame .byte 0 -FourIsland_IcefallCave_1F_MapScript1_163D54:: @ 8163D54 +FourIsland_IcefallCave_1F_OnResume:: @ 8163D54 setstepcallback 4 end -FourIsland_IcefallCave_1F_MapScript2_163D57:: @ 8163D57 +FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 special Special_SetIcefallCaveCrackedIceMetatiles end -FourIsland_IcefallCave_1F_MapScript3_163D5B:: @ 8163D5B +FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B map_script_2 VAR_0x4001, 1, EventScript_163D65 .2byte 0 diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 582b068ec..45d0b163e 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -1,8 +1,8 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 - map_script 3, FourIsland_IcefallCave_Back_MapScript1_163D88 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition .byte 0 -FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 +FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88 compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 call_if eq, EventScript_163D94 end diff --git a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc index a3c4ea616..b8bbd1102 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A - map_script 3, FourIsland_IcefallCave_Entrance_MapScript1_163D40 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Entrance_OnTransition .byte 0 -FourIsland_IcefallCave_Entrance_MapScript1_163D40:: @ 8163D40 +FourIsland_IcefallCave_Entrance_OnTransition:: @ 8163D40 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index 6a8915d83..a2fa3215c 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -1,8 +1,8 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E - map_script 3, FourIsland_LoreleisHouse_MapScript1_171C54 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_LoreleisHouse_OnTransition .byte 0 -FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54 +FourIsland_LoreleisHouse_OnTransition:: @ 8171C54 special Special_ComputeLoreleiDollCollection end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index cc4cb5ffa..9f06f57ff 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA - map_script 3, FourIsland_PokemonCenter_1F_MapScript1_171BF5 - map_script 5, FourIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, FourIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5 +FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 setrespawn SPAWN_FOUR_ISLAND end diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc index 08482ec27..9ae9b89ae 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D - map_script 2, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FourIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, FourIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index f66cf33e6..7f26b03f3 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -1,8 +1,8 @@ FuchsiaCity_MapScripts:: @ 8166D75 - map_script 3, FuchsiaCity_MapScript1_166D7B + map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_OnTransition .byte 0 -FuchsiaCity_MapScript1_166D7B:: @ 8166D7B +FuchsiaCity_OnTransition:: @ 8166D7B setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY checkflag FLAG_GOT_DOME_FOSSIL call_if TRUE, EventScript_166D91 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index 062f93acc..b33de6d5e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 - map_script 3, FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC - map_script 5, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC +FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC setrespawn SPAWN_FUCHSIA_CITY end diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc index 322dd3930..c9cd2019c 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 - map_script 2, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index e521d70d4..d02818377 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -1,8 +1,8 @@ FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8 - map_script 2, FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE + map_script MAP_SCRIPT_ON_FRAME_TABLE, FuchsiaCity_SafariZone_Entrance_OnFrame .byte 0 -FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE:: @ 816D2AE +FuchsiaCity_SafariZone_Entrance_OnFrame:: @ 816D2AE map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1, EventScript_16D2F2 map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2, EventScript_16D312 map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3, EventScript_16D2C8 diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index c8bd4aa30..68701031d 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -1,9 +1,9 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B - map_script 3, IndigoPlateau_Exterior_MapScript1_167246 - map_script 2, IndigoPlateau_Exterior_MapScript2_16725A + map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame .byte 0 -IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 +IndigoPlateau_Exterior_OnTransition:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic @@ -13,7 +13,7 @@ EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255 playbgm MUS_ENDING, 0 return -IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A +IndigoPlateau_Exterior_OnFrame:: @ 816725A map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_IndigoPlateau_Exterior_Credits .2byte 0 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 8d15b25fe..37fcdd37d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A - map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65 - map_script 5, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 +IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc index 6c2955435..15a721f76 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F - map_script 2, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index f290f8d14..7cbba172b 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -1,8 +1,8 @@ LavenderTown_MapScripts:: @ 816686B - map_script 3, LavenderTown_MapScript1_166871 + map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_OnTransition .byte 0 -LavenderTown_MapScript1_166871:: @ 8166871 +LavenderTown_OnTransition:: @ 8166871 setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 setflag FLAG_HIDE_SS_ANNE_RIVAL diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index f7341b8f9..e43fee459 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF - map_script 3, LavenderTown_PokemonCenter_1F_MapScript1_16B0FA - map_script 5, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA +LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA setrespawn SPAWN_LAVENDER_TOWN end diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc index 7042c66c8..7e7bc4431 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 - map_script 2, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index b76eb8502..b43644467 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -1,9 +1,9 @@ MtEmber_Exterior_MapScripts:: @ 8163946 - map_script 3, MtEmber_Exterior_MapScript1_163951 - map_script 1, MtEmber_Exterior_MapScript2_163969 + map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Exterior_OnTransition + map_script MAP_SCRIPT_ON_LOAD, MtEmber_Exterior_OnLoad .byte 0 -MtEmber_Exterior_MapScript1_163951:: @ 8163951 +MtEmber_Exterior_OnTransition:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 call_if eq, EventScript_163960 @@ -14,7 +14,7 @@ EventScript_163960:: @ 8163960 setobjectmovementtype 3, 8 return -MtEmber_Exterior_MapScript2_163969:: @ 8163969 +MtEmber_Exterior_OnLoad:: @ 8163969 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 call_if ge, EventScript_163975 end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 4d4662e6e..102fa72a5 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -1,9 +1,9 @@ MtEmber_Summit_MapScripts:: @ 8163AFC - map_script 3, MtEmber_Summit_MapScript1_163B25 - map_script 5, MtEmber_Summit_MapScript2_163B07 + map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Summit_OnTransition + map_script MAP_SCRIPT_ON_RESUME, MtEmber_Summit_OnResume .byte 0 -MtEmber_Summit_MapScript2_163B07:: @ 8163B07 +MtEmber_Summit_OnResume:: @ 8163B07 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_163B11 end @@ -15,7 +15,7 @@ EventScript_163B11:: @ 8163B11 removeobject VAR_LAST_TALKED return -MtEmber_Summit_MapScript1_163B25:: @ 8163B25 +MtEmber_Summit_OnTransition:: @ 8163B25 checkflag FLAG_FOUGHT_MOLTRES call_if FALSE, EventScript_163B2F end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 28bc65ec9..f2c50be17 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -1,8 +1,8 @@ MtMoon_1F_MapScripts:: @ 81605E4 - map_script 3, MtMoon_1F_MapScript1_1605EA + map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_1F_OnTransition .byte 0 -MtMoon_1F_MapScript1_1605EA:: @ 81605EA +MtMoon_1F_OnTransition:: @ 81605EA setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index f0e2ff9f8..99360a55a 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -1,8 +1,8 @@ MtMoon_B2F_MapScripts:: @ 8160699 - map_script 3, MtMoon_B2F_MapScript1_16069F + map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition .byte 0 -MtMoon_B2F_MapScript1_16069F:: @ 816069F +MtMoon_B2F_OnTransition:: @ 816069F checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON call_if FALSE, EventScript_1606A9 end diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index dfe55b6b2..86981b393 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -1,9 +1,9 @@ NavelRock_Base_MapScripts:: @ 81650E7 - map_script 3, NavelRock_Base_MapScript1_1650F2 - map_script 5, NavelRock_Base_MapScript2_165116 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Base_OnTransition + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Base_OnResume .byte 0 -NavelRock_Base_MapScript1_1650F2:: @ 81650F2 +NavelRock_Base_OnTransition:: @ 81650F2 checkflag FLAG_FOUGHT_LUGIA call_if TRUE, EventScript_165105 checkflag FLAG_FOUGHT_LUGIA @@ -20,7 +20,7 @@ EventScript_165109:: @ 8165109 clearflag FLAG_HIDE_LUGIA return -NavelRock_Base_MapScript2_165116:: @ 8165116 +NavelRock_Base_OnResume:: @ 8165116 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_165120 end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 050f05518..3d2b7669f 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -1,9 +1,9 @@ NavelRock_Summit_MapScripts:: @ 8164F9F - map_script 3, NavelRock_Summit_MapScript1_164FAA - map_script 5, NavelRock_Summit_MapScript2_164FDD + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Summit_OnTransition + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Summit_OnResume .byte 0 -NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA +NavelRock_Summit_OnTransition:: @ 8164FAA checkflag FLAG_FOUGHT_HO_OH call_if TRUE, EventScript_164FBD checkflag FLAG_FOUGHT_HO_OH @@ -23,7 +23,7 @@ EventScript_164FC6:: @ 8164FC6 clearflag FLAG_HIDE_HO_OH return -NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD +NavelRock_Summit_OnResume:: @ 8164FDD checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_164FE7 end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 16830e056..1c207941d 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -1,13 +1,13 @@ OneIsland_MapScripts:: @ 8167484 - map_script 3, OneIsland_MapScript1_16748F - map_script 2, OneIsland_MapScript2_167493 + map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame .byte 0 -OneIsland_MapScript1_16748F:: @ 816748F +OneIsland_OnTransition:: @ 816748F setworldmapflag FLAG_WORLD_MAP_ONE_ISLAND end -OneIsland_MapScript2_167493:: @ 8167493 +OneIsland_OnFrame:: @ 8167493 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, EventScript_16749D .2byte 0 diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 75e74dad7..5bf27c3e5 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -1,9 +1,9 @@ OneIsland_Harbor_MapScripts:: @ 8171378 - map_script 4, OneIsland_Harbor_MapScript1_171383 - map_script 2, OneIsland_Harbor_MapScript2_171392 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OneIsland_Harbor_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_Harbor_OnFrame .byte 0 -OneIsland_Harbor_MapScript1_171383:: @ 8171383 +OneIsland_Harbor_OnWarp:: @ 8171383 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17138D .2byte 0 @@ -11,7 +11,7 @@ EventScript_17138D:: @ 817138D turnobject 255, 2 end -OneIsland_Harbor_MapScript2_171392:: @ 8171392 +OneIsland_Harbor_OnFrame:: @ 8171392 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17139C .2byte 0 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 778f63fed..514ed9ee7 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,11 +1,11 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 - map_script 3, OneIsland_PokemonCenter_1F_MapScript1_170C4E - map_script 5, OneIsland_PokemonCenter_1F_MapScript2_1BC05C - map_script 1, OneIsland_PokemonCenter_1F_MapScript3_170C0D - map_script 2, OneIsland_PokemonCenter_1F_MapScript4_170CA7 + map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, OneIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_1F_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_1F_OnFrame .byte 0 -OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D +OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 call_if ge, EventScript_170C22 checkflag FLAG_SYS_CAN_LINK_WITH_RS @@ -26,7 +26,7 @@ EventScript_170C36:: @ 8170C36 setmetatile 15, 4, 859, 1 return -OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E +OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 call_if eq, EventScript_170C73 @@ -54,7 +54,7 @@ EventScript_170C90:: @ 8170C90 setobjectmovementtype 3, 9 return -OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7 +OneIsland_PokemonCenter_1F_OnFrame:: @ 8170CA7 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, EventScript_170CB1 .2byte 0 diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc index 0948f1cee..8e03adc77 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 - map_script 2, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, OneIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 852c6425f..7f268aafe 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -1,9 +1,9 @@ PalletTown_MapScripts:: @ 816545A - map_script 3, PalletTown_MapScript1_165465 - map_script 2, PalletTown_MapScript2_1654CE + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_OnFrame .byte 0 -PalletTown_MapScript1_165465:: @ 8165465 +PalletTown_OnTransition:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN call_if TRUE, EventScript_165488 @@ -38,7 +38,7 @@ EventScript_1654BD:: @ 81654BD setvar VAR_0x4002, 1 return -PalletTown_MapScript2_1654CE:: @ 81654CE +PalletTown_OnFrame:: @ 81654CE map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, EventScript_1654D8 .2byte 0 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index eb1b0d890..4df205d11 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -1,8 +1,8 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 - map_script 3, PalletTown_GarysHouse_MapScript1_168D2D + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_GarysHouse_OnTransition .byte 0 -PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D +PalletTown_GarysHouse_OnTransition:: @ 8168D2D compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if lt, EventScript_168D44 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 9a61ce24c..55f18360a 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -1,9 +1,9 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 - map_script 3, PalletTown_PlayersHouse_2F_MapScript1_168CAE - map_script 4, PalletTown_PlayersHouse_2F_MapScript2_168CBE + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_PlayersHouse_2F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_PlayersHouse_2F_OnWarp .byte 0 -PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE +PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 call_if eq, EventScript_168CBA end @@ -12,7 +12,7 @@ EventScript_168CBA:: @ 8168CBA setrespawn SPAWN_PALLET_TOWN return -PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE +PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, EventScript_168CC8 .2byte 0 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index cd94b5929..3d805d319 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1,10 +1,10 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E - map_script 3, PalletTown_ProfessorOaksLab_MapScript1_168F8E - map_script 4, PalletTown_ProfessorOaksLab_MapScript2_168FE1 - map_script 2, PalletTown_ProfessorOaksLab_MapScript3_168FF0 + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_ProfessorOaksLab_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_ProfessorOaksLab_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_ProfessorOaksLab_OnFrame .byte 0 -PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E +PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E setflag FLAG_VISITED_OAKS_LAB compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 call_if eq, EventScript_168FC6 @@ -35,7 +35,7 @@ EventScript_168FD5:: @ 8168FD5 setobjectmovementtype 4, 7 return -PalletTown_ProfessorOaksLab_MapScript2_168FE1:: @ 8168FE1 +PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1 map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_168FEB .2byte 0 @@ -43,7 +43,7 @@ EventScript_168FEB:: @ 8168FEB turnobject 255, 2 end -PalletTown_ProfessorOaksLab_MapScript3_168FF0:: @ 8168FF0 +PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_16923E map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, EventScript_169002 .2byte 0 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 8328a8f04..1a1fcf4c7 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1,8 +1,8 @@ PewterCity_MapScripts:: @ 8165B8E - map_script 3, PewterCity_MapScript1_165B94 + map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_OnTransition .byte 0 -PewterCity_MapScript1_165B94:: @ 8165B94 +PewterCity_OnTransition:: @ 8165B94 setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 0 end diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index dfaab8a86..e4d214e67 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 - map_script 3, PewterCity_PokemonCenter_1F_MapScript1_16A76B - map_script 5, PewterCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, PewterCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B +PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B setrespawn SPAWN_PEWTER_CITY end diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc index 6fce8dda2..9e4447709 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 - map_script 2, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, PewterCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, PewterCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index e04da7f80..8753b899c 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -1,16 +1,16 @@ PokemonLeague_AgathasRoom_MapScripts:: @ 8162810 - map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825 - map_script 1, PokemonLeague_AgathasRoom_MapScript2_162830 - map_script 4, PokemonLeague_AgathasRoom_MapScript3_162851 - map_script 2, PokemonLeague_AgathasRoom_MapScript4_162860 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_AgathasRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_AgathasRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_AgathasRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_AgathasRoom_OnFrame .byte 0 -PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 +PokemonLeague_AgathasRoom_OnResume:: @ 8162825 setvar VAR_0x8004, 2 call EventScript_1A75D5 end -PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 +PokemonLeague_AgathasRoom_OnLoad:: @ 8162830 checkflag FLAG_DEFEATED_AGATHA call_if TRUE, EventScript_16284B compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 @@ -25,7 +25,7 @@ EventScript_16284B:: @ 816284B call EventScript_1A7538 return -PokemonLeague_AgathasRoom_MapScript3_162851:: @ 8162851 +PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 map_script_2 VAR_0x4001, 0, EventScript_16285B .2byte 0 @@ -33,7 +33,7 @@ EventScript_16285B:: @ 816285B turnobject 255, 2 end -PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860 +PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, EventScript_16286A .2byte 0 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 64bbd0614..98de24a6c 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -1,16 +1,16 @@ PokemonLeague_BrunosRoom_MapScripts:: @ 8162685 - map_script 5, PokemonLeague_BrunosRoom_MapScript1_16269A - map_script 1, PokemonLeague_BrunosRoom_MapScript2_1626A5 - map_script 4, PokemonLeague_BrunosRoom_MapScript3_1626C6 - map_script 2, PokemonLeague_BrunosRoom_MapScript4_1626D5 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_BrunosRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_BrunosRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_BrunosRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_BrunosRoom_OnFrame .byte 0 -PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A +PokemonLeague_BrunosRoom_OnResume:: @ 816269A setvar VAR_0x8004, 1 call EventScript_1A75D5 end -PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 +PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5 checkflag FLAG_DEFEATED_BRUNO call_if TRUE, EventScript_1626C0 compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2 @@ -25,7 +25,7 @@ EventScript_1626C0:: @ 81626C0 call EventScript_1A7538 return -PokemonLeague_BrunosRoom_MapScript3_1626C6:: @ 81626C6 +PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 map_script_2 VAR_0x4001, 0, EventScript_1626D0 .2byte 0 @@ -33,7 +33,7 @@ EventScript_1626D0:: @ 81626D0 turnobject 255, 2 end -PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5 +PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, EventScript_1626DF .2byte 0 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 449f0f741..4dfdf4e94 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -1,10 +1,10 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 - map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D - map_script 5, PokemonLeague_ChampionsRoom_MapScript2_162AF2 - map_script 2, PokemonLeague_ChampionsRoom_MapScript3_162B6C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_ChampionsRoom_OnFrame .byte 0 -PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 +PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 compare VAR_STARTER_MON, 2 @@ -40,7 +40,7 @@ EventScript_162B57:: @ 8162B57 setvar VAR_0x4001, 1 return -PokemonLeague_ChampionsRoom_MapScript1_162B5D:: @ 8162B5D +PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D map_script_2 VAR_0x4001, 0, EventScript_162B67 .2byte 0 @@ -48,7 +48,7 @@ EventScript_162B67:: @ 8162B67 turnobject 255, 2 end -PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C +PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C map_script_2 VAR_0x4001, 0, EventScript_162B76 .2byte 0 diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 11df46047..c3556df44 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -1,9 +1,9 @@ PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C - map_script 2, PokemonLeague_HallOfFame_MapScript1_162D66 - map_script 4, PokemonLeague_HallOfFame_MapScript2_162D57 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_HallOfFame_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_HallOfFame_OnWarp .byte 0 -PokemonLeague_HallOfFame_MapScript2_162D57:: @ 8162D57 +PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 map_script_2 VAR_0x4001, 0, EventScript_162D61 .2byte 0 @@ -11,7 +11,7 @@ EventScript_162D61:: @ 8162D61 turnobject 255, 2 end -PokemonLeague_HallOfFame_MapScript1_162D66:: @ 8162D66 +PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 map_script_2 VAR_0x4001, 0, EventScript_162D70 .2byte 0 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 4cadcee31..8e0a9a186 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -1,16 +1,16 @@ PokemonLeague_LancesRoom_MapScripts:: @ 816292D - map_script 5, PokemonLeague_LancesRoom_MapScript1_162942 - map_script 1, PokemonLeague_LancesRoom_MapScript2_16294D - map_script 4, PokemonLeague_LancesRoom_MapScript3_16296E - map_script 2, PokemonLeague_LancesRoom_MapScript4_16297D + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LancesRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LancesRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_LancesRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_LancesRoom_OnFrame .byte 0 -PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 +PokemonLeague_LancesRoom_OnResume:: @ 8162942 setvar VAR_0x8004, 3 call EventScript_1A75D5 end -PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D +PokemonLeague_LancesRoom_OnLoad:: @ 816294D compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4 call_if eq, EventScript_162962 checkflag FLAG_DEFEATED_LANCE @@ -25,7 +25,7 @@ EventScript_162968:: @ 8162968 call EventScript_1A7589 return -PokemonLeague_LancesRoom_MapScript3_16296E:: @ 816296E +PokemonLeague_LancesRoom_OnWarp:: @ 816296E map_script_2 VAR_0x4001, 0, EventScript_162978 .2byte 0 @@ -33,7 +33,7 @@ EventScript_162978:: @ 8162978 turnobject 255, 2 end -PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D +PokemonLeague_LancesRoom_OnFrame:: @ 816297D map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, EventScript_162987 .2byte 0 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index dd337943d..cbf014bc8 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -1,17 +1,17 @@ PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C - map_script 5, PokemonLeague_LoreleisRoom_MapScript1_162586 - map_script 1, PokemonLeague_LoreleisRoom_MapScript2_162591 - map_script 3, PokemonLeague_LoreleisRoom_MapScript3_1625B2 - map_script 4, PokemonLeague_LoreleisRoom_MapScript4_1625B6 - map_script 2, PokemonLeague_LoreleisRoom_MapScript5_1625C5 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LoreleisRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LoreleisRoom_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, PokemonLeague_LoreleisRoom_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_LoreleisRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_LoreleisRoom_OnFrame .byte 0 -PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 +PokemonLeague_LoreleisRoom_OnResume:: @ 8162586 setvar VAR_0x8004, 0 call EventScript_1A75D5 end -PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 +PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591 checkflag FLAG_DEFEATED_LORELEI call_if TRUE, EventScript_1625AC compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1 @@ -26,11 +26,11 @@ EventScript_1625AC:: @ 81625AC call EventScript_1A7538 return -PokemonLeague_LoreleisRoom_MapScript3_1625B2:: @ 81625B2 +PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2 setworldmapflag FLAG_WORLD_MAP_POKEMON_LEAGUE_LORELEIS_ROOM end -PokemonLeague_LoreleisRoom_MapScript4_1625B6:: @ 81625B6 +PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 map_script_2 VAR_0x4001, 0, EventScript_1625C0 .2byte 0 @@ -38,7 +38,7 @@ EventScript_1625C0:: @ 81625C0 turnobject 255, 2 end -PokemonLeague_LoreleisRoom_MapScript5_1625C5:: @ 81625C5 +PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, EventScript_1625CF .2byte 0 diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index ceb59874a..cacbe77da 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -1,14 +1,14 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 - map_script 1, PokemonMansion_1F_MapScript1_162204 - map_script 3, PokemonMansion_1F_MapScript2_16220E + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, PokemonMansion_1F_OnTransition .byte 0 -PokemonMansion_1F_MapScript1_162204:: @ 8162204 +PokemonMansion_1F_OnLoad:: @ 8162204 checkflag FLAG_POKEMON_MANSION_SWITCH_STATE call_if TRUE, EventScript_1A7B7A end -PokemonMansion_1F_MapScript2_16220E:: @ 816220E +PokemonMansion_1F_OnTransition:: @ 816220E setworldmapflag FLAG_WORLD_MAP_POKEMON_MANSION_1F end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index c0bdae1e9..965993fc8 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -1,8 +1,8 @@ PokemonMansion_2F_MapScripts:: @ 8162254 - map_script 1, PokemonMansion_2F_MapScript1_16225A + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_2F_OnLoad .byte 0 -PokemonMansion_2F_MapScript1_16225A:: @ 816225A +PokemonMansion_2F_OnLoad:: @ 816225A checkflag FLAG_POKEMON_MANSION_SWITCH_STATE call_if TRUE, EventScript_1A7D3E end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 6546b024e..141c63c7e 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -1,8 +1,8 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 - map_script 1, PokemonMansion_3F_MapScript1_1622A7 + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_3F_OnLoad .byte 0 -PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7 +PokemonMansion_3F_OnLoad:: @ 81622A7 checkflag FLAG_POKEMON_MANSION_SWITCH_STATE call_if TRUE, EventScript_1A7E72 end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 3baba4c34..7d1e70692 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -1,8 +1,8 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC - map_script 1, PokemonMansion_B1F_MapScript1_162302 + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_B1F_OnLoad .byte 0 -PokemonMansion_B1F_MapScript1_162302:: @ 8162302 +PokemonMansion_B1F_OnLoad:: @ 8162302 checkflag FLAG_POKEMON_MANSION_SWITCH_STATE call_if TRUE, EventScript_1A7F4C end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index dd8b16a70..35e34047e 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -1,8 +1,8 @@ PokemonTower_1F_MapScripts:: @ 8163235 - map_script 3, PokemonTower_1F_MapScript1_16323B + map_script MAP_SCRIPT_ON_TRANSITION, PokemonTower_1F_OnTransition .byte 0 -PokemonTower_1F_MapScript1_16323B:: @ 816323B +PokemonTower_1F_OnTransition:: @ 816323B setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F end diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 9255df5e0..cb9867905 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -1,9 +1,9 @@ PowerPlant_MapScripts:: @ 8163764 - map_script 5, PowerPlant_MapScript1_16376F - map_script 3, PowerPlant_MapScript2_16378D + map_script MAP_SCRIPT_ON_RESUME, PowerPlant_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, PowerPlant_OnTransition .byte 0 -PowerPlant_MapScript1_16376F:: @ 816376F +PowerPlant_OnResume:: @ 816376F checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_163779 end @@ -15,7 +15,7 @@ EventScript_163779:: @ 8163779 removeobject VAR_LAST_TALKED return -PowerPlant_MapScript2_16378D:: @ 816378D +PowerPlant_OnTransition:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT checkflag FLAG_FOUGHT_ZAPDOS call_if FALSE, EventScript_1637AC diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 6e2f8eeb3..ee140a736 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -1,14 +1,14 @@ RocketHideout_B1F_MapScripts:: @ 8161195 - map_script 1, RocketHideout_B1F_MapScript1_1611A0 - map_script 3, RocketHideout_B1F_MapScript2_1611AA + map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, RocketHideout_B1F_OnTransition .byte 0 -RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 +RocketHideout_B1F_OnLoad:: @ 81611A0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 call_if lt, EventScript_161233 end -RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA +RocketHideout_B1F_OnTransition:: @ 81611AA setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 20b36dd57..fca61e89b 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -1,8 +1,8 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 - map_script 1, RocketHideout_B4F_MapScript1_1612EE + map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad .byte 0 -RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE +RocketHideout_B4F_OnLoad:: @ 81612EE setvar VAR_0x4001, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if eq, EventScript_161311 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 9e62817c0..854604f58 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F - map_script 3, Route10_PokemonCenter_1F_MapScript1_16FC3A - map_script 5, Route10_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, Route10_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A +Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F setrespawn SPAWN_ROUTE10 end diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc index 54b5d0036..e49ddeccb 100644 --- a/data/maps/Route10_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA - map_script 2, Route10_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route10_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route10_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route10_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route10_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route10_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, Route10_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index a468a579f..cdd28f02a 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -1,8 +1,8 @@ Route12_MapScripts:: @ 8168000 - map_script 5, Route12_MapScript1_168006 + map_script MAP_SCRIPT_ON_RESUME, Route12_OnResume .byte 0 -Route12_MapScript1_168006:: @ 8168006 +Route12_OnResume:: @ 8168006 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_168010 end diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index a69fbf22a..4ab510912 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -1,10 +1,10 @@ Route16_MapScripts:: @ 81680E5 - map_script 5, Route16_MapScript1_1680F5 - map_script 3, Route16_MapScript2_168103 - map_script 4, Route16_MapScript3_168113 + map_script MAP_SCRIPT_ON_RESUME, Route16_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, Route16_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route16_OnWarp .byte 0 -Route16_MapScript1_1680F5:: @ 81680F5 +Route16_OnResume:: @ 81680F5 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_1680FF end @@ -13,7 +13,7 @@ EventScript_1680FF:: @ 81680FF removeobject VAR_LAST_TALKED return -Route16_MapScript2_168103:: @ 8168103 +Route16_OnTransition:: @ 8168103 compare VAR_MAP_SCENE_ROUTE16, 1 call_if eq, EventScript_16810F end @@ -22,7 +22,7 @@ EventScript_16810F:: @ 816810F setflag FLAG_SYS_ON_CYCLING_ROAD return -Route16_MapScript3_168113:: @ 8168113 +Route16_OnWarp:: @ 8168113 map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16811D .2byte 0 diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index ff5c43dd3..6d13a9b93 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -1,8 +1,8 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 - map_script 3, Route16_NorthEntrance_1F_MapScript1_1701C8 + map_script MAP_SCRIPT_ON_TRANSITION, Route16_NorthEntrance_1F_OnTransition .byte 0 -Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8 +Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 clearflag FLAG_SYS_ON_CYCLING_ROAD checkflag FLAG_GOT_BICYCLE call_if TRUE, EventScript_1701D5 diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index b50bf30c1..f3e1f1032 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -1,9 +1,9 @@ Route18_MapScripts:: @ 81681F6 - map_script 3, Route18_MapScript1_168201 - map_script 4, Route18_MapScript2_168211 + map_script MAP_SCRIPT_ON_TRANSITION, Route18_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route18_OnWarp .byte 0 -Route18_MapScript1_168201:: @ 8168201 +Route18_OnTransition:: @ 8168201 compare VAR_MAP_SCENE_ROUTE16, 1 call_if eq, EventScript_16820D end @@ -12,7 +12,7 @@ EventScript_16820D:: @ 816820D setflag FLAG_SYS_ON_CYCLING_ROAD return -Route18_MapScript2_168211:: @ 8168211 +Route18_OnWarp:: @ 8168211 map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B .2byte 0 diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 25fe611c0..961cf9ce1 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -1,8 +1,8 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 - map_script 3, Route18_EastEntrance_1F_MapScript1_17037E + map_script MAP_SCRIPT_ON_TRANSITION, Route18_EastEntrance_1F_OnTransition .byte 0 -Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E +Route18_EastEntrance_1F_OnTransition:: @ 817037E clearflag FLAG_SYS_ON_CYCLING_ROAD checkflag FLAG_GOT_BICYCLE call_if TRUE, EventScript_17038B diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index ed827114c..df211bc3f 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -1,8 +1,8 @@ Route23_MapScripts:: @ 81684EB - map_script 3, Route23_MapScript1_1684F1 + map_script MAP_SCRIPT_ON_TRANSITION, Route23_OnTransition .byte 0 -Route23_MapScript1_1684F1:: @ 81684F1 +Route23_OnTransition:: @ 81684F1 clearflag FLAG_HIDE_VICTORY_ROAD_3F_BOULDER setflag FLAG_HIDE_VICTORY_ROAD_2F_BOULDER setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 0 diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index bfa331bef..72837c224 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -1,8 +1,8 @@ Route25_SeaCottage_MapScripts:: @ 8170523 - map_script 3, Route25_SeaCottage_MapScript1_170529 + map_script MAP_SCRIPT_ON_TRANSITION, Route25_SeaCottage_OnTransition .byte 0 -Route25_SeaCottage_MapScript1_170529:: @ 8170529 +Route25_SeaCottage_OnTransition:: @ 8170529 checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE call_if FALSE, EventScript_17053C checkflag FLAG_GOT_SS_TICKET diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 23b4162a0..4ee1acf22 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 - map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 - map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, Route4_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 +Route4_PokemonCenter_1F_OnTransition:: @ 816F744 setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F setrespawn SPAWN_ROUTE4 end diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index bff6832da..b1f69ff32 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 - map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route4_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route4_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, Route4_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index e2cfc4eb9..ffa1ed8fd 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -1,13 +1,13 @@ SSAnne_Exterior_MapScripts:: @ 8160840 - map_script 3, SSAnne_Exterior_MapScript1_16084B - map_script 2, SSAnne_Exterior_MapScript2_16084F + map_script MAP_SCRIPT_ON_TRANSITION, SSAnne_Exterior_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSAnne_Exterior_OnFrame .byte 0 -SSAnne_Exterior_MapScript1_16084B:: @ 816084B +SSAnne_Exterior_OnTransition:: @ 816084B setworldmapflag FLAG_WORLD_MAP_SSANNE_EXTERIOR end -SSAnne_Exterior_MapScript2_16084F:: @ 816084F +SSAnne_Exterior_OnFrame:: @ 816084F map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_160859 .2byte 0 diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 9f887910a..28e8fb3e6 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -1,8 +1,8 @@ SafariZone_Center_MapScripts:: @ 8162357 - map_script 3, SafariZone_Center_MapScript1_16235D + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_Center_OnTransition .byte 0 -SafariZone_Center_MapScript1_16235D:: @ 816235D +SafariZone_Center_OnTransition:: @ 816235D setworldmapflag FLAG_WORLD_MAP_SAFARI_ZONE_CENTER end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 498557ddb..1fdc73973 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -1,8 +1,8 @@ SaffronCity_MapScripts:: @ 816735F - map_script 3, SaffronCity_MapScript1_167365 + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_OnTransition .byte 0 -SaffronCity_MapScript1_167365:: @ 8167365 +SaffronCity_OnTransition:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY checkflag FLAG_RESCUED_MR_FUJI call_if FALSE, EventScript_167372 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index c9b2ca3a6..c9dda1809 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC - map_script 3, SaffronCity_PokemonCenter_1F_MapScript1_16EFF7 - map_script 5, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7 +SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 setrespawn SPAWN_SAFFRON_CITY end diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc index 7ebc68fb5..a5e05bca1 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 - map_script 2, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index dbf2c8f3f..500d6f49f 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -1,9 +1,9 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF - map_script 2, SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA - map_script 3, SaffronCity_PokemonTrainerFanClub_MapScript2_16F144 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonTrainerFanClub_OnFrame + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonTrainerFanClub_OnTransition .byte 0 -SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA +SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4 .2byte 0 @@ -70,7 +70,7 @@ Movement_16F13E:: @ 816F13E step_2d step_end -SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 +SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 goto_if eq, EventScript_16F267 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 0ea5df1b7..342e3499b 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -1,9 +1,9 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F - map_script 3, SeafoamIslands_B3F_MapScript1_162F5A - map_script 2, SeafoamIslands_B3F_MapScript2_162F98 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B3F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B3F_OnFrame .byte 0 -SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A +SeafoamIslands_B3F_OnTransition:: @ 8162F5A checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT call_if FALSE, EventScript_162F6D checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT @@ -28,7 +28,7 @@ EventScript_162F94:: @ 8162F94 setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC return -SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 +SeafoamIslands_B3F_OnFrame:: @ 8162F98 map_script_2 VAR_0x4001, 1, EventScript_162FA2 .2byte 0 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 1a25b02f8..2d9d6fd71 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -1,12 +1,12 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E - map_script 3, SeafoamIslands_B4F_MapScript1_163066 - map_script 5, SeafoamIslands_B4F_MapScript2_163048 - map_script 1, SeafoamIslands_B4F_MapScript3_1630B1 - map_script 4, SeafoamIslands_B4F_MapScript4_1630E7 - map_script 2, SeafoamIslands_B4F_MapScript5_1630F9 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B4F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SeafoamIslands_B4F_OnResume + map_script MAP_SCRIPT_ON_LOAD, SeafoamIslands_B4F_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SeafoamIslands_B4F_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B4F_OnFrame .byte 0 -SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 +SeafoamIslands_B4F_OnResume:: @ 8163048 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_163052 end @@ -18,7 +18,7 @@ EventScript_163052:: @ 8163052 removeobject VAR_LAST_TALKED return -SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 +SeafoamIslands_B4F_OnTransition:: @ 8163066 checkflag FLAG_FOUGHT_ARTICUNO call_if FALSE, EventScript_1630AD checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT @@ -49,7 +49,7 @@ EventScript_1630AD:: @ 81630AD clearflag FLAG_HIDE_ARTICUNO return -SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 +SeafoamIslands_B4F_OnLoad:: @ 81630B1 setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if FALSE, EventScript_163169 @@ -64,7 +64,7 @@ EventScript_1630D4:: @ 81630D4 setmetatile 13, 14, 299, 0 end -SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7 +SeafoamIslands_B4F_OnWarp:: @ 81630E7 map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_1630F1 .2byte 0 @@ -73,7 +73,7 @@ EventScript_1630F1:: @ 81630F1 special Special_ForcePlayerToStartSurfing end -SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9 +SeafoamIslands_B4F_OnFrame:: @ 81630F9 map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B map_script_2 VAR_0x4001, 1, EventScript_163121 .2byte 0 diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 92a3ceaf4..2f9606459 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_MapScripts:: @ 8167EB3 - map_script 3, SevenIsland_MapScript1_167EB9 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_OnTransition .byte 0 -SevenIsland_MapScript1_167EB9:: @ 8167EB9 +SevenIsland_OnTransition:: @ 8167EB9 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index aa4e7f1ae..e31934afa 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -1,9 +1,9 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A - map_script 3, SevenIsland_House_Room1_MapScript1_170895 - map_script 2, SevenIsland_House_Room1_MapScript2_1708CF + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room1_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room1_OnFrame .byte 0 -SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 +SevenIsland_House_Room1_OnTransition:: @ 8170895 special ValidateEReaderTrainer compare VAR_RESULT, 0 call_if eq, EventScript_1708AF @@ -23,7 +23,7 @@ EventScript_1708C3:: @ 81708C3 setobjectmovementtype 1, 10 return -SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF +SevenIsland_House_Room1_OnFrame:: @ 81708CF map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9 map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9 map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9 diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 03a64b8e6..bf8bb3030 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -1,13 +1,13 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E - map_script 3, SevenIsland_House_Room2_MapScript1_170A89 - map_script 2, SevenIsland_House_Room2_MapScript2_170A8D + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room2_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room2_OnFrame .byte 0 -SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89 +SevenIsland_House_Room2_OnTransition:: @ 8170A89 special SetEReaderTrainerGfxId end -SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D +SevenIsland_House_Room2_OnFrame:: @ 8170A8D map_script_2 VAR_0x4001, 0, EventScript_170A97 .2byte 0 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 170459099..7d5a3d311 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 - map_script 3, SevenIsland_PokemonCenter_1F_MapScript1_170B94 - map_script 5, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94 +SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 setrespawn SPAWN_SEVEN_ISLAND end diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc index 89d97e0db..a026e7c92 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC - map_script 2, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 41e452568..708541904 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC - map_script 3, SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition .byte 0 -SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 +SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS call_if TRUE, EventScript_164E07 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc index f0b8a602e..847ae472a 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 - map_script 3, SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_DilfordChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC:: @ 8164CFC +SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc index 2a9d64e42..b982b77dd 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE - map_script 3, SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_LiptooChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4:: @ 8164CE4 +SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index 391a45a95..d467f79ef 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF - map_script 3, SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_MoneanChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5:: @ 8164CD5 +SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc index de1c0cd97..2f3d604c3 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E - map_script 3, SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_RixyChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14:: @ 8164D14 +SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc index 2cbb2d08d..dd1a73f83 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 - map_script 3, SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_ScufibChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08:: @ 8164D08 +SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc index ea63fa0ea..131a6ecca 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A - map_script 3, SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_ViapoisChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20:: @ 8164D20 +SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc index ae8294f89..ff6c851ee 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA - map_script 3, SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_WeepthChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0:: @ 8164CF0 +SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc index af451e565..6ae4ed2be 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828 - map_script 5, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 - map_script 2, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 .byte 0 SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833 diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 3efd6025e..e597b5ef5 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_10F_MapScripts:: @ 8161D86 - map_script 1, SilphCo_10F_MapScript1_161D8C + map_script MAP_SCRIPT_ON_LOAD, SilphCo_10F_OnLoad .byte 0 -SilphCo_10F_MapScript1_161D8C:: @ 8161D8C +SilphCo_10F_OnLoad:: @ 8161D8C checkflag FLAG_SILPH_10F_DOOR call_if FALSE, EventScript_Close10FDoor end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 4465e16b7..9b8504ac5 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_11F_MapScripts:: @ 8161DEE - map_script 1, SilphCo_11F_MapScript1_161DF4 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_11F_OnLoad .byte 0 -SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 +SilphCo_11F_OnLoad:: @ 8161DF4 checkflag FLAG_SILPH_11F_DOOR call_if FALSE, EventScript_Close11FDoor end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index ffb126808..a6ef4a1c3 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_1F_MapScripts:: @ 8161625 - map_script 3, SilphCo_1F_MapScript1_16162B + map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_1F_OnTransition .byte 0 -SilphCo_1F_MapScript1_16162B:: @ 816162B +SilphCo_1F_OnTransition:: @ 816162B setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index caafb4f23..60d2a39e2 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_2F_MapScripts:: @ 8161641 - map_script 1, SilphCo_2F_MapScript1_161647 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_2F_OnLoad .byte 0 -SilphCo_2F_MapScript1_161647:: @ 8161647 +SilphCo_2F_OnLoad:: @ 8161647 checkflag FLAG_SILPH_2F_DOOR_1 call_if FALSE, EventScript_Close2FDoor1 checkflag FLAG_SILPH_2F_DOOR_2 diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 8ce210653..c5fd6d320 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_3F_MapScripts:: @ 81616C5 - map_script 1, SilphCo_3F_MapScript1_1616CB + map_script MAP_SCRIPT_ON_LOAD, SilphCo_3F_OnLoad .byte 0 -SilphCo_3F_MapScript1_1616CB:: @ 81616CB +SilphCo_3F_OnLoad:: @ 81616CB checkflag FLAG_SILPH_3F_DOOR_1 call_if FALSE, EventScript_Close3FDoor1 checkflag FLAG_SILPH_3F_DOOR_2 diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index b5ef8541d..c72ba7ed8 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_4F_MapScripts:: @ 8161736 - map_script 1, SilphCo_4F_MapScript1_16173C + map_script MAP_SCRIPT_ON_LOAD, SilphCo_4F_OnLoad .byte 0 -SilphCo_4F_MapScript1_16173C:: @ 816173C +SilphCo_4F_OnLoad:: @ 816173C checkflag FLAG_SILPH_4F_DOOR_1 call_if FALSE, EventScript_Close4FDoor1 checkflag FLAG_SILPH_4F_DOOR_2 diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index ce1f8374b..fb9e482a5 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_5F_MapScripts:: @ 81617BE - map_script 1, SilphCo_5F_MapScript1_1617C4 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_5F_OnLoad .byte 0 -SilphCo_5F_MapScript1_1617C4:: @ 81617C4 +SilphCo_5F_OnLoad:: @ 81617C4 checkflag FLAG_SILPH_5F_DOOR_1 call_if FALSE, EventScript_Close5FDoor1 checkflag FLAG_SILPH_5F_DOOR_2 diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 131d636b7..e5b1d9e7b 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_6F_MapScripts:: @ 8161881 - map_script 1, SilphCo_6F_MapScript1_161887 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_6F_OnLoad .byte 0 -SilphCo_6F_MapScript1_161887:: @ 8161887 +SilphCo_6F_OnLoad:: @ 8161887 checkflag FLAG_SILPH_6F_DOOR call_if FALSE, EventScript_Close6FDoor end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 9c0e76620..cf2d80422 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -1,9 +1,9 @@ SilphCo_7F_MapScripts:: @ 8161984 - map_script 1, SilphCo_7F_MapScript1_16198F - map_script 3, SilphCo_7F_MapScript2_1619AB + map_script MAP_SCRIPT_ON_LOAD, SilphCo_7F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_7F_OnTransition .byte 0 -SilphCo_7F_MapScript1_16198F:: @ 816198F +SilphCo_7F_OnLoad:: @ 816198F checkflag FLAG_SILPH_7F_DOOR_1 call_if FALSE, EventScript_Close7FDoor1 checkflag FLAG_SILPH_7F_DOOR_2 @@ -12,7 +12,7 @@ SilphCo_7F_MapScript1_16198F:: @ 816198F call_if FALSE, EventScript_Close7FDoor3 end -SilphCo_7F_MapScript2_1619AB:: @ 81619AB +SilphCo_7F_OnTransition:: @ 81619AB compare VAR_MAP_SCENE_SILPH_CO_11F, 1 call_if ge, EventScript_1619B7 end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 1b3b81d36..5570c4be9 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_8F_MapScripts:: @ 8161C5F - map_script 1, SilphCo_8F_MapScript1_161C65 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_8F_OnLoad .byte 0 -SilphCo_8F_MapScript1_161C65:: @ 8161C65 +SilphCo_8F_OnLoad:: @ 8161C65 checkflag FLAG_SILPH_8F_DOOR call_if FALSE, EventScript_Close8FDoor end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index fb8098d1c..919d700b0 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_9F_MapScripts:: @ 8161CDE - map_script 1, SilphCo_9F_MapScript1_161CE4 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_9F_OnLoad .byte 0 -SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 +SilphCo_9F_OnLoad:: @ 8161CE4 checkflag FLAG_SILPH_9F_DOOR_1 call_if FALSE, EventScript_Close9FDoor1 checkflag FLAG_SILPH_9F_DOOR_2 diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index 3a36d37b1..868eefbaa 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -1,8 +1,8 @@ SixIsland_MapScripts:: @ 8167ED8 - map_script 3, SixIsland_MapScript1_167EDE + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_OnTransition .byte 0 -SixIsland_MapScript1_167EDE:: @ 8167EDE +SixIsland_OnTransition:: @ 8167EDE setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND end diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc index 6733f94b3..bf34536f1 100644 --- a/data/maps/SixIsland_AlteringCave/scripts.inc +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -1,7 +1,7 @@ SixIsland_AlteringCave_MapScripts:: @ 81646A4 - map_script 3, SixIsland_AlteringCave_MapScript1_1646AA + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_AlteringCave_OnTransition .byte 0 -SixIsland_AlteringCave_MapScript1_1646AA:: @ 81646AA +SixIsland_AlteringCave_OnTransition:: @ 81646AA setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index 2d9e52209..0dae8d853 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -1,8 +1,8 @@ SixIsland_DottedHole_1F_MapScripts:: @ 8164182 - map_script 3, SixIsland_DottedHole_1F_MapScript1_164188 + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_DottedHole_1F_OnTransition .byte 0 -SixIsland_DottedHole_1F_MapScript1_164188:: @ 8164188 +SixIsland_DottedHole_1F_OnTransition:: @ 8164188 setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 9f0d085fe..cc9a3549a 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -1,8 +1,8 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 - map_script 3, SixIsland_PatternBush_MapScript1_16455F + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PatternBush_OnTransition .byte 0 -SixIsland_PatternBush_MapScript1_16455F:: @ 816455F +SixIsland_PatternBush_OnTransition:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_0x4001, VAR_0x4002 compare VAR_0x4001, 50 diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 751b78f94..dd4bd695c 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,10 +1,10 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A - map_script 3, SixIsland_PokemonCenter_1F_MapScript1_171D7A - map_script 5, SixIsland_PokemonCenter_1F_MapScript2_1BC05C - map_script 2, SixIsland_PokemonCenter_1F_MapScript3_171D8D + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SixIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_1F_OnFrame .byte 0 -SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A +SixIsland_PokemonCenter_1F_OnTransition:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 call_if eq, EventScript_171D89 @@ -14,7 +14,7 @@ EventScript_171D89:: @ 8171D89 clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL return -SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D +SixIsland_PokemonCenter_1F_OnFrame:: @ 8171D8D map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, EventScript_171D97 .2byte 0 diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc index a261c9269..982b9b29c 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 - map_script 2, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SixIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, SixIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 0e315cfdf..40950d560 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -1,8 +1,8 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 - map_script 1, SixIsland_RuinValley_MapScript1_168B59 + map_script MAP_SCRIPT_ON_LOAD, SixIsland_RuinValley_OnLoad .byte 0 -SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59 +SixIsland_RuinValley_OnLoad:: @ 8168B59 checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE call_if TRUE, EventScript_168B63 end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 718524fcf..a63d1350e 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_MapScripts:: @ 81677AD - map_script 3, ThreeIsland_MapScript1_1677B3 + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_OnTransition .byte 0 -ThreeIsland_MapScript1_1677B3:: @ 81677B3 +ThreeIsland_OnTransition:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_RESCUED_LOSTELLE call_if TRUE, EventScript_1677CB diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index f26f7edb9..2ed197683 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 - map_script 3, ThreeIsland_BerryForest_MapScript1_163C77 + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_BerryForest_OnTransition .byte 0 -ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 +ThreeIsland_BerryForest_OnTransition:: @ 8163C77 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 0830e168c..e4c890add 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 - map_script 3, ThreeIsland_DunsparceTunnel_MapScript1_164D2C + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_DunsparceTunnel_OnTransition .byte 0 -ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C +ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 559b2a03c..35c7abeb3 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 - map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D - map_script 5, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D +ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D setrespawn SPAWN_THREE_ISLAND end diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc index dfb7db871..b51a32374 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 - map_script 2, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 842bd794d..ee88d85fe 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_Port_MapScripts:: @ 8168789 - map_script 3, ThreeIsland_Port_MapScript1_16878F + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_Port_OnTransition .byte 0 -ThreeIsland_Port_MapScript1_16878F:: @ 816878F +ThreeIsland_Port_OnTransition:: @ 816878F clearflag FLAG_SYS_PC_STORAGE_DISABLED setflag FLAG_SEVII_DETOUR_FINISHED end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 3ecbbaa87..64eeb39ca 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -1,8 +1,8 @@ TwoIsland_MapScripts:: @ 8167564 - map_script 3, TwoIsland_MapScript1_16756A + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_OnTransition .byte 0 -TwoIsland_MapScript1_16756A:: @ 816756A +TwoIsland_OnTransition:: @ 816756A setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND setflag FLAG_VISITED_TWO_ISLAND call EventScript_167576 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 53b72c2db..ff76d9419 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -1,11 +1,11 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 - map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5 - map_script 4, TwoIsland_JoyfulGameCorner_MapScript2_171404 - map_script 2, TwoIsland_JoyfulGameCorner_MapScript3_17141B - map_script 1, TwoIsland_JoyfulGameCorner_MapScript4_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_JoyfulGameCorner_OnFrame + map_script MAP_SCRIPT_ON_LOAD, TwoIsland_JoyfulGameCorner_MapScript4_1BB237 .byte 0 -TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5 +TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5 checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER call_if TRUE, EventScript_1713EF end @@ -17,7 +17,7 @@ EventScript_1713EF:: @ 81713EF setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 return -TwoIsland_JoyfulGameCorner_MapScript2_171404:: @ 8171404 +TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404 map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416 map_script_2 VAR_0x406F, 8, EventScript_1BB227 .2byte 0 @@ -26,7 +26,7 @@ EventScript_171416:: @ 8171416 turnobject 255, 2 end -TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B +TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435 map_script_2 VAR_0x406F, 8, EventScript_1BB2FD diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index 813b5d595..1742e15e2 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 - map_script 3, TwoIsland_PokemonCenter_1F_MapScript1_1717BF - map_script 5, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF +TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF setrespawn SPAWN_TWO_ISLAND end diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 01954808c..84766419e 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE - map_script 2, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 diff --git a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc index 9137a8ad1..0604a7712 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3 - map_script 3, UndergroundPath_EastWestTunnel_MapScript1_160ED9 + map_script MAP_SCRIPT_ON_TRANSITION, UndergroundPath_EastWestTunnel_OnTransition .byte 0 -UndergroundPath_EastWestTunnel_MapScript1_160ED9:: @ 8160ED9 +UndergroundPath_EastWestTunnel_OnTransition:: @ 8160ED9 setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL end diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc index 408a60fee..d5c9a4ad5 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5 - map_script 3, UndergroundPath_NorthSouthTunnel_MapScript1_160EBB + map_script MAP_SCRIPT_ON_TRANSITION, UndergroundPath_NorthSouthTunnel_OnTransition .byte 0 -UndergroundPath_NorthSouthTunnel_MapScript1_160EBB:: @ 8160EBB +UndergroundPath_NorthSouthTunnel_OnTransition:: @ 8160EBB setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL end diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnknownMap_00_04/scripts.inc index 0358b7d8a..2cda124c4 100644 --- a/data/maps/UnknownMap_00_04/scripts.inc +++ b/data/maps/UnknownMap_00_04/scripts.inc @@ -1,9 +1,9 @@ UnknownMap_00_04_MapScripts:: @ 816047C - map_script 5, UnknownMap_00_04_MapScript1_160487 - map_script 3, UnknownMap_00_04_MapScript2_1604BB + map_script MAP_SCRIPT_ON_RESUME, UnknownMap_00_04_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, UnknownMap_00_04_OnTransition .byte 0 -UnknownMap_00_04_MapScript1_160487:: @ 8160487 +UnknownMap_00_04_OnResume:: @ 8160487 setflag FLAG_HIDE_UNION_ROOM_1 setflag FLAG_HIDE_UNION_ROOM_2 setflag FLAG_HIDE_UNION_ROOM_3 @@ -23,7 +23,7 @@ UnknownMap_00_04_MapScript1_160487:: @ 8160487 special UnionRoomSpecial end -UnknownMap_00_04_MapScript2_1604BB:: @ 81604BB +UnknownMap_00_04_OnTransition:: @ 81604BB end UnknownMap_00_04_EventScript_1604BC:: @ 81604BC diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index cb5186fe1..fb9b59b9f 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -1,9 +1,9 @@ VermilionCity_MapScripts:: @ 81668DC - map_script 3, VermilionCity_MapScript1_166906 - map_script 2, VermilionCity_MapScript2_1668E7 + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame .byte 0 -VermilionCity_MapScript2_1668E7:: @ 81668E7 +VermilionCity_OnFrame:: @ 81668E7 map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, EventScript_1668F1 .2byte 0 @@ -20,7 +20,7 @@ Movement_166903:: @ 8166903 step_11 step_end -VermilionCity_MapScript1_166906:: @ 8166906 +VermilionCity_OnTransition:: @ 8166906 setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY checkflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION call_if TRUE, EventScript_166913 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index a654dea5a..edef5c0ae 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -1,9 +1,9 @@ VermilionCity_Gym_MapScripts:: @ 816B69E - map_script 1, VermilionCity_Gym_MapScript1_16B6A9 - map_script 3, VermilionCity_Gym_MapScript2_16B772 + map_script MAP_SCRIPT_ON_LOAD, VermilionCity_Gym_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_Gym_OnTransition .byte 0 -VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 +VermilionCity_Gym_OnLoad:: @ 816B6A9 checkflag FLAG_TEMP_1 call_if TRUE, EventScript_16B6BC checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES @@ -36,7 +36,7 @@ EventScript_16B717:: @ 816B717 setmetatile 7, 7, 670, 1 return -VermilionCity_Gym_MapScript2_16B772:: @ 816B772 +VermilionCity_Gym_OnTransition:: @ 816B772 call EventScript_16B778 end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index f65681dc3..bcfe4ad6e 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 - map_script 3, VermilionCity_PokemonCenter_1F_MapScript1_16B42F - map_script 5, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F +VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F setrespawn SPAWN_VERMILION_CITY end diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc index b64ac0660..9ef32bb07 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 - map_script 2, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index cd77c97b1..569fce4ff 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,9 +1,9 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 - map_script 1, VictoryRoad_1F_MapScript1_160F10 - map_script 3, VictoryRoad_1F_MapScript2_160F2F + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition .byte 0 -VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 +VictoryRoad_1F_OnLoad:: @ 8160F10 compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 call_if ne, EventScript_160F1C end @@ -13,7 +13,7 @@ EventScript_160F1C:: @ 8160F1C setmetatile 12, 15, 791, 1 return -VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F +VictoryRoad_1F_OnTransition:: @ 8160F2F setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index e2018c27e..ee3367636 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -1,8 +1,8 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 - map_script 1, VictoryRoad_2F_MapScript1_160F98 + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_2F_OnLoad .byte 0 -VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 +VictoryRoad_2F_OnLoad:: @ 8160F98 compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 call_if ne, EventScript_160FAF compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 6f6b4b5bd..cc4f54f13 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -1,8 +1,8 @@ VictoryRoad_3F_MapScripts:: @ 81610AA - map_script 1, VictoryRoad_3F_MapScript1_1610B0 + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_3F_OnLoad .byte 0 -VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 +VictoryRoad_3F_OnLoad:: @ 81610B0 compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 call_if ne, EventScript_1610BC end diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index a9bc4d4b1..1f87c2146 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -1,8 +1,8 @@ ViridianCity_MapScripts:: @ 81658D3 - map_script 3, ViridianCity_MapScript1_1658D9 + map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition .byte 0 -ViridianCity_MapScript1_1658D9:: @ 81658D9 +ViridianCity_OnTransition:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 call_if eq, EventScript_165920 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index f16afdd2e..69ad2ef2b 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -1,9 +1,9 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 - map_script 1, ViridianCity_Mart_MapScript1_16A1DE - map_script 2, ViridianCity_Mart_MapScript2_16A1FB + map_script MAP_SCRIPT_ON_LOAD, ViridianCity_Mart_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_Mart_OnFrame .byte 0 -ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE +ViridianCity_Mart_OnLoad:: @ 816A1DE checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_16A1E8 end @@ -13,7 +13,7 @@ EventScript_16A1E8:: @ 816A1E8 setmetatile 1, 4, 704, 1 end -ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB +ViridianCity_Mart_OnFrame:: @ 816A1FB map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205 .2byte 0 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 507b2bfe4..574ef9c1f 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 - map_script 3, ViridianCity_PokemonCenter_1F_MapScript1_16A2CB - map_script 5, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB +ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB setrespawn SPAWN_VIRIDIAN_CITY end diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc index 18e0018ba..4cf92b800 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 - map_script 2, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index 84c22e5fb..bc6923ea6 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -1,8 +1,8 @@ ViridianForest_MapScripts:: @ 816051F - map_script 3, ViridianForest_MapScript1_160525 + map_script MAP_SCRIPT_ON_TRANSITION, ViridianForest_OnTransition .byte 0 -ViridianForest_MapScript1_160525:: @ 8160525 +ViridianForest_OnTransition:: @ 8160525 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST end diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h index 2ef3d2544..1353de360 100644 --- a/include/constants/map_scripts.h +++ b/include/constants/map_scripts.h @@ -6,7 +6,7 @@ #define MAP_SCRIPT_ON_TRANSITION 3 #define MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE 4 #define MAP_SCRIPT_ON_RESUME 5 -#define MAP_SCRIPT_ON_DIVE_WARP 6 +#define MAP_SCRIPT_ON_DIVE_WARP 6 // Unused #define MAP_SCRIPT_ON_RETURN_TO_FIELD 7 #endif // GUARD_CONSTANTS_MAP_SCRIPTS_H From 7eb54648608888a0e3dccb775dc3f4284ac934e6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 21:05:04 -0500 Subject: [PATCH 03/20] Sync some event_scripts.s, split files --- asm/link_rfu_3.s | 6 +- asm/macros/movement.inc | 2 +- data/event_scripts.s | 5895 +---------------- data/map_events.s | 4 +- .../CeladonCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/CeruleanCity_House5/scripts.inc | 2 +- .../CeruleanCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/CinnabarIsland/scripts.inc | 10 +- .../scripts.inc | 8 +- .../FiveIsland_PokemonCenter_1F/scripts.inc | 2 +- .../FiveIsland_ResortGorgeous/scripts.inc | 2 +- .../FourIsland_IcefallCave_1F/scripts.inc | 2 +- .../FourIsland_PokemonCenter_1F/scripts.inc | 2 +- .../FourIsland_PokemonDayCare/scripts.inc | 2 +- .../FuchsiaCity_PokemonCenter_1F/scripts.inc | 2 +- .../scripts.inc | 2 +- .../LavenderTown_PokemonCenter_1F/scripts.inc | 2 +- data/maps/OneIsland/scripts.inc | 4 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/PalletTown/scripts.inc | 4 +- .../PewterCity_PokemonCenter_1F/scripts.inc | 2 +- .../PokemonLeague_ChampionsRoom/scripts.inc | 4 +- data/maps/Route1/scripts.inc | 2 +- .../maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 2 +- .../SaffronCity_PokemonCenter_1F/scripts.inc | 2 +- .../SevenIsland_PokemonCenter_1F/scripts.inc | 2 +- .../scripts.inc | 2 +- .../SixIsland_PokemonCenter_1F/scripts.inc | 2 +- .../ThreeIsland_PokemonCenter_1F/scripts.inc | 2 +- .../TwoIsland_PokemonCenter_1F/scripts.inc | 2 +- .../scripts.inc | 2 +- .../ViridianCity_PokemonCenter_1F/scripts.inc | 2 +- data/scripts/day_care.inc | 257 + data/scripts/fame_checker.inc | 286 + data/scripts/field_moves.inc | 310 + data/scripts/flash.inc | 4 + data/scripts/hole.inc | 31 + data/scripts/item_ball_scripts.inc | 671 ++ data/scripts/move_tutors.inc | 598 ++ data/scripts/mystery_event_club.inc | 180 + data/scripts/pkmn_center_nurse.inc | 72 + data/scripts/repel.inc | 6 + data/scripts/set_gym_trainers.inc | 76 + data/scripts/surf.inc | 25 + data/scripts/trainer_battle.inc | 158 + data/scripts/trainers.inc | 3041 +++++++++ data/specials.inc | 2 +- data/text/ingame_trade.inc | 60 + data/text/surf.inc | 10 + include/constants/event_objects.h | 7 + include/constants/movement_commands.h | 2 +- 52 files changed, 5901 insertions(+), 5880 deletions(-) create mode 100644 data/scripts/day_care.inc create mode 100644 data/scripts/fame_checker.inc create mode 100644 data/scripts/field_moves.inc create mode 100644 data/scripts/flash.inc create mode 100644 data/scripts/hole.inc create mode 100644 data/scripts/item_ball_scripts.inc create mode 100644 data/scripts/move_tutors.inc create mode 100644 data/scripts/mystery_event_club.inc create mode 100644 data/scripts/pkmn_center_nurse.inc create mode 100644 data/scripts/repel.inc create mode 100644 data/scripts/set_gym_trainers.inc create mode 100644 data/scripts/surf.inc create mode 100644 data/scripts/trainer_battle.inc create mode 100644 data/scripts/trainers.inc create mode 100644 data/text/ingame_trade.inc create mode 100644 data/text/surf.inc create mode 100644 include/constants/event_objects.h diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 3b76df047..efbea2956 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -7763,8 +7763,8 @@ _08119B5C: _08119B64: .4byte gUnknown_203B05C thumb_func_end sub_81199FC - thumb_func_start sp182_move_string -sp182_move_string: @ 8119B68 + thumb_func_start BufferUnionRoomPlayerName +BufferUnionRoomPlayerName: @ 8119B68 push {r4,lr} ldr r4, _08119B78 @ =gUnknown_203B04C ldrb r0, [r4] @@ -7787,7 +7787,7 @@ _08119B8A: bx r1 .align 2, 0 _08119B90: .4byte gStringVar1 - thumb_func_end sp182_move_string + thumb_func_end BufferUnionRoomPlayerName thumb_func_start sub_8119B94 sub_8119B94: @ 8119B94 diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 8ad5a313e..8981f2eaa 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -102,7 +102,7 @@ create_movement step_5d create_movement step_5e create_movement step_5f - create_movement step_60 + create_movement set_invisible create_movement step_61 create_movement step_62 create_movement step_63 diff --git a/data/event_scripts.s b/data/event_scripts.s index 523d08e27..bf6f41e77 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,6 @@ #include "constants/global.h" #include "constants/flags.h" +#include "constants/event_objects.h" #include "constants/decorations.h" #include "constants/items.h" #include "constants/layouts.h" @@ -836,7 +837,7 @@ EventScript_1A4EAA:: @ 81A4EAA delay 50 return -EventScript_1A4EAE:: @ 81A4EAE +EventScript_UnusedReturn:: @ 81A4EAE return EventScript_1A4EAF:: @ 81A4EAF @@ -844,164 +845,7 @@ EventScript_1A4EAF:: @ 81A4EAF waitstate return -gUnknown_81A4EB4:: @ 81A4EB4 - lock - special PlayTrainerEncounterMusic - special ScrSpecial_EndTrainerApproach - waitstate - goto EventScript_1A4FC7 - -EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 - lock - faceplayer - applymovement VAR_LAST_TALKED, Movement_1A4FC5 - waitmovement 0 - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought - compare VAR_RESULT, 0 - goto_if ne, EventScript_1A4EE8 - special PlayTrainerEncounterMusic - special SetUpTrainerMovement - goto EventScript_1A4FC7 - -EventScript_1A4EE8:: @ 81A4EE8 - ontrainerbattleend - -EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 - lock - faceplayer - call EventScript_1A4FBA - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought - compare VAR_RESULT, 0 - goto_if ne, EventScript_1A4F20 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 - goto_if ne, EventScript_1A4F19 - special PlayTrainerEncounterMusic - special SetUpTrainerMovement - goto EventScript_1A4FC7 - -EventScript_1A4F19:: @ 81A4F19 - special ScrSpecial_ShowTrainerNonBattlingSpeech - waitmessage - waitbuttonpress - release - end - -EventScript_1A4F20:: @ 81A4F20 - ontrainerbattleend - -EventScript_DoTrainerBattle:: @ 81A4F21 - applymovement VAR_LAST_TALKED, Movement_1A4FC5 - waitmovement 0 - special PlayTrainerEncounterMusic - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A501A - battlebegin - ontrainerbattleend - -EventScript_TryDoRematchBattle:: @ 81A4F3E - call EventScript_1A4FBA - specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare VAR_RESULT, 0 - goto_if eq, EventScript_1A4F72 - special PlayTrainerEncounterMusic - special SetUpTrainerMovement - special ScrSpecial_ShowTrainerIntroSpeech - waitmessage - waitbuttonpress - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A4FB8 - special ScrSpecial_StartTrainerEyeRematch - waitstate - releaseall - end - -EventScript_1A4F72:: @ 81A4F72 - ontrainerbattleend - -EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 - specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare VAR_RESULT, 0 - goto_if eq, EventScript_1A4FB0 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 - goto_if ne, EventScript_1A4FB1 - special PlayTrainerEncounterMusic - special SetUpTrainerMovement - special ScrSpecial_ShowTrainerIntroSpeech - waitmessage - waitbuttonpress - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A4FB8 - special ScrSpecial_StartTrainerEyeRematch - waitstate - releaseall - end - -EventScript_1A4FB0:: @ 81A4FB0 - ontrainerbattleend - -EventScript_1A4FB1:: @ 81A4FB1 - special ScrSpecial_ShowTrainerNonBattlingSpeech - waitmessage - waitbuttonpress - release - end - -EventScript_1A4FB8:: @ 81A4FB8 - releaseall - end - -EventScript_1A4FBA:: @ 81A4FBA - applymovement VAR_LAST_TALKED, Movement_1A4FC5 - waitmovement 0 - return - -Movement_1A4FC5:: @ 81A4FC5 - step_67 - step_end - -EventScript_1A4FC7:: @ 81A4FC7 - special ScrSpecial_ShowTrainerIntroSpeech - waitmessage - waitbuttonpress - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A501A - battlebegin - specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode - compare VAR_RESULT, 0 - goto_if eq, EventScript_1A5017 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A5019 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A5019 - compare VAR_RESULT, 6 - goto_if eq, EventScript_1A5019 - compare VAR_RESULT, 8 - goto_if eq, EventScript_1A5019 - -EventScript_1A5017:: @ 81A5017 - releaseall - end - -EventScript_1A5019:: @ 81A5019 - ontrainerbattleendgoto - -EventScript_1A501A:: @ 81A501A - special SetBattledTrainerFlag - releaseall - end - -gStdScript_Message_WaitButton_AndRelease:: @ 81A501F - message 0x0 - waitmessage - waitbuttonpress - release - return + .include "data/scripts/trainer_battle.inc" @ Unused Text_WouldYouLikeToMixRecords:: @ 81A5028 @@ -1009,7 +853,7 @@ Text_WouldYouLikeToMixRecords:: @ 81A5028 .string "other TRAINERS?$" @ Unused -Text_WeHopeToSeeYouAgain:: @ 81A505B +Text_WeHopeToSeeYouAgain2:: @ 81A505B .string "We hope to see you again!$" Text_BootedUpPC:: @ 81A5075 @@ -1053,10 +897,10 @@ Text_1A51D0:: @ 81A51D0 .string "{PLAYER}{KUN}, welcome!\p" .string "What can I do for you?$" -Text_1A51F6:: @ 81A51F6 +Text_ObtainedTheX:: @ 81A51F6 .string "Obtained the {STR_VAR_2}!$" -gUnknown_81A5207:: @ 81A5207 +Text_BagIsFull:: @ 81A5207 .string "The BAG is full…$" gUnknown_81A5218:: @ 81A5218 @@ -1135,39 +979,32 @@ gText_PkmnFainted3:: @ 81A5476 .string "{STR_VAR_1} fainted…\p" .string "$" -Text_1A5483:: @ 81A5483 +Text_WelcomeWantToHealPkmn:: @ 81A5483 .string "Welcome to our POKéMON CENTER!\p" .string "Would you like me to heal your\n" .string "POKéMON back to perfect health?$" -Text_1A54E1:: @ 81A54E1 +Text_TakeYourPkmnForFewSeconds:: @ 81A54E1 .string "Okay, I'll take your POKéMON for a\n" .string "few seconds.$" -Text_1A5511:: @ 81A5511 +Text_WeHopeToSeeYouAgain:: @ 81A5511 .string "We hope to see you again!$" -Text_1A552B:: @ 81A552B +Text_RestoredPkmnToFullHealth:: @ 81A552B .string "Thank you for waiting.\n" .string "We've restored your POKéMON to\l" .string "full health.$" -Text_1A556E:: @ 81A556E - .string "The water is dyed a deep blue…\n" - .string "Would you like to SURF?$" + .include "data/text/surf.inc" -Text_1A55A5:: @ 81A55A5 - .string "{STR_VAR_1} used SURF!$" - -Text_CurrentTooFast:: @ 81A55B3 - .string "The current is much too fast!\n" - .string "SURF can't be used here…$" - -Text_1A55EA:: @ 81A55EA +@ Unused, from R/S +Text_DoorOpenedFarAway:: @ 81A55EA .string "どこか　とおくの　とびらが\n" .string "ひらいたような　おとだ‥‥$" -Text_1A5606:: @ 81A5606 +@ Unused, from R/S +Text_BigHoleInTheWall:: @ 81A5606 .string "かべに\n" .string "おおきな　あなが　あいている！$" @@ -1243,66 +1080,7 @@ Text_1A594D:: @ 81A594D .string "Oh! I see you don't have any\n" .string "room for the {STR_VAR_2}.$" -gUnknown_81A597B:: @ 81A597B - .string "I'm looking for the POKéMON\n" - .string "{STR_VAR_1}!\p" - .string "Wanna trade one for my\n" - .string "{STR_VAR_2}?$" - -gUnknown_81A59B6:: @ 81A59B6 - .string "Awww!\n" - .string "Oh, well…$" - -gUnknown_81A59C6:: @ 81A59C6 - .string "What?\n" - .string "That's no {STR_VAR_1}!$" - -gUnknown_81A59DA:: @ 81A59DA - .string "Hey, thanks!$" - -gUnknown_81A59E7:: @ 81A59E7 - .string "Isn't my old {STR_VAR_2} great?$" - -gUnknown_81A59FE:: @ 81A59FE - .string "Hello, there! Do you happen to\n" - .string "have a {STR_VAR_1}?\p" - .string "Would you agree to a trade for\n" - .string "my {STR_VAR_2}?$" - -gUnknown_81A5A4E:: @ 81A5A4E - .string "Well, if you don't want to…$" - -gUnknown_81A5A6A:: @ 81A5A6A - .string "Hmmm?\n" - .string "This isn't a {STR_VAR_1}.\p" - .string "Think of me if you get one.$" - -gUnknown_81A5A9D:: @ 81A5A9D - .string "Thanks!$" - -gUnknown_81A5AA5:: @ 81A5AA5 - .string "The {STR_VAR_2} that I traded you,\n" - .string "has it grown stronger?$" - -gUnknown_81A5AD6:: @ 81A5AD6 - .string "Hi!\n" - .string "Do you have a {STR_VAR_1}?\p" - .string "Want to trade it for my\n" - .string "{STR_VAR_2}?$" - -gUnknown_81A5B08:: @ 81A5B08 - .string "That's too bad.$" - -gUnknown_81A5B18:: @ 81A5B18 - .string "…This is no {STR_VAR_1}.\p" - .string "If you get one, trade it with me.$" - -gUnknown_81A5B4A:: @ 81A5B4A - .string "Thanks, you're a pal!$" - -gUnknown_81A5B60:: @ 81A5B60 - .string "How is my old {STR_VAR_2}?\n" - .string "My {STR_VAR_1} is doing great!$" + .include "data/text/ingame_trade.inc" Text_CardKeyOpenedDoor:: @ 81A5B88 .string "Bingo!\n" @@ -1592,78 +1370,7 @@ EventScript_1A6551:: @ 81A6551 setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 0 return -EventScript_1A6578:: @ 81A6578 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - message Text_1A5483 - waitmessage - multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1) - switch VAR_RESULT - case 0, EventScript_1A65B8 - case 1 EventScript_1A6663 - case SCR_MENU_CANCEL, EventScript_1A6663 - end - -EventScript_1A65B8:: @ 81A65B8 - incrementgamestat GAME_STAT_USED_POKECENTER - message Text_1A54E1 - waitmessage - call EventScript_1A65CE - special sub_80CC524 - goto EventScript_1A65EC - end - -EventScript_1A65CE:: @ 81A65CE - applymovement VAR_LAST_TALKED, Movement_1A75E7 - waitmovement 0 - dofieldeffect FLDEFF_POKECENTER_HEAL - waitfieldeffect 25 - applymovement VAR_LAST_TALKED, Movement_1A75ED - waitmovement 0 - special sp000_heal_pokemon - return - -EventScript_1A65EC:: @ 81A65EC - specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby - compare VAR_RESULT, 0 - goto_if eq, EventScript_1A661D - specialvar VAR_RESULT, sp182_move_string - copyvar VAR_0x8008, VAR_RESULT - compare VAR_0x8008, 0 - goto_if eq, EventScript_1A661D - compare VAR_0x8008, 1 - goto_if eq, EventScript_1A6636 - end - -EventScript_1A661D:: @ 81A661D - message Text_1A552B - waitmessage - applymovement VAR_LAST_TALKED, Movement_1A666C - waitmovement 0 - msgbox Text_1A5511 - return - -EventScript_1A6636:: @ 81A6636 - checkflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER - goto_if TRUE, EventScript_1A661D - msgbox Text_1A552B - setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER - message Text_1BCCCA - waitmessage - applymovement VAR_LAST_TALKED, Movement_1A666C - waitmovement 0 - msgbox Text_1A5511 - return - -EventScript_1A6663:: @ 81A6663 - msgbox Text_1A5511 - return - -Movement_1A666C:: @ 81A666C - step_5b - step_1a - step_end + .include "data/scripts/pkmn_center_nurse.inc" EventScript_1A666F:: @ 81A666F copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID @@ -1732,7 +1439,7 @@ EventScript_1A6739:: @ 81A6739 return EventScript_1A6749:: @ 81A6749 - message Text_1A51F6 + message Text_ObtainedTheX waitfanfare waitmessage msgbox gUnknown_81A5218 @@ -1819,7 +1526,7 @@ EventScript_1A6827:: @ 81A6827 return EventScript_1A682D:: @ 81A682D - msgbox Text_1A51F6 + msgbox Text_ObtainedTheX msgbox gUnknown_81A5242 setvar VAR_RESULT, 0 return @@ -2029,108 +1736,8 @@ EventScript_1A6AC0:: @ 81A6AC0 fadescreen 0 return -EventScript_UseSurf:: @ 81A6AC8 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_UseSurfEnd - checkpartymove MOVE_SURF - compare VAR_RESULT, PARTY_SIZE - goto_if eq, EventScript_UseSurfEnd - getpartymonname 0, VAR_RESULT - setfieldeffectarg 0, VAR_RESULT - lockall - msgbox Text_1A556E, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_UseSurfRelease - msgbox Text_1A55A5 - dofieldeffect FLDEFF_USE_SURF -EventScript_UseSurfRelease:@ 81A6B0B - releaseall -EventScript_UseSurfEnd: @ 81A6B0C - end - -gUnknown_81A6B0D:: @ 81A6B0D - lockall - msgbox Text_CurrentTooFast - releaseall - end - -EventScript_SetGymTrainers:: @ 81A6B18 - switch VAR_0x8008 - case 1, EventScript_SetPewterGymTrainers - case 2, EventScript_SetCeruleanGymTrainers - case 3, EventScript_SetVermilionGymTrainers - case 4, EventScript_SetCeladonGymTrainers - case 5, EventScript_SetFuchsiaGymTrainers - case 6, EventScript_SetSaffronGymTrainers - case 7, EventScript_SetCinnabarGymTrainers - case 8, EventScript_SetViridianGymTrainers - end - -EventScript_SetPewterGymTrainers:: @ 81A6B76 - settrainerflag TRAINER_CAMPER_LIAM - return - -EventScript_SetCeruleanGymTrainers:: @ 81A6B7A - settrainerflag TRAINER_PICNICKER_DIANA - settrainerflag TRAINER_SWIMMER_MALE_LUIS - return - -EventScript_SetVermilionGymTrainers:: @ 81A6B81 - settrainerflag TRAINER_SAILOR_DWAYNE - settrainerflag TRAINER_ENGINEER_BAILY - settrainerflag TRAINER_GENTLEMAN_TUCKER - return - -EventScript_SetCeladonGymTrainers:: @ 81A6B8B - settrainerflag TRAINER_LASS_KAY - settrainerflag TRAINER_LASS_LISA - settrainerflag TRAINER_PICNICKER_TINA - settrainerflag TRAINER_BEAUTY_BRIDGET - settrainerflag TRAINER_BEAUTY_TAMIA - settrainerflag TRAINER_BEAUTY_LORI - settrainerflag TRAINER_COOLTRAINER_MARY - return - -EventScript_SetFuchsiaGymTrainers:: @ 81A6BA1 - settrainerflag TRAINER_TAMER_PHIL - settrainerflag TRAINER_TAMER_EDGAR - settrainerflag TRAINER_JUGGLER_KIRK - settrainerflag TRAINER_JUGGLER_SHAWN - settrainerflag TRAINER_JUGGLER_KAYDEN - settrainerflag TRAINER_JUGGLER_NATE - return - -EventScript_SetSaffronGymTrainers:: @ 81A6BB4 - settrainerflag TRAINER_PSYCHIC_JOHAN - settrainerflag TRAINER_PSYCHIC_TYRON - settrainerflag TRAINER_PSYCHIC_CAMERON - settrainerflag TRAINER_PSYCHIC_PRESTON - settrainerflag TRAINER_CHANNELER_AMANDA - settrainerflag TRAINER_CHANNELER_STACY - settrainerflag TRAINER_CHANNELER_TASHA - return - -EventScript_SetCinnabarGymTrainers:: @ 81A6BCA - settrainerflag TRAINER_SUPER_NERD_ERIK - settrainerflag TRAINER_SUPER_NERD_AVERY - settrainerflag TRAINER_SUPER_NERD_DEREK - settrainerflag TRAINER_SUPER_NERD_ZAC - settrainerflag TRAINER_BURGLAR_QUINN - settrainerflag TRAINER_BURGLAR_RAMON - settrainerflag TRAINER_BURGLAR_DUSTY - return - -EventScript_SetViridianGymTrainers:: @ 81A6BE0 - settrainerflag TRAINER_TAMER_JASON - settrainerflag TRAINER_TAMER_COLE - settrainerflag TRAINER_BLACK_BELT_ATSUSHI - settrainerflag TRAINER_BLACK_BELT_KIYO - settrainerflag TRAINER_BLACK_BELT_TAKASHI - settrainerflag TRAINER_COOLTRAINER_SAMUEL - settrainerflag TRAINER_COOLTRAINER_YUJI - settrainerflag TRAINER_COOLTRAINER_WARREN - return + .include "data/scripts/surf.inc" + .include "data/scripts/set_gym_trainers.inc" EventScript_1A6BF9:: @ 81A6BF9 textcolor 3 @@ -2442,7 +2049,7 @@ EventScript_1A74F2:: @ 81A74F2 return EventScript_1A7506:: @ 81A7506 - applymovement 255, Movement_1A75FE + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75FE waitmovement 0 playse SE_DOOR call EventScript_1A7538 @@ -2451,7 +2058,7 @@ EventScript_1A7506:: @ 81A7506 return EventScript_1A751F:: @ 81A751F - applymovement 255, Movement_1A75F3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75F3 waitmovement 0 setflag FLAG_TEMP_2 playse SE_KI_GASYAN @@ -2469,13 +2076,13 @@ EventScript_1A754B:: @ 81A754B textcolor 0 msgbox Text_1A5C4D closemessage - applymovement 255, Movement_1A75D3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75D3 waitmovement 0 releaseall end EventScript_1A7563:: @ 81A7563 - applymovement 255, Movement_1A75FE + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75FE waitmovement 0 playse SE_DOOR setmetatile 6, 4, 654, 1 @@ -2967,7 +2574,7 @@ EventScript_1A7A50:: @ 81A7A50 playse SE_BOO msgbox Text_1A5776 closemessage - applymovement 255, Movement_1A7AB7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 applymovement VAR_0x8009, Movement_1A75ED waitmovement 0 releaseall @@ -2980,7 +2587,7 @@ EventScript_1A7A77:: @ 81A7A77 waitbuttonpress closemessage waitse - applymovement 255, Movement_1A7AB7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 applymovement VAR_0x8009, Movement_1A75ED waitmovement 0 releaseall @@ -4052,7 +3659,7 @@ EventScript_AfterWhiteOutHeal:: @ 81A8D97 lockall textcolor 1 msgbox Text_1A5E89 - call EventScript_1A65CE + call EventScript_PkmnCenterNurse_TakeAndHealPkmn checkflag FLAG_DEFEATED_BROCK call_if FALSE, EventScript_1A8DC6 checkflag FLAG_DEFEATED_BROCK @@ -4286,7 +3893,7 @@ EventScript_1A90F6:: @ 81A90F6 EventScript_1A9108:: @ 81A9108 closemessage applymovement 6, Movement_1A75E5 - applymovement 255, Movement_1A911C + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A911C waitmovement 0 releaseall end @@ -4526,3047 +4133,7 @@ gUnknown_81A93B4:: @ 81A93B4 gUnknown_81A93C0:: @ 81A93C0 .braille "FOR YOU.$" -Route3_EventScript_1A93C9:: @ 81A93C9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_BEN, 0, Text_183560, Text_1835A0 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A93F0 - msgbox Text_1835B4, 6 - end - -EventScript_1A93F0:: @ 81A93F0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_BEN, 0, Text_1C149D, Text_1835A0 - msgbox Text_1835B4, 6 - end - -Route3_EventScript_1A9407:: @ 81A9407 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CALVIN, 0, Text_183786, Text_1837BD - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A942E - msgbox Text_1837CF, 6 - end - -EventScript_1A942E:: @ 81A942E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_CALVIN, 0, Text_1C1588, Text_1837BD - msgbox Text_1837CF, 6 - end - -Route3_EventScript_1A9445:: @ 81A9445 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_COLTON, 0, Text_1834E6, Text_183509 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A946C - msgbox Text_18351C, 6 - end - -EventScript_1A946C:: @ 81A946C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_COLTON, 0, Text_1C147A, Text_183509 - msgbox Text_18351C, 6 - end - -Route3_EventScript_1A9483:: @ 81A9483 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GREG, 0, Text_183682, Text_1836B3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A94AA - msgbox Text_1836D9, 6 - end - -EventScript_1A94AA:: @ 81A94AA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_GREG, 0, Text_1C1521, Text_1836B3 - msgbox Text_1836D9, 6 - end - -Route3_EventScript_1A94C1:: @ 81A94C1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JAMES, 0, Text_183807, Text_183837 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A94E8 - msgbox Text_183849, 6 - end - -EventScript_1A94E8:: @ 81A94E8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_JAMES, 0, Text_1C15C5, Text_183837 - msgbox Text_183849, 6 - end - -Route3_EventScript_1A94FF:: @ 81A94FF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JANICE, 0, Text_183616, Text_18363F - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9526 - msgbox Text_18364C, 6 - end - -EventScript_1A9526:: @ 81A9526 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_JANICE, 0, Text_1C14F3, Text_18363F - msgbox Text_18364C, 6 - end - -Route3_EventScript_1A953D:: @ 81A953D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_SALLY, 0, Text_18371B, Text_183746 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9564 - msgbox Text_18374F, 6 - end - -EventScript_1A9564:: @ 81A9564 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_SALLY, 0, Text_1C155D, Text_183746 - msgbox Text_18374F, 6 - end - -Route3_EventScript_1A957B:: @ 81A957B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ROBIN, 0, Text_18387A, Text_183891 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A95A2 - msgbox Text_18389C, 6 - end - -EventScript_1A95A2:: @ 81A95A2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ROBIN, 0, Text_1C15F9, Text_183891 - msgbox Text_18389C, 6 - end - -Route4_EventScript_1A95B9:: @ 81A95B9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_CRISSY, 0, Text_183906, Text_183938 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A95E0 - msgbox Text_183957, 6 - end - -EventScript_1A95E0:: @ 81A95E0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_CRISSY, 0, Text_1C160F, Text_183938 - msgbox Text_183957, 6 - end - -Route24_EventScript_1A95F7:: @ 81A95F7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_TIMMY, 0, Text_188F76, Text_188F95 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A961E - msgbox Text_188FA7, 6 - end - -EventScript_1A961E:: @ 81A961E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_TIMMY, 0, Text_1C3657, Text_188F95 - msgbox Text_188FA7, 6 - end - -Route24_EventScript_1A9635:: @ 81A9635 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CALE, 0, Text_18901B, Text_18908C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A965C - msgbox Text_18909E, 6 - end - -EventScript_1A965C:: @ 81A965C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_CALE, 0, Text_1C36DA, Text_18908C - msgbox Text_18909E, 6 - end - -Route24_EventScript_1A9673:: @ 81A9673 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_RELI, 0, Text_188F2C, Text_188F46 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A969A - msgbox Text_188F53, 6 - end - -EventScript_1A969A:: @ 81A969A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_RELI, 0, Text_1C3624, Text_188F46 - msgbox Text_188F53, 6 - end - -Route24_EventScript_1A96B1:: @ 81A96B1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ALI, 0, Text_188FC9, Text_188FE7 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A96D8 - msgbox Text_188FF9, 6 - end - -EventScript_1A96D8:: @ 81A96D8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ALI, 0, Text_1C3685, Text_188FE7 - msgbox Text_188FF9, 6 - end - -Route24_EventScript_1A96EF:: @ 81A96EF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_SHANE, 0, Text_188E74, Text_188E94 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9716 - msgbox Text_188EA3, 6 - end - -EventScript_1A9716:: @ 81A9716 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_SHANE, 0, Text_1C35EE, Text_188E94 - msgbox Text_188EA3, 6 - end - -Route24_EventScript_1A972D:: @ 81A972D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_ETHAN, 0, Text_188ED9, Text_188EFA - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9754 - msgbox Text_188F0A, 6 - end - -EventScript_1A9754:: @ 81A9754 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_ETHAN, 0, Text_1C360E, Text_188EFA - msgbox Text_188F0A, 6 - end - -Route25_EventScript_1A976B:: @ 81A976B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOEY, 0, Text_1890C0, Text_1890E6 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9792 - msgbox Text_1890F5, 6 - end - -EventScript_1A9792:: @ 81A9792 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_JOEY, 0, Text_1C33E7, Text_1890E6 - msgbox Text_1890F5, 6 - end - -Route25_EventScript_1A97A9:: @ 81A97A9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAN, 0, Text_189165, Text_1891A6 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A97D0 - msgbox Text_1891B3, 6 - end - -EventScript_1A97D0:: @ 81A97D0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DAN, 0, Text_1C3404, Text_1891A6 - msgbox Text_1891B3, 6 - end - -Route25_EventScript_1A97E7:: @ 81A97E7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CHAD, 0, Text_1892A9, Text_1892D9 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A980E - msgbox Text_1892EF, 6 - end - -EventScript_1A980E:: @ 81A980E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_CHAD, 0, Text_1C34D4, Text_1892D9 - msgbox Text_1892EF, 6 - end - -Route25_EventScript_1A9825:: @ 81A9825 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KELSEY, 0, Text_189247, Text_189261 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A984C - msgbox Text_189281, 6 - end - -EventScript_1A984C:: @ 81A984C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_KELSEY, 0, Text_1C349C, Text_189261 - msgbox Text_189281, 6 - end - -Route25_EventScript_1A9863:: @ 81A9863 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_HALEY, 0, Text_189333, Text_189364 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A988A - msgbox Text_189378, 6 - end - -EventScript_1A988A:: @ 81A988A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_HALEY, 0, Text_1C350A, Text_189364 - msgbox Text_189378, 6 - end - -Route25_EventScript_1A98A1:: @ 81A98A1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_FRANKLIN, 0, Text_1893A7, Text_1893EA - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A98C8 - msgbox Text_1893FB, 6 - end - -EventScript_1A98C8:: @ 81A98C8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_FRANKLIN, 0, Text_1C353B, Text_1893EA - msgbox Text_1893FB, 6 - end - -Route25_EventScript_1A98DF:: @ 81A98DF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_NOB, 0, Text_189423, Text_189459 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9906 - msgbox Text_18947E, 6 - end - -EventScript_1A9906:: @ 81A9906 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_NOB, 0, Text_1C357E, Text_189459 - msgbox Text_18947E, 6 - end - -Route25_EventScript_1A991D:: @ 81A991D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_WAYNE, 0, Text_1894DE, Text_18950A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9944 - msgbox Text_18951C, 6 - end - -EventScript_1A9944:: @ 81A9944 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_WAYNE, 0, Text_1C35BC, Text_18950A - msgbox Text_18951C, 6 - end - -Route25_EventScript_1A995B:: @ 81A995B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_FLINT, 0, Text_1891EB, Text_189212 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9982 - msgbox Text_18921D, 6 - end - -EventScript_1A9982:: @ 81A9982 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_FLINT, 0, Text_1C3445, Text_189212 - msgbox Text_18921D, 6 - end - -Route6_EventScript_1A9999:: @ 81A9999 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KEIGO, 0, Text_183E9F, Text_183EC0 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A99C0 - msgbox Text_183ED4, 6 - end - -EventScript_1A99C0:: @ 81A99C0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_KEIGO, 0, Text_1C16E2, Text_183EC0 - msgbox Text_183ED4, 6 - end - -Route6_EventScript_1A99D7:: @ 81A99D7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_183FF0, Text_18401A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A99FE - msgbox Text_18402B, 6 - end - -EventScript_1A99FE:: @ 81A99FE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_1C176B, Text_18401A - msgbox Text_18402B, 6 - end - -Route6_EventScript_1A9A15:: @ 81A9A15 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RICKY, 0, Text_183E04, Text_183E2A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9A3C - msgbox Text_183E3C, 6 - end - -EventScript_1A9A3C:: @ 81A9A3C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_RICKY, 0, Text_1C163C, Text_183E2A - msgbox Text_183E3C, 6 - end - -Route6_EventScript_1A9A53:: @ 81A9A53 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JEFF, 0, Text_183F07, Text_183F24 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9A7A - msgbox Text_183F51, 6 - end - -EventScript_1A9A7A:: @ 81A9A7A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_JEFF, 0, Text_1C1723, Text_183F24 - msgbox Text_183F51, 6 - end - -Route6_EventScript_1A9A91:: @ 81A9A91 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_NANCY, 0, Text_183E4E, Text_183E79 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9AB8 - msgbox Text_183E8D, 6 - end - -EventScript_1A9AB8:: @ 81A9AB8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_NANCY, 0, Text_1C166D, Text_183E79 - msgbox Text_183E8D, 6 - end - -Route6_EventScript_1A9ACF:: @ 81A9ACF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ISABELLE, 0, Text_183F90, Text_183FAB - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9AF6 - msgbox Text_183FC4, 6 - end - -EventScript_1A9AF6:: @ 81A9AF6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ISABELLE, 0, Text_1C1746, Text_183FAB - msgbox Text_183FC4, 6 - end - -Route11_EventScript_1A9B0D:: @ 81A9B0D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_EDDIE, 0, Text_184FBD, Text_184FD8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9B34 - msgbox Text_184FEF, 6 - end - -EventScript_1A9B34:: @ 81A9B34 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_EDDIE, 0, Text_1C1DB5, Text_184FD8 - msgbox Text_184FEF, 6 - end - -Route11_EventScript_1A9B4B:: @ 81A9B4B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DILLON, 0, Text_18506A, Text_18509B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9B72 - msgbox Text_1850CF, 6 - end - -EventScript_1A9B72:: @ 81A9B72 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DILLON, 0, Text_1C1E1F, Text_18509B - msgbox Text_1850CF, 6 - end - -Route11_EventScript_1A9B89:: @ 81A9B89 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_YASU, 0, Text_18517B, Text_1851AC - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9BB0 - msgbox Text_1851D2, 6 - end - -EventScript_1A9BB0:: @ 81A9BB0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_YASU, 0, Text_1C1EE2, Text_1851AC - msgbox Text_1851D2, 6 - end - -Route11_EventScript_1A9BC7:: @ 81A9BC7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAVE, 0, Text_185285, Text_1852C1 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9BEE - msgbox Text_1852E3, 6 - end - -EventScript_1A9BEE:: @ 81A9BEE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DAVE, 0, Text_1C1F40, Text_1852C1 - msgbox Text_1852E3, 6 - end - -Route11_EventScript_1A9C05:: @ 81A9C05 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BRAXTON, 0, Text_185011, Text_185037 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9C2C - msgbox Text_18504A, 6 - end - -EventScript_1A9C2C:: @ 81A9C2C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ENGINEER_BRAXTON, 0, Text_1C1DE1, Text_185037 - msgbox Text_18504A, 6 - end - -Route11_EventScript_1A9C43:: @ 81A9C43 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BERNIE, 0, Text_185236, Text_185250 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9C6A - msgbox Text_185266, 6 - end - -EventScript_1A9C6A:: @ 81A9C6A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ENGINEER_BERNIE, 0, Text_1C1F1D, Text_185250 - msgbox Text_185266, 6 - end - -Route11_EventScript_1A9C81:: @ 81A9C81 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_HUGO, 0, Text_184F01, Text_184F15 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9CA8 - msgbox Text_184F2E, 6 - end - -EventScript_1A9CA8:: @ 81A9CA8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_HUGO, 0, Text_1C1D50, Text_184F15 - msgbox Text_184F2E, 6 - end - -Route11_EventScript_1A9CBF:: @ 81A9CBF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_JASPER, 0, Text_184F5D, Text_184F7E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9CE6 - msgbox Text_184F8E, 6 - end - -EventScript_1A9CE6:: @ 81A9CE6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_JASPER, 0, Text_1C1D79, Text_184F7E - msgbox Text_184F8E, 6 - end - -Route11_EventScript_1A9CFD:: @ 81A9CFD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DIRK, 0, Text_1850E9, Text_185105 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9D24 - msgbox Text_185114, 6 - end - -EventScript_1A9D24:: @ 81A9D24 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_DIRK, 0, Text_1C1E57, Text_185105 - msgbox Text_185114, 6 - end - -Route11_EventScript_1A9D3B:: @ 81A9D3B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DARIAN, 0, Text_185135, Text_18514E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9D62 - msgbox Text_185161, 6 - end - -EventScript_1A9D62:: @ 81A9D62 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_DARIAN, 0, Text_1C1E9F, Text_18514E - msgbox Text_185161, 6 - end - -Route9_EventScript_1A9D79:: @ 81A9D79 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_BRENT, 0, Text_184A2F, Text_184A6A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9DA0 - msgbox Text_184A8C, 6 - end - -EventScript_1A9DA0:: @ 81A9DA0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_BRENT, 0, Text_1C1B83, Text_184A6A - msgbox Text_184A8C, 6 - end - -Route9_EventScript_1A9DB7:: @ 81A9DB7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CONNER, 0, Text_184B18, Text_184B32 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9DDE - msgbox Text_184B3B, 6 - end - -EventScript_1A9DDE:: @ 81A9DDE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_CONNER, 0, Text_1C1BDC, Text_184B32 - msgbox Text_184B3B, 6 - end - -Route9_EventScript_1A9DF5:: @ 81A9DF5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_CHRIS, 0, Text_184844, Text_18487E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9E1C - msgbox Text_184890, 6 - end - -EventScript_1A9E1C:: @ 81A9E1C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_CHRIS, 0, Text_1C1A5D, Text_18487E - msgbox Text_184890, 6 - end - -Route9_EventScript_1A9E33:: @ 81A9E33 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_DREW, 0, Text_18489E, Text_1848CC - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9E5A - msgbox Text_1848DE, 6 - end - -EventScript_1A9E5A:: @ 81A9E5A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_DREW, 0, Text_1C1A9B, Text_1848CC - msgbox Text_1848DE, 6 - end - -Route9_EventScript_1A9E71:: @ 81A9E71 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALICIA, 0, Text_1847B7, Text_1847DF - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9E98 - msgbox Text_1847F0, 6 - end - -EventScript_1A9E98:: @ 81A9E98 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ALICIA, 0, Text_1C1A2E, Text_1847DF - msgbox Text_1847F0, 6 - end - -Route9_EventScript_1A9EAF:: @ 81A9EAF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAITLIN, 0, Text_1848FF, Text_18491C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9ED6 - msgbox Text_184931, 6 - end - -EventScript_1A9ED6:: @ 81A9ED6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CAITLIN, 0, Text_1C1AFB, Text_18491C - msgbox Text_184931, 6 - end - -Route9_EventScript_1A9EED:: @ 81A9EED - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALAN, 0, Text_184ABE, Text_184AD5 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9F14 - msgbox Text_184AF1, 6 - end - -EventScript_1A9F14:: @ 81A9F14 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_ALAN, 0, Text_1C1BBE, Text_184AD5 - msgbox Text_184AF1, 6 - end - -Route9_EventScript_1A9F2B:: @ 81A9F2B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_BRICE, 0, Text_1849DF, Text_184A04 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9F52 - msgbox Text_184A11, 6 - end - -EventScript_1A9F52:: @ 81A9F52 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_BRICE, 0, Text_1C1B5E, Text_184A04 - msgbox Text_184A11, 6 - end - -Route9_EventScript_1A9F69:: @ 81A9F69 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_JEREMY, 0, Text_18495E, Text_18497F - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9F90 - msgbox Text_1849B0, 6 - end - -EventScript_1A9F90:: @ 81A9F90 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_JEREMY, 0, Text_1C1B37, Text_18497F - msgbox Text_1849B0, 6 - end - -Route10_EventScript_1A9FA7:: @ 81A9FA7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_HEIDI, 0, Text_184CF1, Text_184D31 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9FCE - msgbox Text_184D4D, 6 - end - -EventScript_1A9FCE:: @ 81A9FCE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_HEIDI, 0, Text_1C1C9A, Text_184D31 - msgbox Text_184D4D, 6 - end - -Route10_EventScript_1A9FE5:: @ 81A9FE5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAROL, 0, Text_184E04, Text_184E3B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA00C - msgbox Text_184E5E, 6 - end - -EventScript_1AA00C:: @ 81AA00C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CAROL, 0, Text_1C1D14, Text_184E3B - msgbox Text_184E5E, 6 - end - -Route10_EventScript_1AA023:: @ 81AA023 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_MARK, 0, Text_184B8A, Text_184BE5 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA04A - msgbox Text_184BFB, 6 - end - -EventScript_1AA04A:: @ 81AA04A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_MARK, 0, Text_1C1BFA, Text_184BE5 - msgbox Text_184BFB, 6 - end - -Route10_EventScript_1AA061:: @ 81AA061 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HERMAN, 0, Text_184C86, Text_184CA7 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA088 - msgbox Text_184CBB, 6 - end - -EventScript_1AA088:: @ 81AA088 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_HERMAN, 0, Text_1C1C76, Text_184CA7 - msgbox Text_184CBB, 6 - end - -Route10_EventScript_1AA09F:: @ 81AA09F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_CLARK, 0, Text_184C1D, Text_184C2D - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA0C6 - msgbox Text_184C60, 6 - end - -EventScript_1AA0C6:: @ 81AA0C6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_CLARK, 0, Text_1C1C4F, Text_184C2D - msgbox Text_184C60, 6 - end - -Route10_EventScript_1AA0DD:: @ 81AA0DD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_TRENT, 0, Text_184DAA, Text_184DCE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA104 - msgbox Text_184DE4, 6 - end - -EventScript_1AA104:: @ 81AA104 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_TRENT, 0, Text_1C1CD3, Text_184DCE - msgbox Text_184DE4, 6 - end - -Route8_EventScript_1AA11B:: @ 81AA11B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_PAIGE, 0, Text_1841ED, Text_184210 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA142 - msgbox Text_18421B, 6 - end - -EventScript_1AA142:: @ 81AA142 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_PAIGE, 0, Text_1C1834, Text_184210 - msgbox Text_18421B, 6 - end - -Route8_EventScript_1AA159:: @ 81AA159 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ANDREA, 0, Text_184321, Text_184346 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA180 - msgbox Text_184350, 6 - end - -EventScript_1AA180:: @ 81AA180 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ANDREA, 0, Text_1C18AA, Text_184346 - msgbox Text_184350, 6 - end - -Route8_EventScript_1AA197:: @ 81AA197 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MEGAN, 0, Text_18437A, Text_1843A6 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA1BE - msgbox Text_1843D2, 6 - end - -EventScript_1AA1BE:: @ 81AA1BE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_MEGAN, 0, Text_1C18DC, Text_1843A6 - msgbox Text_1843D2, 6 - end - -Route8_EventScript_1AA1D5:: @ 81AA1D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JULIA, 0, Text_1844AC, Text_1844D6 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA1FC - msgbox Text_1844FD, 6 - end - -EventScript_1AA1FC:: @ 81AA1FC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_JULIA, 0, Text_1C1955, Text_1844D6 - msgbox Text_1844FD, 6 - end - -Route8_EventScript_1AA213:: @ 81AA213 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_AIDAN, 0, Text_1840C5, Text_184100 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA23A - msgbox Text_18410E, 6 - end - -EventScript_1AA23A:: @ 81AA23A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_AIDAN, 0, Text_1C1793, Text_184100 - msgbox Text_18410E, 6 - end - -Route8_EventScript_1AA251:: @ 81AA251 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_GLENN, 0, Text_18417C, Text_1841B6 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA278 - msgbox Text_1841C8, 6 - end - -EventScript_1AA278:: @ 81AA278 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_GLENN, 0, Text_1C17F1, Text_1841B6 - msgbox Text_1841C8, 6 - end - -Route8_EventScript_1AA28F:: @ 81AA28F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_LESLIE, 0, Text_184257, Text_18427A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA2B6 - msgbox Text_1842B3, 6 - end - -EventScript_1AA2B6:: @ 81AA2B6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_LESLIE, 0, Text_1C1873, Text_18427A - msgbox Text_1842B3, 6 - end - -Route8_EventScript_1AA2CD:: @ 81AA2CD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_STAN, 0, Text_18412F, Text_18414D - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA2F4 - msgbox Text_184162, 6 - end - -EventScript_1AA2F4:: @ 81AA2F4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_STAN, 0, Text_1C17CD, Text_18414D - msgbox Text_184162, 6 - end - -Route8_EventScript_1AA30B:: @ 81AA30B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_RICH, 0, Text_184432, Text_18444F - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA332 - msgbox Text_184466, 6 - end - -EventScript_1AA332:: @ 81AA332 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_RICH, 0, Text_1C191F, Text_18444F - msgbox Text_184466, 6 - end - -Route8_EventScript_1AA349:: @ 81AA349 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1845A4, Text_1845D0, Text_184616 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA374 - msgbox Text_1845F2, 6 - end - -EventScript_1AA374:: @ 81AA374 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1C19E5, Text_1845D0, Text_184616 - msgbox Text_1845F2, 6 - end - -Route8_EventScript_1AA38F:: @ 81AA38F - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_18464A, Text_184675, Text_1846AF - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA3BA - msgbox Text_18468B, 6 - end - -EventScript_1AA3BA:: @ 81AA3BA - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1C1A0D, Text_184675, Text_1846AF - msgbox Text_18468B, 6 - end - -Route8_EventScript_1AA3D5:: @ 81AA3D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RICARDO, 0, Text_1846E2, Text_1846FC - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA3FC - msgbox Text_184719, 6 - end - -EventScript_1AA3FC:: @ 81AA3FC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_RICARDO, 0, Text_1C199C, Text_1846FC - msgbox Text_184719, 6 - end - -Route8_EventScript_1AA413:: @ 81AA413 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAREN, 0, Text_184742, Text_184767 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA43A - msgbox Text_18477A, 6 - end - -EventScript_1AA43A:: @ 81AA43A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JAREN, 0, Text_1C19BC, Text_184767 - msgbox Text_18477A, 6 - end - -Route12_EventScript_1AA451:: @ 81AA451 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NED, 0, Text_185402, Text_18541B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA478 - msgbox Text_185432, 6 - end - -EventScript_1AA478:: @ 81AA478 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_NED, 0, Text_1C1F9D, Text_18541B - msgbox Text_185432, 6 - end - -Route12_EventScript_1AA48F:: @ 81AA48F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CHIP, 0, Text_18544E, Text_185475 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA4B6 - msgbox Text_185488, 6 - end - -EventScript_1AA4B6:: @ 81AA4B6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_CHIP, 0, Text_1C1FD8, Text_185475 - msgbox Text_185488, 6 - end - -Route12_EventScript_1AA4CD:: @ 81AA4CD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_HANK, 0, Text_1855E1, Text_185606 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA4F4 - msgbox Text_185616, 6 - end - -EventScript_1AA4F4:: @ 81AA4F4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_HANK, 0, Text_1C209C, Text_185606 - msgbox Text_185616, 6 - end - -Route12_EventScript_1AA50B:: @ 81AA50B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ELLIOT, 0, Text_185682, Text_1856D0 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA532 - msgbox Text_1856DF, 6 - end - -EventScript_1AA532:: @ 81AA532 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_ELLIOT, 0, Text_1C20D4, Text_1856D0 - msgbox Text_1856DF, 6 - end - -Route12_EventScript_1AA549:: @ 81AA549 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ANDREW, 0, Text_18570E, Text_185744 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA570 - msgbox Text_18574D, 6 - end - -EventScript_1AA570:: @ 81AA570 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_ANDREW, 0, Text_1C2134, Text_185744 - msgbox Text_18574D, 6 - end - -Route12_EventScript_1AA587:: @ 81AA587 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ROCKER_LUCA, 0, Text_185547, Text_18559B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA5AE - msgbox Text_1855A6, 6 - end - -EventScript_1AA5AE:: @ 81AA5AE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ROCKER_LUCA, 0, Text_1C203B, Text_18559B - msgbox Text_1855A6, 6 - end - -Route12_EventScript_1AA5C5:: @ 81AA5C5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JUSTIN, 0, Text_1854B9, Text_1854ED - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA5EC - msgbox Text_1854F2, 6 - end - -EventScript_1AA5EC:: @ 81AA5EC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_JUSTIN, 0, Text_1C2008, Text_1854ED - msgbox Text_1854F2, 6 - end - -Route12_EventScript_1AA603:: @ 81AA603 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1857C5, Text_1857F1, Text_185842 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA62E - msgbox Text_18581F, 6 - end - -EventScript_1AA62E:: @ 81AA62E - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C216B, Text_1857F1, Text_185842 - msgbox Text_18581F, 6 - end - -Route12_EventScript_1AA649:: @ 81AA649 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1858A6, Text_1858D0, Text_185908 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA674 - msgbox Text_1858E2, 6 - end - -EventScript_1AA674:: @ 81AA674 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C219B, Text_1858D0, Text_185908 - msgbox Text_1858E2, 6 - end - -Route13_EventScript_1AA68F:: @ 81AA68F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JARED, 0, Text_185D05, Text_185D1D - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA6B6 - msgbox Text_185D33, 6 - end - -EventScript_1AA6B6:: @ 81AA6B6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JARED, 0, Text_1C236B, Text_185D1D - msgbox Text_185D33, 6 - end - -Route13_EventScript_1AA6CD:: @ 81AA6CD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LOLA, 0, Text_185BFC, Text_185C1F - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA6F4 - msgbox Text_185C35, 6 - end - -EventScript_1AA6F4:: @ 81AA6F4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_LOLA, 0, Text_1C2306, Text_185C1F - msgbox Text_185C35, 6 - end - -Route13_EventScript_1AA70B:: @ 81AA70B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_SHEILA, 0, Text_185C69, Text_185C95 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA732 - msgbox Text_185CA8, 6 - end - -EventScript_1AA732:: @ 81AA732 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_SHEILA, 0, Text_1C2340, Text_185C95 - msgbox Text_185CA8, 6 - end - -Route13_EventScript_1AA749:: @ 81AA749 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_185955, Text_18597E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA770 - msgbox Text_1859A2, 6 - end - -EventScript_1AA770:: @ 81AA770 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_1C21EE, Text_18597E - msgbox Text_1859A2, 6 - end - -Route13_EventScript_1AA787:: @ 81AA787 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_PERRY, 0, Text_185B8F, Text_185BCA - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA7AE - msgbox Text_185BDB, 6 - end - -EventScript_1AA7AE:: @ 81AA7AE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_PERRY, 0, Text_1C22CA, Text_185BCA - msgbox Text_185BDB, 6 - end - -Route13_EventScript_1AA7C5:: @ 81AA7C5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_185D3D, Text_185D7B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA7EC - msgbox Text_185D89, 6 - end - -EventScript_1AA7EC:: @ 81AA7EC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_1C2383, Text_185D7B - msgbox Text_185D89, 6 - end - -Route13_EventScript_1AA803:: @ 81AA803 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALMA, 0, Text_185B12, Text_185B48 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA82A - msgbox Text_185B67, 6 - end - -EventScript_1AA82A:: @ 81AA82A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ALMA, 0, Text_1C2299, Text_185B48 - msgbox Text_185B67, 6 - end - -Route13_EventScript_1AA841:: @ 81AA841 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SUSIE, 0, Text_1859CF, Text_1859EC - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA868 - msgbox Text_1859F9, 6 - end - -EventScript_1AA868:: @ 81AA868 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_SUSIE, 0, Text_1C220C, Text_1859EC - msgbox Text_1859F9, 6 - end - -Route13_EventScript_1AA87F:: @ 81AA87F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_VALERIE, 0, Text_185A37, Text_185A56 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA8A6 - msgbox Text_185A62, 6 - end - -EventScript_1AA8A6:: @ 81AA8A6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_VALERIE, 0, Text_1C223C, Text_185A56 - msgbox Text_185A62, 6 - end - -Route13_EventScript_1AA8BD:: @ 81AA8BD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_GWEN, 0, Text_185A91, Text_185AC1 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA8E4 - msgbox Text_185ADE, 6 - end - -EventScript_1AA8E4:: @ 81AA8E4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_GWEN, 0, Text_1C225B, Text_185AC1 - msgbox Text_185ADE, 6 - end - -Route14_EventScript_1AA8FB:: @ 81AA8FB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_MALIK, 0, Text_186344, Text_186362 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA922 - msgbox Text_18636E, 6 - end - -EventScript_1AA922:: @ 81AA922 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_MALIK, 0, Text_1C25D6, Text_186362 - msgbox Text_18636E, 6 - end - -Route14_EventScript_1AA939:: @ 81AA939 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LUKAS, 0, Text_1861F7, Text_186223 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA960 - msgbox Text_186239, 6 - end - -EventScript_1AA960:: @ 81AA960 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_LUKAS, 0, Text_1C2531, Text_186223 - msgbox Text_186239, 6 - end - -Route14_EventScript_1AA977:: @ 81AA977 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ISAAC, 0, Text_186263, Text_186291 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA99E - msgbox Text_18629D, 6 - end - -EventScript_1AA99E:: @ 81AA99E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ISAAC, 0, Text_1C2572, Text_186291 - msgbox Text_18629D, 6 - end - -Route14_EventScript_1AA9B5:: @ 81AA9B5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_GERALD, 0, Text_1862BD, Text_1862EF - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA9DC - msgbox Text_1862F8, 6 - end - -EventScript_1AA9DC:: @ 81AA9DC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_GERALD, 0, Text_1C259E, Text_1862EF - msgbox Text_1862F8, 6 - end - -Route14_EventScript_1AA9F3:: @ 81AA9F3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1860D9, Text_18610A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAA1A - msgbox Text_18611D, 6 - end - -EventScript_1AAA1A:: @ 81AAA1A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1C24CB, Text_18610A - msgbox Text_18611D, 6 - end - -Route14_EventScript_1AAA31:: @ 81AAA31 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BENNY, 0, Text_18618E, Text_1861B3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAA58 - msgbox Text_1861BE, 6 - end - -EventScript_1AAA58:: @ 81AAA58 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_BENNY, 0, Text_1C2505, Text_1861B3 - msgbox Text_1861BE, 6 - end - -Route14_EventScript_1AAA6F:: @ 81AAA6F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CARTER, 0, Text_185E4D, Text_185E81 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAA96 - msgbox Text_185E9C, 6 - end - -EventScript_1AAA96:: @ 81AAA96 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CARTER, 0, Text_1C23C1, Text_185E81 - msgbox Text_185E9C, 6 - end - -Route14_EventScript_1AAAAD:: @ 81AAAAD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MITCH, 0, Text_185EDF, Text_185F0B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAAD4 - msgbox Text_185F1A, 6 - end - -EventScript_1AAAD4:: @ 81AAAD4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MITCH, 0, Text_1C23EF, Text_185F0B - msgbox Text_185F1A, 6 - end - -Route14_EventScript_1AAAEB:: @ 81AAAEB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BECK, 0, Text_185F46, Text_185FAE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAB12 - msgbox Text_185FBB, 6 - end - -EventScript_1AAB12:: @ 81AAB12 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_BECK, 0, Text_1C2425, Text_185FAE - msgbox Text_185FBB, 6 - end - -Route14_EventScript_1AAB29:: @ 81AAB29 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MARLON, 0, Text_186021, Text_18607C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAB50 - msgbox Text_186091, 6 - end - -EventScript_1AAB50:: @ 81AAB50 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MARLON, 0, Text_1C2461, Text_18607C - msgbox Text_186091, 6 - end - -Route14_EventScript_1AAB67:: @ 81AAB67 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1863B7, Text_1863EA, Text_18642E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAB92 - msgbox Text_18640D, 6 - end - -EventScript_1AAB92:: @ 81AAB92 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1C25FB, Text_1863EA, Text_18642E - msgbox Text_18640D, 6 - end - -Route14_EventScript_1AABAD:: @ 81AABAD - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_18645B, Text_186487, Text_1864D3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AABD8 - msgbox Text_18649C, 6 - end - -EventScript_1AABD8:: @ 81AABD8 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1C261B, Text_186487, Text_1864D3 - msgbox Text_18649C, 6 - end - -Route15_EventScript_1AABF3:: @ 81AABF3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ERNEST, 0, Text_1868B6, Text_1868E8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAC1A - msgbox Text_1868F1, 6 - end - -EventScript_1AAC1A:: @ 81AAC1A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ERNEST, 0, Text_1C27E7, Text_1868E8 - msgbox Text_1868F1, 6 - end - -Route15_EventScript_1AAC31:: @ 81AAC31 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ALEX, 0, Text_186936, Text_186968 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAC58 - msgbox Text_18697C, 6 - end - -EventScript_1AAC58:: @ 81AAC58 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ALEX, 0, Text_1C2814, Text_186968 - msgbox Text_18697C, 6 - end - -Route15_EventScript_1AAC6F:: @ 81AAC6F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_GRACE, 0, Text_18678B, Text_1867C1 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAC96 - msgbox Text_1867DA, 6 - end - -EventScript_1AAC96:: @ 81AAC96 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_GRACE, 0, Text_1C2753, Text_1867C1 - msgbox Text_1867DA, 6 - end - -Route15_EventScript_1AACAD:: @ 81AACAD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_OLIVIA, 0, Text_18680C, Text_186841 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AACD4 - msgbox Text_18686F, 6 - end - -EventScript_1AACD4:: @ 81AACD4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_OLIVIA, 0, Text_1C279D, Text_186841 - msgbox Text_18686F, 6 - end - -Route15_EventScript_1AACEB:: @ 81AACEB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_18664F, Text_18667A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAD12 - msgbox Text_18668D, 6 - end - -EventScript_1AAD12:: @ 81AAD12 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_1C26D3, Text_18667A - msgbox Text_18668D, 6 - end - -Route15_EventScript_1AAD29:: @ 81AAD29 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1866D1, Text_186707 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAD50 - msgbox Text_18671A, 6 - end - -EventScript_1AAD50:: @ 81AAD50 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1C2717, Text_186707 - msgbox Text_18671A, 6 - end - -Route15_EventScript_1AAD67:: @ 81AAD67 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_YAZMIN, 0, Text_186A22, Text_186A40 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAD8E - msgbox Text_186A55, 6 - end - -EventScript_1AAD8E:: @ 81AAD8E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_YAZMIN, 0, Text_1C287D, Text_186A40 - msgbox Text_186A55, 6 - end - -Route15_EventScript_1AADA5:: @ 81AADA5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KINDRA, 0, Text_18650B, Text_186549 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AADCC - msgbox Text_18655A, 6 - end - -EventScript_1AADCC:: @ 81AADCC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_KINDRA, 0, Text_1C2650, Text_186549 - msgbox Text_18655A, 6 - end - -Route15_EventScript_1AADE3:: @ 81AADE3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_BECKY, 0, Text_1865D3, Text_186612 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAE0A - msgbox Text_18661D, 6 - end - -EventScript_1AAE0A:: @ 81AAE0A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_BECKY, 0, Text_1C268D, Text_186612 - msgbox Text_18661D, 6 - end - -Route15_EventScript_1AAE21:: @ 81AAE21 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CELIA, 0, Text_1869BA, Text_1869E6 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAE48 - msgbox Text_1869F4, 6 - end - -EventScript_1AAE48:: @ 81AAE48 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CELIA, 0, Text_1C2846, Text_1869E6 - msgbox Text_1869F4, 6 - end - -Route15_EventScript_1AAE5F:: @ 81AAE5F - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186A95, Text_186ACB, Text_186B46 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAE8A - msgbox Text_186B0A, 6 - end - -EventScript_1AAE8A:: @ 81AAE8A - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28A1, Text_186ACB, Text_186B46 - msgbox Text_186B0A, 6 - end - -Route15_EventScript_1AAEA5:: @ 81AAEA5 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186B89, Text_186BB1, Text_186BFE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAED0 - msgbox Text_186BD2, 6 - end - -EventScript_1AAED0:: @ 81AAED0 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28EC, Text_186BB1, Text_186BFE - msgbox Text_186BD2, 6 - end - -Route16_EventScript_1AAEEB:: @ 81AAEEB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LAO, 0, Text_186C4D, Text_186C5F - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAF12 - msgbox Text_186C75, 6 - end - -EventScript_1AAF12:: @ 81AAF12 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_LAO, 0, Text_1C2913, Text_186C5F - msgbox Text_186C75, 6 - end - -Route16_EventScript_1AAF29:: @ 81AAF29 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_HIDEO, 0, Text_186D39, Text_186D52 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAF50 - msgbox Text_186D5A, 6 - end - -EventScript_1AAF50:: @ 81AAF50 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_HIDEO, 0, Text_1C297B, Text_186D52 - msgbox Text_186D5A, 6 - end - -Route16_EventScript_1AAF67:: @ 81AAF67 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RUBEN, 0, Text_186E86, Text_186EB4 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAF8E - msgbox Text_186EC7, 6 - end - -EventScript_1AAF8E:: @ 81AAF8E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_RUBEN, 0, Text_1C29EB, Text_186EB4 - msgbox Text_186EC7, 6 - end - -Route16_EventScript_1AAFA5:: @ 81AAFA5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_KOJI, 0, Text_186CA2, Text_186CBB - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAFCC - msgbox Text_186CC5, 6 - end - -EventScript_1AAFCC:: @ 81AAFCC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_KOJI, 0, Text_1C2925, Text_186CBB - msgbox Text_186CC5, 6 - end - -Route16_EventScript_1AAFE3:: @ 81AAFE3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_LUKE, 0, Text_186CE5, Text_186D06 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB00A - msgbox Text_186D16, 6 - end - -EventScript_1AB00A:: @ 81AB00A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_LUKE, 0, Text_1C2944, Text_186D06 - msgbox Text_186D16, 6 - end - -Route16_EventScript_1AB021:: @ 81AB021 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_CAMRON, 0, Text_186DD9, Text_186E0D - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB048 - msgbox Text_186E1C, 6 - end - -EventScript_1AB048:: @ 81AB048 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_CAMRON, 0, Text_1C29B0, Text_186E0D - msgbox Text_186E1C, 6 - end - -Route16_EventScript_1AB05F:: @ 81AB05F - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_186FBD, Text_186FFA, Text_187057 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB08A - msgbox Text_187027, 6 - end - -EventScript_1AB08A:: @ 81AB08A - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A19, Text_186FFA, Text_187057 - msgbox Text_187027, 6 - end - -Route16_EventScript_1AB0A5:: @ 81AB0A5 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_187097, Text_1870CC, Text_187120 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB0D0 - msgbox Text_1870F9, 6 - end - -EventScript_1AB0D0:: @ 81AB0D0 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A53, Text_1870CC, Text_187120 - msgbox Text_1870F9, 6 - end - -Route17_EventScript_1AB0EB:: @ 81AB0EB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_BILLY, 0, Text_1872BD, Text_1872E3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB112 - msgbox Text_1872EB, 6 - end - -EventScript_1AB112:: @ 81AB112 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_BILLY, 0, Text_1C2B06, Text_1872E3 - msgbox Text_1872EB, 6 - end - -Route17_EventScript_1AB129:: @ 81AB129 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_NIKOLAS, 0, Text_18730A, Text_187325 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB150 - msgbox Text_187333, 6 - end - -EventScript_1AB150:: @ 81AB150 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_NIKOLAS, 0, Text_1C2B2C, Text_187325 - msgbox Text_187333, 6 - end - -Route17_EventScript_1AB167:: @ 81AB167 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAXON, 0, Text_187456, Text_187472 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB18E - msgbox Text_187479, 6 - end - -EventScript_1AB18E:: @ 81AB18E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JAXON, 0, Text_1C2BE6, Text_187472 - msgbox Text_187479, 6 - end - -Route17_EventScript_1AB1A5:: @ 81AB1A5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_WILLIAM, 0, Text_18749B, Text_1874B6 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB1CC - msgbox Text_1874C9, 6 - end - -EventScript_1AB1CC:: @ 81AB1CC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_WILLIAM, 0, Text_1C2C10, Text_1874B6 - msgbox Text_1874C9, 6 - end - -Route17_EventScript_1AB1E3:: @ 81AB1E3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_RAUL, 0, Text_18717E, Text_1871AE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB20A - msgbox Text_1871BA, 6 - end - -EventScript_1AB20A:: @ 81AB20A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_RAUL, 0, Text_1C2A88, Text_1871AE - msgbox Text_1871BA, 6 - end - -Route17_EventScript_1AB221:: @ 81AB221 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ISAIAH, 0, Text_187228, Text_187254 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB248 - msgbox Text_18725A, 6 - end - -EventScript_1AB248:: @ 81AB248 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_ISAIAH, 0, Text_1C2AC4, Text_187254 - msgbox Text_18725A, 6 - end - -Route17_EventScript_1AB25F:: @ 81AB25F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ZEEK, 0, Text_187362, Text_187395 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB286 - msgbox Text_18739F, 6 - end - -EventScript_1AB286:: @ 81AB286 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_ZEEK, 0, Text_1C2B5E, Text_187395 - msgbox Text_18739F, 6 - end - -Route17_EventScript_1AB29D:: @ 81AB29D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_JAMAL, 0, Text_1873D1, Text_1873EB - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB2C4 - msgbox Text_1873FF, 6 - end - -EventScript_1AB2C4:: @ 81AB2C4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_JAMAL, 0, Text_1C2B9C, Text_1873EB - msgbox Text_1873FF, 6 - end - -Route17_EventScript_1AB2DB:: @ 81AB2DB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_COREY, 0, Text_18741D, Text_187429 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB302 - msgbox Text_187432, 6 - end - -EventScript_1AB302:: @ 81AB302 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_COREY, 0, Text_1C2BDA, Text_187429 - msgbox Text_187432, 6 - end - -Route17_EventScript_1AB319:: @ 81AB319 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_VIRGIL, 0, Text_18727D, Text_187295 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB340 - msgbox Text_1872A5, 6 - end - -EventScript_1AB340:: @ 81AB340 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_VIRGIL, 0, Text_1C2AF0, Text_187295 - msgbox Text_1872A5, 6 - end - -Route18_EventScript_1AB357:: @ 81AB357 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_WILTON, 0, Text_187640, Text_187672 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB37E - msgbox Text_187677, 6 - end - -EventScript_1AB37E:: @ 81AB37E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_WILTON, 0, Text_1C2C2B, Text_187672 - msgbox Text_187677, 6 - end - -Route18_EventScript_1AB395:: @ 81AB395 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_18768C, Text_1876B3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB3BC - msgbox Text_1876C5, 6 - end - -EventScript_1AB3BC:: @ 81AB3BC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_1C2C7B, Text_1876B3 - msgbox Text_1876C5, 6 - end - -Route18_EventScript_1AB3D3:: @ 81AB3D3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_JACOB, 0, Text_187704, Text_187726 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB3FA - msgbox Text_18772C, 6 - end - -EventScript_1AB3FA:: @ 81AB3FA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_JACOB, 0, Text_1C2CA8, Text_187726 - msgbox Text_18772C, 6 - end - -Route19_EventScript_1AB411:: @ 81AB411 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1877A3, Text_1877DF - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB438 - msgbox Text_1877EE, 6 - end - -EventScript_1AB438:: @ 81AB438 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1C2CEE, Text_1877DF - msgbox Text_1877EE, 6 - end - -Route19_EventScript_1AB44F:: @ 81AB44F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_REECE, 0, Text_187811, Text_18783E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB476 - msgbox Text_187852, 6 - end - -EventScript_1AB476:: @ 81AB476 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_REECE, 0, Text_1C2D19, Text_18783E - msgbox Text_187852, 6 - end - -Route19_EventScript_1AB48D:: @ 81AB48D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_187884, Text_1878A5 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB4B4 - msgbox Text_1878B1, 6 - end - -EventScript_1AB4B4:: @ 81AB4B4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_1C2D4B, Text_1878A5 - msgbox Text_1878B1, 6 - end - -Route19_EventScript_1AB4CB:: @ 81AB4CB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1878DD, Text_1878F8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB4F2 - msgbox Text_1878FE, 6 - end - -EventScript_1AB4F2:: @ 81AB4F2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1C2D7D, Text_1878F8 - msgbox Text_1878FE, 6 - end - -Route19_EventScript_1AB509:: @ 81AB509 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DAVID, 0, Text_187925, Text_187955 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB530 - msgbox Text_18795B, 6 - end - -EventScript_1AB530:: @ 81AB530 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DAVID, 0, Text_1C2DA7, Text_187955 - msgbox Text_18795B, 6 - end - -Route19_EventScript_1AB547:: @ 81AB547 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TONY, 0, Text_187985, Text_1879C3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB56E - msgbox Text_1879D3, 6 - end - -EventScript_1AB56E:: @ 81AB56E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_TONY, 0, Text_1C2DE9, Text_1879C3 - msgbox Text_1879D3, 6 - end - -Route19_EventScript_1AB585:: @ 81AB585 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_AXLE, 0, Text_187AFA, Text_187B25 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB5AC - msgbox Text_187B35, 6 - end - -EventScript_1AB5AC:: @ 81AB5AC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_AXLE, 0, Text_1C2EC0, Text_187B25 - msgbox Text_187B35, 6 - end - -Route19_EventScript_1AB5C3:: @ 81AB5C3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_187A11, Text_187A44 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB5EA - msgbox Text_187A50, 6 - end - -EventScript_1AB5EA:: @ 81AB5EA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_1C2E4A, Text_187A44 - msgbox Text_187A50, 6 - end - -Route19_EventScript_1AB601:: @ 81AB601 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_187A9E, Text_187AC1 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB628 - msgbox Text_187ACA, 6 - end - -EventScript_1AB628:: @ 81AB628 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_1C2E9D, Text_187AC1 - msgbox Text_187ACA, 6 - end - -Route19_EventScript_1AB63F:: @ 81AB63F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_187B5D, Text_187B85 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB666 - msgbox Text_187B94, 6 - end - -EventScript_1AB666:: @ 81AB666 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_1C2EFC, Text_187B85 - msgbox Text_187B94, 6 - end - -Route19_EventScript_1AB67D:: @ 81AB67D - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187C32, Text_187C6F, Text_187CF2 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB6A8 - msgbox Text_187C9E, 6 - end - -EventScript_1AB6A8:: @ 81AB6A8 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2F41, Text_187C6F, Text_187CF2 - msgbox Text_187C9E, 6 - end - -Route19_EventScript_1AB6C3:: @ 81AB6C3 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187D45, Text_187D7E, Text_187DE8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB6EE - msgbox Text_187DAD, 6 - end - -EventScript_1AB6EE:: @ 81AB6EE - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2FAE, Text_187D7E, Text_187DE8 - msgbox Text_187DAD, 6 - end - -Route20_EventScript_1AB709:: @ 81AB709 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_BARRY, 0, Text_187E40, Text_187E7B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB730 - msgbox Text_187E83, 6 - end - -EventScript_1AB730:: @ 81AB730 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_BARRY, 0, Text_1C2FF3, Text_187E7B - msgbox Text_187E83, 6 - end - -Route20_EventScript_1AB747:: @ 81AB747 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DEAN, 0, Text_187FDB, Text_187FF7 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB76E - msgbox Text_187FFE, 6 - end - -EventScript_1AB76E:: @ 81AB76E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DEAN, 0, Text_1C30B0, Text_187FF7 - msgbox Text_187FFE, 6 - end - -Route20_EventScript_1AB785:: @ 81AB785 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_18802E, Text_18805C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB7AC - msgbox Text_18806D, 6 - end - -EventScript_1AB7AC:: @ 81AB7AC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_1C30ED, Text_18805C - msgbox Text_18806D, 6 - end - -Route20_EventScript_1AB7C3:: @ 81AB7C3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_187F24, Text_187F5A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB7EA - msgbox Text_187F61, 6 - end - -EventScript_1AB7EA:: @ 81AB7EA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_1C305F, Text_187F5A - msgbox Text_187F61, 6 - end - -Route20_EventScript_1AB801:: @ 81AB801 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1880F8, Text_188119 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB828 - msgbox Text_188139, 6 - end - -EventScript_1AB828:: @ 81AB828 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1C3149, Text_188119 - msgbox Text_188139, 6 - end - -Route20_EventScript_1AB83F:: @ 81AB83F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_188218, Text_18825C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB866 - msgbox Text_18827B, 6 - end - -EventScript_1AB866:: @ 81AB866 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_1C31C4, Text_18825C - msgbox Text_18827B, 6 - end - -Route20_EventScript_1AB87D:: @ 81AB87D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_187EBB, Text_187EED - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB8A4 - msgbox Text_187EF6, 6 - end - -EventScript_1AB8A4:: @ 81AB8A4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_1C302E, Text_187EED - msgbox Text_187EF6, 6 - end - -Route20_EventScript_1AB8BB:: @ 81AB8BB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROGER, 0, Text_18808E, Text_1880AB - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB8E2 - msgbox Text_1880C8, 6 - end - -EventScript_1AB8E2:: @ 81AB8E2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_ROGER, 0, Text_1C312C, Text_1880AB - msgbox Text_1880C8, 6 - end - -Route20_EventScript_1AB8F9:: @ 81AB8F9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MISSY, 0, Text_188165, Text_1881A3 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB920 - msgbox Text_1881B8, 6 - end - -EventScript_1AB920:: @ 81AB920 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_MISSY, 0, Text_1C3185, Text_1881A3 - msgbox Text_1881B8, 6 - end - -Route20_EventScript_1AB937:: @ 81AB937 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_IRENE, 0, Text_187F78, Text_187F92 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB95E - msgbox Text_187FA3, 6 - end - -EventScript_1AB95E:: @ 81AB95E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_IRENE, 0, Text_1C3095, Text_187F92 - msgbox Text_187FA3, 6 - end - -Route21_North_EventScript_1AB975:: @ 81AB975 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_RONALD, 0, Text_18835A, Text_188383 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB99C - msgbox Text_188389, 6 - end - -EventScript_1AB99C:: @ 81AB99C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_RONALD, 0, Text_1C3208, Text_188383 - msgbox Text_188389, 6 - end - -Route21_South_EventScript_1AB9B3:: @ 81AB9B3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CLAUDE, 0, Text_1885D8, Text_1885F8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB9DA - msgbox Text_188632, 6 - end - -EventScript_1AB9DA:: @ 81AB9DA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_CLAUDE, 0, Text_1C331D, Text_1885F8 - msgbox Text_188632, 6 - end - -Route21_North_EventScript_1AB9F1:: @ 81AB9F1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_WADE, 0, Text_1883C6, Text_1883E9 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABA18 - msgbox Text_18841D, 6 - end - -EventScript_1ABA18:: @ 81ABA18 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_WADE, 0, Text_1C3231, Text_1883E9 - msgbox Text_18841D, 6 - end - -Route21_South_EventScript_1ABA2F:: @ 81ABA2F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NOLAN, 0, Text_18868C, Text_1886AE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABA56 - msgbox Text_1886C5, 6 - end - -EventScript_1ABA56:: @ 81ABA56 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_NOLAN, 0, Text_1C3356, Text_1886AE - msgbox Text_1886C5, 6 - end - -Route21_North_EventScript_1ABA6D:: @ 81ABA6D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_18843C, Text_18845F - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABA94 - msgbox Text_188465, 6 - end - -EventScript_1ABA94:: @ 81ABA94 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_1C3264, Text_18845F - msgbox Text_188465, 6 - end - -Route21_South_EventScript_1ABAAB:: @ 81ABAAB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JACK, 0, Text_1884D4, Text_1884F0 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABAD2 - msgbox Text_1884FF, 6 - end - -EventScript_1ABAD2:: @ 81ABAD2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_JACK, 0, Text_1C3298, Text_1884F0 - msgbox Text_1884FF, 6 - end - -Route21_South_EventScript_1ABAE9:: @ 81ABAE9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JEROME, 0, Text_18851F, Text_188543 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABB10 - msgbox Text_188555, 6 - end - -EventScript_1ABB10:: @ 81ABB10 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_JEROME, 0, Text_1C32D3, Text_188543 - msgbox Text_188555, 6 - end - -Route21_South_EventScript_1ABB27:: @ 81ABB27 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_188592, Text_1885B2 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABB4E - msgbox Text_1885BF, 6 - end - -EventScript_1ABB4E:: @ 81ABB4E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_1C32FD, Text_1885B2 - msgbox Text_1885BF, 6 - end - -Route21_North_EventScript_1ABB65:: @ 81ABB65 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1886E2, Text_188712, Text_18875E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABB90 - msgbox Text_188734, 6 - end - -EventScript_1ABB90:: @ 81ABB90 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C3378, Text_188712, Text_18875E - msgbox Text_188734, 6 - end - -Route21_North_EventScript_1ABBAB:: @ 81ABBAB - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1887B4, Text_1887F1, Text_188850 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABBD6 - msgbox Text_188812, 6 - end - -EventScript_1ABBD6:: @ 81ABBD6 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C33AE, Text_1887F1, Text_188850 - msgbox Text_188812, 6 - end - -OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_18961F, Text_18964D - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABC18 - msgbox Text_189657, 6 - end - -EventScript_1ABC18:: @ 81ABC18 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_1C37B5, Text_18964D - msgbox Text_189657, 6 - end - -OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_18968C, Text_1896AC - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABC56 - msgbox Text_1896C1, 6 - end - -EventScript_1ABC56:: @ 81ABC56 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_1C37E7, Text_1896AC - msgbox Text_1896C1, 6 - end - -OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_FINN, 0, Text_1896F9, Text_189728 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABC94 - msgbox Text_189740, 6 - end - -EventScript_1ABC94:: @ 81ABC94 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_FINN, 0, Text_1C3807, Text_189728 - msgbox Text_189740, 6 - end - -OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_189767, Text_1897A4 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABCD2 - msgbox Text_1897C5, 6 - end - -EventScript_1ABCD2:: @ 81ABCD2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_1C3835, Text_1897A4 - msgbox Text_1897C5, 6 - end - -OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TOMMY, 0, Text_1897FF, Text_189833 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABD10 - msgbox Text_18984B, 6 - end - -EventScript_1ABD10:: @ 81ABD10 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_TOMMY, 0, Text_1C386A, Text_189833 - msgbox Text_18984B, 6 - end - -OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_SHARON, 0, Text_189883, Text_1898AB - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABD4E - msgbox Text_1898C4, 6 - end - -EventScript_1ABD4E:: @ 81ABD4E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_SHARON, 0, Text_1C389F, Text_1898AB - msgbox Text_1898C4, 6 - end - -OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1898F0, Text_18991B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABD8C - msgbox Text_18992C, 6 - end - -EventScript_1ABD8C:: @ 81ABD8C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1C38CA, Text_18991B - msgbox Text_18992C, 6 - end - -OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_SHEA, 0, Text_189950, Text_18998C - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABDCA - msgbox Text_189998, 6 - end - -EventScript_1ABDCA:: @ 81ABDCA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BLACK_BELT_SHEA, 0, Text_1C38FA, Text_18998C - msgbox Text_189998, 6 - end - -OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HUGH, 0, Text_1899CE, Text_189A0A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABE08 - msgbox Text_189A13, 6 - end - -EventScript_1ABE08:: @ 81ABE08 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BLACK_BELT_HUGH, 0, Text_1C3943, Text_189A0A - msgbox Text_189A13, 6 - end - -OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_BRYCE, 0, Text_189A53, Text_189A92 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABE46 - msgbox Text_189A9F, 6 - end - -EventScript_1ABE46:: @ 81ABE46 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_BRYCE, 0, Text_1C3987, Text_189A92 - msgbox Text_189A9F, 6 - end - -OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CLAIRE, 0, Text_189ACB, Text_189B0B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABE84 - msgbox Text_189B24, 6 - end - -EventScript_1ABE84:: @ 81ABE84 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CLAIRE, 0, Text_1C39C6, Text_189B0B - msgbox Text_189B24, 6 - end - -OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189B4D, Text_189B84, Text_189BDE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABEC6 - msgbox Text_189BA3, 6 - end - -EventScript_1ABEC6:: @ 81ABEC6 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A05, Text_189B84, Text_189BDE - msgbox Text_189BA3, 6 - end - -OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189C33, Text_189C62, Text_189CAB - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABF0C - msgbox Text_189C7E, 6 - end - -EventScript_1ABF0C:: @ 81ABF0C - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A55, Text_189C62, Text_189CAB - msgbox Text_189C7E, 6 - end - -OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_189D5A, Text_189D8B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABF4E - msgbox Text_189DA3, 6 - end - -EventScript_1ABF4E:: @ 81ABF4E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_1C3773, Text_189D8B - msgbox Text_189DA3, 6 - end - -ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_NIKKI, 0, Text_189E42, Text_189E72 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABF8C - msgbox Text_189E9E, 6 - end - -EventScript_1ABF8C:: @ 81ABF8C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_NIKKI, 0, Text_1C3AA7, Text_189E72 - msgbox Text_189E9E, 6 - end - -ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_VIOLET, 0, Text_189ED4, Text_189EFA - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABFCA - msgbox Text_189F21, 6 - end - -EventScript_1ABFCA:: @ 81ABFCA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_VIOLET, 0, Text_1C3ABF, Text_189EFA - msgbox Text_189F21, 6 - end - -ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_AMIRA, 0, Text_189F63, Text_189F9A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC008 - msgbox Text_189FA8, 6 - end - -EventScript_1AC008:: @ 81AC008 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TUBER_AMIRA, 0, Text_1C3AF2, Text_189F9A - msgbox Text_189FA8, 6 - end - -ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_ALEXIS, 0, Text_189FDB, Text_189FEE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC046 - msgbox Text_18A000, 6 - end - -EventScript_1AC046:: @ 81AC046 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TUBER_ALEXIS, 0, Text_1C3B1D, Text_189FEE - msgbox Text_18A000, 6 - end - -ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_18A01F, Text_18A053 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC084 - msgbox Text_18A082, 6 - end - -EventScript_1AC084:: @ 81AC084 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_1C3B30, Text_18A053 - msgbox Text_18A082, 6 - end - -ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A0C4, Text_18A0F7, Text_18A138 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC0C6 - msgbox Text_18A106, 6 - end - -EventScript_1AC0C6:: @ 81AC0C6 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B6E, Text_18A0F7, Text_18A138 - msgbox Text_18A106, 6 - end - -ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A179, Text_18A1A3, Text_18A1CD - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC10C - msgbox Text_18A1B2, 6 - end - -EventScript_1AC10C:: @ 81AC10C - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B99, Text_18A1A3, Text_18A1CD - msgbox Text_18A1B2, 6 - end - -FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_DAISY, 0, Text_18A3E2, Text_18A40E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC14E - msgbox Text_18A430, 6 - end - -EventScript_1AC14E:: @ 81AC14E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_DAISY, 0, Text_1C3BF6, Text_18A40E - msgbox Text_18A430, 6 - end - -FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_CELINA, 0, Text_18A461, Text_18A49E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC18C - msgbox Text_18A4C6, 6 - end - -EventScript_1AC18C:: @ 81AC18C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_CELINA, 0, Text_1C3C28, Text_18A49E - msgbox Text_18A4C6, 6 - end - -FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_RAYNA, 0, Text_18A50E, Text_18A535 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC1CA - msgbox Text_18A555, 6 - end - -EventScript_1AC1CA:: @ 81AC1CA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_RAYNA, 0, Text_1C3C70, Text_18A535 - msgbox Text_18A555, 6 - end - -FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_JACKI, 0, Text_18A5B9, Text_18A5EE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC208 - msgbox Text_18A601, 6 - end - -EventScript_1AC208:: @ 81AC208 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LADY_JACKI, 0, Text_1C3CB0, Text_18A5EE - msgbox Text_18A601, 6 - end - -FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_GILLIAN, 0, Text_18A645, Text_18A67F - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC246 - msgbox Text_18A699, 6 - end - -EventScript_1AC246:: @ 81AC246 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LADY_GILLIAN, 0, Text_1C3CF1, Text_18A67F - msgbox Text_18A699, 6 - end - -FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DESTIN, 0, Text_18A6DA, Text_18A6FE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC284 - msgbox Text_18A715, 6 - end - -EventScript_1AC284:: @ 81AC284 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DESTIN, 0, Text_1C3D47, Text_18A6FE - msgbox Text_18A715, 6 - end - -FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TOBY, 0, Text_18A74A, Text_18A786 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC2C2 - msgbox Text_18A7AC, 6 - end - -EventScript_1AC2C2:: @ 81AC2C2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_TOBY, 0, Text_1C3D73, Text_18A786 - msgbox Text_18A7AC, 6 - end - -FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_18AAD5, Text_18AB0B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC300 - msgbox Text_18AB37, 6 - end - -EventScript_1AC300:: @ 81AC300 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_1C3BB7, Text_18AB0B - msgbox Text_18AB37, 6 - end - -FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MILO, 0, Text_18AE50, Text_18AEA8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC33E - msgbox Text_18AEB6, 6 - end - -EventScript_1AC33E:: @ 81AC33E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MILO, 0, Text_1C3DA2, Text_18AEA8 - msgbox Text_18AEB6, 6 - end - -FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_18AEDC, Text_18AF39 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC37C - msgbox Text_18AF45, 6 - end - -EventScript_1AC37C:: @ 81AC37C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_1C3E0F, Text_18AF39 - msgbox Text_18AF45, 6 - end - -FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_18AF72, Text_18AFCC - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC3BA - msgbox Text_18AFF2, 6 - end - -EventScript_1AC3BA:: @ 81AC3BA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_1C3E6A, Text_18AFCC - msgbox Text_18AFF2, 6 - end - -SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TYLOR, 0, Text_18B400, Text_18B43B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC3F8 - msgbox Text_18B451, 6 - end - -EventScript_1AC3F8:: @ 81AC3F8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_TYLOR, 0, Text_1C3ED0, Text_18B43B - msgbox Text_18B451, 6 - end - -SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MYMO, 0, Text_18B48F, Text_18B4C5 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC436 - msgbox Text_18B4D1, 6 - end - -EventScript_1AC436:: @ 81AC436 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_MYMO, 0, Text_1C3F11, Text_18B4C5 - msgbox Text_18B4D1, 6 - end - -SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_18B4FA, Text_18B539 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC474 - msgbox Text_18B573, 6 - end - -EventScript_1AC474:: @ 81AC474 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_1C3F51, Text_18B539 - msgbox Text_18B573, 6 - end - -SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B5C8, Text_18B5F4, Text_18B660 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC4B6 - msgbox Text_18B62E, 6 - end - -EventScript_1AC4B6:: @ 81AC4B6 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3F7B, Text_18B5F4, Text_18B660 - msgbox Text_18B62E, 6 - end - -SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B6C1, Text_18B6EF, Text_18B762 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC4FC - msgbox Text_18B720, 6 - end - -EventScript_1AC4FC:: @ 81AC4FC - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3FB3, Text_18B6EF, Text_18B762 - msgbox Text_18B720, 6 - end - -SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JACLYN, 0, Text_18B7B0, Text_18B7F0 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC53E - msgbox Text_18B7FD, 6 - end - -EventScript_1AC53E:: @ 81AC53E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_JACLYN, 0, Text_1C3FE9, Text_18B7F0 - msgbox Text_18B7FD, 6 - end - -SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_ROSE, 0, Text_18B896, Text_18B8C8 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC57C - msgbox Text_18B8F7, 6 - end - -EventScript_1AC57C:: @ 81AC57C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_ROSE, 0, Text_1C4028, Text_18B8C8 - msgbox Text_18B8F7, 6 - end - -SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_EDWARD, 0, Text_18B959, Text_18B988 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC5BA - msgbox Text_18B9A5, 6 - end - -EventScript_1AC5BA:: @ 81AC5BA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_JUGGLER_EDWARD, 0, Text_1C4057, Text_18B988 - msgbox Text_18B9A5, 6 - end - -SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_18B9EC, Text_18BA47 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC5F8 - msgbox Text_18BA57, 6 - end - -EventScript_1AC5F8:: @ 81AC5F8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_1C407F, Text_18BA47 - msgbox Text_18BA57, 6 - end - -SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_18BA86, Text_18BAC0 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC636 - msgbox Text_18BAE0, 6 - end - -EventScript_1AC636:: @ 81AC636 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_1C40D9, Text_18BAC0 - msgbox Text_18BAE0, 6 - end - -SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC678 - msgbox Text_18BBF6, 6 - end - -EventScript_1AC678:: @ 81AC678 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_1C4138, Text_18BBE2, Text_18BC24 - msgbox Text_18BBF6, 6 - end - -SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BC5A, Text_18BC84, Text_18BCCF - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC6BE - msgbox Text_18BCAE, 6 - end - -EventScript_1AC6BE:: @ 81AC6BE - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_1C4166, Text_18BC84, Text_18BCCF - msgbox Text_18BCAE, 6 - end - -SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_EARL, 0, Text_18BB2D, Text_18BB62 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC700 - msgbox Text_18BB8B, 6 - end - -EventScript_1AC700:: @ 81AC700 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_EARL, 0, Text_1C40FA, Text_18BB62 - msgbox Text_18BB8B, 6 - end - -SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_STANLY, 0, Text_18BE5D, Text_18BE9B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC73E - msgbox Text_18BEA0, 6 - end - -EventScript_1AC73E:: @ 81AC73E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_STANLY, 0, Text_1C4196, Text_18BE9B - msgbox Text_18BEA0, 6 - end - -SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_18BF05, Text_18BF33 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC77C - msgbox Text_18BF6C, 6 - end - -EventScript_1AC77C:: @ 81AC77C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_1C41D4, Text_18BF33 - msgbox Text_18BF6C, 6 - end - -SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LARRY, 0, Text_18BFC5, Text_18C03B - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC7BA - msgbox Text_18C04C, 6 - end - -EventScript_1AC7BA:: @ 81AC7BA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_LARRY, 0, Text_1C4210, Text_18C03B - msgbox Text_18C04C, 6 - end - -SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DARYL, 0, Text_18C09C, Text_18C0BB - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC7F8 - msgbox Text_18C0EA, 6 - end - -EventScript_1AC7F8:: @ 81AC7F8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_DARYL, 0, Text_1C4280, Text_18C0BB - msgbox Text_18C0EA, 6 - end - -SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HECTOR, 0, Text_18C10A, Text_18C140 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC836 - msgbox Text_18C17A, 6 - end - -EventScript_1AC836:: @ 81AC836 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_HECTOR, 0, Text_1C42A0, Text_18C140 - msgbox Text_18C17A, 6 - end - -SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_DARIO, 0, Text_18C1ED, Text_18C205 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC874 - msgbox Text_18C20E, 6 - end - -EventScript_1AC874:: @ 81AC874 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_DARIO, 0, Text_1C42D6, Text_18C205 - msgbox Text_18C20E, 6 - end - -SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_RODETTE, 0, Text_18C283, Text_18C2BC - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC8B2 - msgbox Text_18C2D5, 6 - end - -EventScript_1AC8B2:: @ 81AC8B2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_RODETTE, 0, Text_1C42EE, Text_18C2BC - msgbox Text_18C2D5, 6 - end - -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_MIAH, 0, Text_18C3BC, Text_18C3E7 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC8F0 - msgbox Text_18C3FF, 6 - end - -EventScript_1AC8F0:: @ 81AC8F0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_MIAH, 0, Text_1C4327, Text_18C3E7 - msgbox Text_18C3FF, 6 - end - -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C632, Text_18C662, Text_18C6AB - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC932 - msgbox Text_18C683, 6 - end - -EventScript_1AC932:: @ 81AC932 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C4416, Text_18C662, Text_18C6AB - msgbox Text_18C683, 6 - end - -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C700, Text_18C73B, Text_18C7BD - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC978 - msgbox Text_18C773, 6 - end - -EventScript_1AC978:: @ 81AC978 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C444C, Text_18C73B, Text_18C7BD - msgbox Text_18C773, 6 - end - -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_MASON, 0, Text_18C44B, Text_18C473 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC9BA - msgbox Text_18C4BA, 6 - end - -EventScript_1AC9BA:: @ 81AC9BA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_JUGGLER_MASON, 0, Text_1C4374, Text_18C473 - msgbox Text_18C4BA, 6 - end - -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_18C500, Text_18C543 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC9F8 - msgbox Text_18C54B, 6 - end - -EventScript_1AC9F8:: @ 81AC9F8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_1C43AD, Text_18C543 - msgbox Text_18C54B, 6 - end - -SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_MADELINE, 0, Text_18C5AA, Text_18C5CD - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACA36 - msgbox Text_18C5F5, 6 - end - -EventScript_1ACA36:: @ 81ACA36 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_MADELINE, 0, Text_1C43EC, Text_18C5CD - msgbox Text_18C5F5, 6 - end - -SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_18C887, Text_18C8A6 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACA74 - msgbox Text_18C8C2, 6 - end - -EventScript_1ACA74:: @ 81ACA74 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_1C4491, Text_18C8A6 - msgbox Text_18C8C2, 6 - end - -SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EVAN, 0, Text_18C8FD, Text_18C980 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACAB2 - msgbox Text_18C999, 6 - end - -EventScript_1ACAB2:: @ 81ACAB2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TAMER_EVAN, 0, Text_1C44CB, Text_18C980 - msgbox Text_18C999, 6 - end - -SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_JACKSON, 0, Text_18CA2F, Text_18CA6F - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACAF0 - msgbox Text_18CA9C, 6 - end - -EventScript_1ACAF0:: @ 81ACAF0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_JACKSON, 0, Text_1C454E, Text_18CA6F - msgbox Text_18CA9C, 6 - end - -SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_KATELYN, 0, Text_18CB16, Text_18CB3E - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACB2E - msgbox Text_18CB6C, 6 - end - -EventScript_1ACB2E:: @ 81ACB2E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_KATELYN, 0, Text_1C458E, Text_18CB3E - msgbox Text_18CB6C, 6 - end - -SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_LEROY, 0, Text_18CBB4, Text_18CBE0 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACB6C - msgbox Text_18CC09, 6 - end - -EventScript_1ACB6C:: @ 81ACB6C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_COOLTRAINER_LEROY, 0, Text_1C45C2, Text_18CBE0 - msgbox Text_18CC09, 6 - end - -SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MICHELLE, 0, Text_18CC4F, Text_18CCAE - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACBAA - msgbox Text_18CCEA, 6 - end - -EventScript_1ACBAA:: @ 81ACBAA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_COOLTRAINER_MICHELLE, 0, Text_1C45FB, Text_18CCAE - msgbox Text_18CCEA, 6 - end - -SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CD49, Text_18CD75, Text_18CDE2 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACBEC - msgbox Text_18CD9C, 6 - end - -EventScript_1ACBEC:: @ 81ACBEC - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4662, Text_18CD75, Text_18CDE2 - msgbox Text_18CD9C, 6 - end - -SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACC32 - msgbox Text_18CE78, 6 - end - -EventScript_1ACC32:: @ 81ACC32 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4699, Text_18CE5A, Text_18CEF4 - msgbox Text_18CE78, 6 - end - -SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_18CFFB, Text_18D02A - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACC74 - msgbox Text_18D061, 6 - end - -EventScript_1ACC74:: @ 81ACC74 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_1C46D3, Text_18D02A - msgbox Text_18D061, 6 - end - -SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_18D0D9, Text_18D108 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACCB2 - msgbox Text_18D125, 6 - end - -EventScript_1ACCB2:: @ 81ACCB2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_1C470A, Text_18D108 - msgbox Text_18D125, 6 - end - -SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_EDNA, 0, Text_18D18F, Text_18D1B5 - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACCF0 - msgbox Text_18D1E3, 6 - end - -EventScript_1ACCF0:: @ 81ACCF0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_EDNA, 0, Text_1C4739, Text_18D1B5 - msgbox Text_18D1E3, 6 - end - -SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_18D22F, Text_18D26D - specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACD2E - msgbox Text_18D284, 6 - end - -EventScript_1ACD2E:: @ 81ACD2E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_1C476A, Text_18D26D - msgbox Text_18D284, 6 - end + .include "data/scripts/trainers.inc" @ Test message! @ Welcome to the world of Pokémon! @@ -7574,293 +4141,7 @@ Text_1ACD45:: @ 81ACD45 .string "テストよう　メッセージです！\n" .string "ポケモンの　せかいへ　ようこそ！$" -ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65 - lock - faceplayer - famechecker FAMECHECKER_OAK, 3 - famechecker FAMECHECKER_DAISY, 3 - textcolor 3 - msgbox gUnknown_81B1AB9 - release - end - -EventScript_1ACD8D:: @ 81ACD8D - lock - faceplayer - famechecker FAMECHECKER_DAISY, 1 - famechecker FAMECHECKER_OAK, 4 - textcolor 3 - msgbox gUnknown_81B1AB9 - release - end - -EventScript_1ACDB5:: @ 81ACDB5 - lock - faceplayer - famechecker FAMECHECKER_DAISY, 4 - textcolor 3 - msgbox gUnknown_81B1AB9 - release - end - -FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0 - lockall - famechecker FAMECHECKER_DAISY, 5 - textcolor 3 - msgbox gUnknown_81B1B3D - releaseall - end - -Route4_EventScript_1ACDEA:: @ 81ACDEA - lock - faceplayer - famechecker FAMECHECKER_BROCK, 3 - msgbox Text_183D26 - release - end - -MtMoon_1F_EventScript_1ACE03:: @ 81ACE03 - lock - faceplayer - famechecker FAMECHECKER_BROCK, 4 - msgbox Text_172B00 - release - end - -PewterCity_Museum_1F_EventScript_1ACE1C:: @ 81ACE1C - lockall - famechecker FAMECHECKER_BROCK, 5 - textcolor 3 - msgbox gUnknown_81B146A - releaseall - end - -Route20_EventScript_1ACE36:: @ 81ACE36 - lock - faceplayer - famechecker FAMECHECKER_MISTY, 3 - msgbox Text_1882E1 - release - end - -Route25_EventScript_1ACE4F:: @ 81ACE4F - lock - faceplayer - famechecker FAMECHECKER_MISTY, 4 - msgbox Text_189569 - release - end - -CeruleanCity_PokemonCenter_1F_EventScript_1ACE68:: @ 81ACE68 - lock - faceplayer - famechecker FAMECHECKER_MISTY, 5 - textcolor 3 - msgbox gUnknown_81B14E8 - release - end - -VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83 - lockall - famechecker FAMECHECKER_LTSURGE, 5 - textcolor 3 - msgbox gUnknown_81B1558 - releaseall - end - -CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D - lock - faceplayer - famechecker FAMECHECKER_ERIKA, 5 - textcolor 3 - msgbox gUnknown_81B161B - release - end - -FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8 - lock - faceplayer - famechecker FAMECHECKER_KOGA, 4 - textcolor 3 - msgbox gUnknown_81B16A8 - release - end - -SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3 - lock - faceplayer - famechecker FAMECHECKER_KOGA, 5 - msgbox Text_177C47 - release - end - -SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC - lock - faceplayer - famechecker FAMECHECKER_SABRINA, 4 - textcolor 3 - msgbox gUnknown_81B1753 - release - end - -CinnabarIsland_Gym_EventScript_1ACF07:: @ 81ACF07 - lockall - famechecker FAMECHECKER_BLAINE, 4 - famechecker FAMECHECKER_MRFUJI, 4 - msgbox Text_199E8A - releaseall - end - -FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C - lockall - famechecker FAMECHECKER_BLAINE, 5 - textcolor 3 - msgbox gUnknown_81B17E9 - releaseall - end - -FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46 - lock - faceplayer - famechecker FAMECHECKER_LORELEI, 2 - msgbox Text_1A3A60 - release - end - -FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F - lock - faceplayer - famechecker FAMECHECKER_LORELEI, 3 - textcolor 3 - msgbox gUnknown_81B187F - release - end - -SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A - lock - faceplayer - famechecker FAMECHECKER_BRUNO, 2 - textcolor 3 - msgbox gUnknown_81B1913 - release - end - -SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95 - lock - faceplayer - famechecker FAMECHECKER_BRUNO, 5 - msgbox Text_18CF4D - release - end - -IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE - lock - faceplayer - famechecker FAMECHECKER_AGATHA, 1 - famechecker FAMECHECKER_AGATHA, 2 - msgbox Text_19A9E7 - release - end - -SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4 - lock - faceplayer - famechecker FAMECHECKER_AGATHA, 3 - textcolor 3 - msgbox gUnknown_81B19A8 - release - end - -SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF - lock - faceplayer - famechecker FAMECHECKER_AGATHA, 5 - msgbox Text_1A41CA - release - end - -EventScript_1AD008:: @ 81AD008 - lock - faceplayer - famechecker FAMECHECKER_LANCE, 0 - msgbox gFameCheckerFlavorText_Lance0 - release - end - -EventScript_1AD021:: @ 81AD021 - lock - faceplayer - famechecker FAMECHECKER_LANCE, 1 - msgbox Text_181569 - release - end - -SaffronCity_EventScript_1AD03A:: @ 81AD03A - lock - faceplayer - famechecker FAMECHECKER_LANCE, 2 - msgbox Text_181569 - release - end - -CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053 - lock - faceplayer - famechecker FAMECHECKER_LANCE, 3 - msgbox Text_19566B - release - end - -IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C - lock - faceplayer - famechecker FAMECHECKER_LANCE, 4 - textcolor 3 - msgbox gUnknown_81B1A31 - release - end - -IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087 - lock - faceplayer - famechecker FAMECHECKER_LANCE, 5 - msgbox Text_19AB16 - release - end - -LavenderTown_PokemonCenter_1F_EventScript_1AD0A0:: @ 81AD0A0 - lock - faceplayer - famechecker FAMECHECKER_MRFUJI, 3 - msgbox Text_19358E - release - end - -CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9 - lock - faceplayer - famechecker FAMECHECKER_MRFUJI, 5 - textcolor 3 - msgbox gUnknown_81B1BD1 - release - end - -SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4 - lock - faceplayer - famechecker FAMECHECKER_GIOVANNI, 1 - msgbox Text_175E99 - release - end - -SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED - lock - faceplayer - famechecker FAMECHECKER_GIOVANNI, 2 - msgbox Text_176ACB - release - end - + .include "data/scripts/fame_checker.inc" .include "data/text/fame_checker.inc" CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 @@ -8495,7 +4776,7 @@ EventScript_1BB315:: @ 81BB315 goto_if eq, EventScript_1BB40A applymovement VAR_0x8007, Movement_1BB88F waitmovement 0 - applymovement 255, Movement_1BB891 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88B waitmovement 0 @@ -8519,7 +4800,7 @@ EventScript_1BB367:: @ 81BB367 textcolor 1 compare VAR_0x8007, 0 goto_if eq, EventScript_1BB40A - applymovement 255, Movement_1BB8A0 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88F waitmovement 0 @@ -8543,7 +4824,7 @@ EventScript_1BB3B4:: @ 81BB3B4 textcolor 1 compare VAR_0x8007, 0 goto_if eq, EventScript_1BB40A - applymovement 255, Movement_1BB8A0 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88F waitmovement 0 @@ -8556,25 +4837,25 @@ EventScript_1BB3E6:: @ 81BB3E6 playse SE_PIN message Text_1BC943 waitmessage - applymovement 255, Movement_1BB891 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88B waitmovement 0 return EventScript_1BB40A:: @ 81BB40A - applymovement 255, Movement_1BB891 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 waitmovement 0 return EventScript_1BB415:: @ 81BB415 lockall textcolor 1 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 msgbox gUnknown_81BD898 closemessage - applymovement 255, Movement_1BB447 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB447 waitmovement 0 delay 30 msgbox gUnknown_81BD966 @@ -8706,11 +4987,11 @@ EventScript_1BB5B3:: @ 81BB5B3 applymovement VAR_LAST_TALKED, Movement_1BB88F waitmovement 0 closemessage - applymovement 255, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C waitmovement 0 hideobject 255, MAP_UNKNOWN_MAP_00_00 closedoor 9, 1 @@ -8725,7 +5006,7 @@ EventScript_1BB5B3:: @ 81BB5B3 end EventScript_1BB621:: @ 81BB621 - applymovement 255, Movement_1BB894 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB894 waitmovement 0 return @@ -8822,11 +5103,11 @@ EventScript_1BB73D:: @ 81BB73D applymovement VAR_LAST_TALKED, Movement_1BB88F waitmovement 0 closemessage - applymovement 255, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C waitmovement 0 hideobject 255, MAP_UNKNOWN_MAP_00_00 closedoor 9, 1 @@ -9227,11 +5508,11 @@ EventScript_1BBA94:: @ 81BBA94 delay 60 applymovement VAR_LAST_TALKED, Movement_1BB88F waitmovement 0 - applymovement 255, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 waitmovement 0 opendoor 5, 1 waitdooranim - applymovement 255, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C waitmovement 0 hideobject 255, MAP_UNKNOWN_MAP_00_00 closedoor 5, 1 @@ -9560,11 +5841,11 @@ EventScript_1BBF88:: @ 81BBF88 applymovement VAR_LAST_TALKED, Movement_1BB88F waitmovement 0 closemessage - applymovement 255, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C waitmovement 0 hideobject 255, MAP_UNKNOWN_MAP_00_00 closedoor 9, 1 @@ -9787,7 +6068,7 @@ EventScript_1BC262:: @ 81BC262 applymovement VAR_LAST_TALKED, Movement_1BB88F waitmovement 0 closemessage - applymovement 255, Movement_1BB8A2 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A2 waitmovement 0 hideobject 255, MAP_UNKNOWN_MAP_00_00 release @@ -10052,7 +6333,7 @@ Text_1BCCBE:: @ 81BCCBE .string "あ‥‥\n" .string "おきゃくさま！$" -Text_1BCCCA:: @ 81BCCCA +Text_PlayerIsPlayingRightNowGoForIt:: @ 81BCCCA .string "It appears as if {STR_VAR_1} is playing\n" .string "right now.\l" .string "Go for it!$" @@ -10294,1439 +6575,14 @@ gUnknown_81BDEDF:: @ 81BDEDF .string "I hope you enjoy the Wireless\n" .string "Communication System.$" -EventScript_InteractWithCutTreeObject:: @ 81BDF13 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lockall - checkflag FLAG_BADGE02_GET - goto_if FALSE, EventScript_1BDF87 - checkpartymove MOVE_CUT - compare VAR_RESULT, 6 - goto_if eq, EventScript_1BDF87 - setfieldeffectarg 0, VAR_RESULT - getpartymonname 0, VAR_RESULT - getmovename 1, MOVE_CUT - msgbox gUnknown_81BDF94, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BDF91 - msgbox gUnknown_81BDFD7 - closemessage - dofieldeffect FLDEFF_USE_CUT_ON_TREE - waitstate - goto EventScript_1BDF76 - end - -gUnknown_81BDF6B:: @ 81BDF6B - lockall - dofieldeffect FLDEFF_USE_CUT_ON_TREE - waitstate - goto EventScript_1BDF76 - end - -EventScript_1BDF76:: @ 81BDF76 - applymovement VAR_LAST_TALKED, Movement_1BDF85 - waitmovement 0 - removeobject VAR_LAST_TALKED - releaseall - end - -Movement_1BDF85:: @ 81BDF85 - step_69 - step_end - -EventScript_1BDF87:: @ 81BDF87 - msgbox gUnknown_81BDFE3, 3 - releaseall - end - -EventScript_1BDF91:: @ 81BDF91 - closemessage - releaseall - end - -gUnknown_81BDF94:: @ 81BDF94 - .string "This tree looks like it can be CUT\n" - .string "down!\p" - .string "Would you like to CUT it?$" - -gUnknown_81BDFD7:: @ 81BDFD7 - .string "{STR_VAR_1} used {STR_VAR_2}!$" - -gUnknown_81BDFE3:: @ 81BDFE3 - .string "This tree looks like it can be CUT\n" - .string "down!$" - -EventScript_InteractWithRockSmashRockObject:: @ 81BE00C - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lockall - checkflag FLAG_BADGE06_GET - goto_if FALSE, EventScript_1BE091 - checkpartymove MOVE_ROCK_SMASH - compare VAR_RESULT, 6 - goto_if eq, EventScript_1BE091 - setfieldeffectarg 0, VAR_RESULT - getpartymonname 0, VAR_RESULT - getmovename 1, MOVE_ROCK_SMASH - msgbox Text_1BE09D, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE09A - msgbox gUnknown_81BDFD7 - closemessage - dofieldeffect FLDEFF_USE_ROCK_SMASH - waitstate - goto EventScript_1BE06F - end - -EventScript_FldEffRockSmash:: @ 81BE064 - lockall - dofieldeffect FLDEFF_USE_ROCK_SMASH - waitstate - goto EventScript_1BE06F - end - -EventScript_1BE06F:: @ 81BE06F - applymovement VAR_LAST_TALKED, Movement_1BE08F - waitmovement 0 - removeobject VAR_LAST_TALKED - special ScrSpecial_RockSmashWildEncounter - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE08D - waitstate - releaseall - end - -EventScript_1BE08D:: @ 81BE08D - releaseall - end - -Movement_1BE08F:: @ 81BE08F - step_68 - step_end - -EventScript_1BE091:: @ 81BE091 - msgbox gUnknown_81BE0E2, 3 - end - -EventScript_1BE09A:: @ 81BE09A - closemessage - releaseall - end - -Text_1BE09D:: @ 81BE09D - .string "This rock appears to be breakable.\n" - .string "Would you like to use ROCK SMASH?$" - -gUnknown_81BE0E2:: @ 81BE0E2 - .string "It's a rugged rock, but a POKéMON\n" - .string "may be able to smash it.$" - -EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lockall - checkflag FLAG_BADGE04_GET - goto_if FALSE, EventScript_1BE185 - checkflag FLAG_SYS_STRENGTH_ACTIVE - goto_if TRUE, EventScript_1BE18E - checkpartymove MOVE_STRENGTH - compare VAR_RESULT, 6 - goto_if eq, EventScript_1BE185 - setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE19A, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE197 - closemessage - dofieldeffect FLDEFF_USE_STRENGTH - waitstate - goto EventScript_1BE179 - end - -EventScript_FldEffStrength:: @ 81BE16E - lockall - dofieldeffect FLDEFF_USE_STRENGTH - waitstate - goto EventScript_1BE179 - end - -EventScript_1BE179:: @ 81BE179 - setflag FLAG_SYS_STRENGTH_ACTIVE - msgbox gUnknown_81BE1FA, 3 - end - -EventScript_1BE185:: @ 81BE185 - msgbox gUnknown_81BE244, 3 - end - -EventScript_1BE18E:: @ 81BE18E - msgbox gUnknown_81BE284, 3 - end - -EventScript_1BE197:: @ 81BE197 - closemessage - releaseall - end - -gUnknown_81BE19A:: @ 81BE19A - .string "It's a big boulder, but a POKéMON\n" - .string "may be able to push it aside.\p" - .string "Would you like to use STRENGTH?$" - -gUnknown_81BE1FA:: @ 81BE1FA - .string "{STR_VAR_1} used STRENGTH!\p" - .string "{STR_VAR_1}'s STRENGTH made it\n" - .string "possible to move boulders around!$" - -gUnknown_81BE244:: @ 81BE244 - .string "It's a big boulder, but a POKéMON\n" - .string "may be able to push it aside.$" - -gUnknown_81BE284:: @ 81BE284 - .string "STRENGTH made it possible to move\n" - .string "boulders around.$" - -gUnknown_81BE2B7:: @ 81BE2B7 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lockall - checkpartymove MOVE_WATERFALL - compare VAR_RESULT, 6 - goto_if eq, EventScript_1BE300 - getpartymonname 0, VAR_RESULT - setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE33F, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE308 - msgbox gUnknown_81BE378 - dofieldeffect FLDEFF_USE_WATERFALL - goto EventScript_1BE308 - -EventScript_81BE2FF:: @ 81BE2FF - lockall -EventScript_1BE300: - msgbox gUnknown_81BE30A -EventScript_1BE308: - releaseall - end - -gUnknown_81BE30A:: @ 81BE30A - .string "A wall of water is crashing down\n" - .string "with a mighty roar.$" - -gUnknown_81BE33F:: @ 81BE33F - .string "It's a large waterfall.\n" - .string "Would you like to use WATERFALL?$" - -gUnknown_81BE378:: @ 81BE378 - .string "{STR_VAR_1} used WATERFALL.$" - -@ Unused leftover from R/S -EventScript_1BE38B:: @ 81BE38B - lockall - checkpartymove MOVE_DIVE - compare VAR_RESULT, 6 - goto_if eq, EventScript_1BE3CA - getpartymonname 0, VAR_RESULT - setfieldeffectarg 0, VAR_RESULT - setfieldeffectarg 1, 1 - msgbox gUnknown_81BE469, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE3D2 - msgbox gUnknown_81BE49B - dofieldeffect FLDEFF_USE_DIVE - goto EventScript_1BE3D2 - -EventScript_1BE3C9:: @ 81BE3C9 - lockall -EventScript_1BE3CA: - msgbox Text_1BE42B -EventScript_1BE3D2: - releaseall - end - -EventScript_1BE3D4:: @ 81BE3D4 - lockall - checkpartymove MOVE_DIVE - compare VAR_RESULT, 6 - goto_if eq, EventScript_1BE412 - getpartymonname 0, VAR_RESULT - setfieldeffectarg 0, VAR_RESULT - setfieldeffectarg 1, 1 - msgbox gUnknown_81BE4EF, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE429 - msgbox gUnknown_81BE49B - dofieldeffect FLDEFF_USE_DIVE - goto EventScript_1BE429 - -EventScript_1BE412:: @ 81BE412 - lockall - msgbox gUnknown_81BE4A9 - goto EventScript_1BE429 - -EventScript_1BE420:: @ 81BE420 - lockall - msgbox gUnknown_81BE52F -EventScript_1BE429: - releaseall - end - -Text_1BE42B:: @ 81BE42B - .string "The sea is deep here. A POKéMON\n" - .string "may be able to go underwater.$" - -gUnknown_81BE469:: @ 81BE469 - .string "The sea is deep here.\n" - .string "Would you like to use DIVE?$" - -gUnknown_81BE49B:: @ 81BE49B - .string "{STR_VAR_1} used DIVE.$" - -gUnknown_81BE4A9:: @ 81BE4A9 - .string "Light is filtering down from above.\n" - .string "A POKéMON may be able to surface.$" - -gUnknown_81BE4EF:: @ 81BE4EF - .string "Light is filtering down from above.\n" - .string "Would you like to use DIVE?$" - -gUnknown_81BE52F:: @ 81BE52F - .string "There is an obstacle above.\n" - .string "DIVE can't be used here.$" - -EventScript_FailSweetScent:: @ 81BE564 - msgbox Text_1BE56D, 3 - end - -Text_1BE56D:: @ 81BE56D - .string "Looks like there's nothing here…$" - -Route2_EventScript_1BE58E:: @ 81BE58E - giveitem ITEM_ETHER, 1, 1 - end - -Route2_EventScript_1BE59B:: @ 81BE59B - giveitem ITEM_PARALYZE_HEAL, 1, 1 - end - -ViridianForest_EventScript_1BE5A8:: @ 81BE5A8 - giveitem ITEM_POKE_BALL, 1, 1 - end - -ViridianForest_EventScript_1BE5B5:: @ 81BE5B5 - giveitem ITEM_ANTIDOTE, 1, 1 - end - -ViridianForest_EventScript_1BE5C2:: @ 81BE5C2 - giveitem ITEM_POTION, 1, 1 - end - -MtMoon_1F_EventScript_1BE5CF:: @ 81BE5CF - giveitem ITEM_PARALYZE_HEAL, 1, 1 - end - -MtMoon_1F_EventScript_1BE5DC:: @ 81BE5DC - giveitem ITEM_TM09, 1, 1 - end - -MtMoon_1F_EventScript_1BE5E9:: @ 81BE5E9 - giveitem ITEM_POTION, 1, 1 - end - -MtMoon_1F_EventScript_1BE5F6:: @ 81BE5F6 - giveitem ITEM_RARE_CANDY, 1, 1 - end - -MtMoon_1F_EventScript_1BE603:: @ 81BE603 - giveitem ITEM_ESCAPE_ROPE, 1, 1 - end - -MtMoon_1F_EventScript_1BE610:: @ 81BE610 - giveitem ITEM_MOON_STONE, 1, 1 - end - -MtMoon_B2F_EventScript_1BE61D:: @ 81BE61D - giveitem ITEM_STAR_PIECE, 1, 1 - end - -MtMoon_B2F_EventScript_1BE62A:: @ 81BE62A - giveitem ITEM_TM46, 1, 1 - end - -Route4_EventScript_1BE637:: @ 81BE637 - giveitem ITEM_TM05, 1, 1 - end - -Route24_EventScript_1BE644:: @ 81BE644 - giveitem ITEM_TM45, 1, 1 - end - -Route25_EventScript_1BE651:: @ 81BE651 - giveitem ITEM_TM43, 1, 1 - end - -SSAnne_1F_Room2_EventScript_1BE65E:: @ 81BE65E - giveitem ITEM_TM31, 1, 1 - end - -SSAnne_2F_Room2_EventScript_1BE66B:: @ 81BE66B - giveitem ITEM_STARDUST, 1, 1 - end - -SSAnne_2F_Room4_EventScript_1BE678:: @ 81BE678 - giveitem ITEM_X_ATTACK, 1, 1 - end - -SSAnne_B1F_Room2_EventScript_1BE685:: @ 81BE685 - giveitem ITEM_TM44, 1, 1 - end - -SSAnne_B1F_Room3_EventScript_1BE692:: @ 81BE692 - giveitem ITEM_ETHER, 1, 1 - end - -SSAnne_B1F_Room5_EventScript_1BE69F:: @ 81BE69F - giveitem ITEM_SUPER_POTION, 1, 1 - end - -SSAnne_Kitchen_EventScript_1BE6AC:: @ 81BE6AC - giveitem ITEM_GREAT_BALL, 1, 1 - end - -Route9_EventScript_1BE6B9:: @ 81BE6B9 - giveitem ITEM_TM40, 1, 1 - end - -RocketHideout_B1F_EventScript_1BE6C6:: @ 81BE6C6 - giveitem ITEM_ESCAPE_ROPE, 1, 1 - end - -RocketHideout_B1F_EventScript_1BE6D3:: @ 81BE6D3 - giveitem ITEM_HYPER_POTION, 1, 1 - end - -RocketHideout_B2F_EventScript_1BE6E0:: @ 81BE6E0 - giveitem ITEM_X_SPEED, 1, 1 - end - -RocketHideout_B2F_EventScript_1BE6ED:: @ 81BE6ED - giveitem ITEM_MOON_STONE, 1, 1 - end - -RocketHideout_B2F_EventScript_1BE6FA:: @ 81BE6FA - giveitem ITEM_TM12, 1, 1 - end - -RocketHideout_B2F_EventScript_1BE707:: @ 81BE707 - giveitem ITEM_SUPER_POTION, 1, 1 - end - -RocketHideout_B3F_EventScript_1BE714:: @ 81BE714 - giveitem ITEM_RARE_CANDY, 1, 1 - end - -RocketHideout_B3F_EventScript_1BE721:: @ 81BE721 - giveitem ITEM_TM21, 1, 1 - end - -RocketHideout_B4F_EventScript_1BE72E:: @ 81BE72E - giveitem ITEM_TM49, 1, 1 - end - -RocketHideout_B4F_EventScript_1BE73B:: @ 81BE73B - giveitem ITEM_MAX_ETHER, 1, 1 - end - -RocketHideout_B4F_EventScript_1BE748:: @ 81BE748 - giveitem ITEM_CALCIUM, 1, 1 - end - -PokemonTower_3F_EventScript_1BE755:: @ 81BE755 - giveitem ITEM_ESCAPE_ROPE, 1, 1 - end - -PokemonTower_4F_EventScript_1BE762:: @ 81BE762 - giveitem ITEM_ELIXIR, 1, 1 - end - -PokemonTower_4F_EventScript_1BE76F:: @ 81BE76F - giveitem ITEM_AWAKENING, 1, 1 - end - -PokemonTower_4F_EventScript_1BE77C:: @ 81BE77C - giveitem ITEM_GREAT_BALL, 1, 1 - end - -PokemonTower_5F_EventScript_1BE789:: @ 81BE789 - giveitem ITEM_NUGGET, 1, 1 - end - -PokemonTower_6F_EventScript_1BE796:: @ 81BE796 - giveitem ITEM_RARE_CANDY, 1, 1 - end - -PokemonTower_6F_EventScript_1BE7A3:: @ 81BE7A3 - giveitem ITEM_X_ACCURACY, 1, 1 - end - -Route12_EventScript_1BE7B0:: @ 81BE7B0 - giveitem ITEM_TM48, 1, 1 - end - -Route12_EventScript_1BE7BD:: @ 81BE7BD - giveitem ITEM_IRON, 1, 1 - end - -Route15_EventScript_1BE7CA:: @ 81BE7CA - giveitem ITEM_TM18, 1, 1 - end - -SafariZone_Center_EventScript_1BE7D7:: @ 81BE7D7 - giveitem ITEM_NUGGET, 1, 1 - end - -SafariZone_East_EventScript_1BE7E4:: @ 81BE7E4 - giveitem ITEM_MAX_POTION, 1, 1 - end - -SafariZone_East_EventScript_1BE7F1:: @ 81BE7F1 - giveitem ITEM_FULL_RESTORE, 1, 1 - end - -SafariZone_East_EventScript_1BE7FE:: @ 81BE7FE - giveitem ITEM_TM11, 1, 1 - end - -SafariZone_East_EventScript_1BE80B:: @ 81BE80B - giveitem ITEM_LEAF_STONE, 1, 1 - end - -SafariZone_North_EventScript_1BE818:: @ 81BE818 - giveitem ITEM_PROTEIN, 1, 1 - end - -SafariZone_North_EventScript_1BE825:: @ 81BE825 - giveitem ITEM_TM47, 1, 1 - end - -SafariZone_West_EventScript_1BE832:: @ 81BE832 - giveitem ITEM_TM32, 1, 1 - end - -SafariZone_West_EventScript_1BE83F:: @ 81BE83F - giveitem ITEM_GOLD_TEETH, 1, 1 - end - -SafariZone_West_EventScript_1BE84C:: @ 81BE84C - giveitem ITEM_MAX_POTION, 1, 1 - end - -SafariZone_West_EventScript_1BE859:: @ 81BE859 - giveitem ITEM_MAX_REVIVE, 1, 1 - end - -SilphCo_3F_EventScript_1BE866:: @ 81BE866 - giveitem ITEM_HYPER_POTION, 1, 1 - end - -SilphCo_4F_EventScript_1BE873:: @ 81BE873 - giveitem ITEM_MAX_REVIVE, 1, 1 - end - -SilphCo_4F_EventScript_1BE880:: @ 81BE880 - giveitem ITEM_ESCAPE_ROPE, 1, 1 - end - -SilphCo_4F_EventScript_1BE88D:: @ 81BE88D - giveitem ITEM_FULL_HEAL, 1, 1 - end - -SilphCo_5F_EventScript_1BE89A:: @ 81BE89A - giveitem ITEM_PROTEIN, 1, 1 - end - -SilphCo_5F_EventScript_1BE8A7:: @ 81BE8A7 - giveitem ITEM_TM01, 1, 1 - end - -SilphCo_5F_EventScript_1BE8B4:: @ 81BE8B4 - giveitem ITEM_CARD_KEY, 1, 1 - end - -SilphCo_6F_EventScript_1BE8C1:: @ 81BE8C1 - giveitem ITEM_HP_UP, 1, 1 - end - -SilphCo_6F_EventScript_1BE8CE:: @ 81BE8CE - giveitem ITEM_X_SPECIAL, 1, 1 - end - -SilphCo_7F_EventScript_1BE8DB:: @ 81BE8DB - giveitem ITEM_CALCIUM, 1, 1 - end - -SilphCo_7F_EventScript_1BE8E8:: @ 81BE8E8 - giveitem ITEM_TM08, 1, 1 - end - -SilphCo_10F_EventScript_1BE8F5:: @ 81BE8F5 - giveitem ITEM_CARBOS, 1, 1 - end - -SilphCo_10F_EventScript_1BE902:: @ 81BE902 - giveitem ITEM_ULTRA_BALL, 1, 1 - end - -SilphCo_10F_EventScript_1BE90F:: @ 81BE90F - giveitem ITEM_RARE_CANDY, 1, 1 - end - -PowerPlant_EventScript_1BE91C:: @ 81BE91C - giveitem ITEM_MAX_POTION, 1, 1 - end - -PowerPlant_EventScript_1BE929:: @ 81BE929 - giveitem ITEM_TM17, 1, 1 - end - -PowerPlant_EventScript_1BE936:: @ 81BE936 - giveitem ITEM_TM25, 1, 1 - end - -PowerPlant_EventScript_1BE943:: @ 81BE943 - giveitem ITEM_THUNDER_STONE, 1, 1 - end - -PowerPlant_EventScript_1BE950:: @ 81BE950 - giveitem ITEM_ELIXIR, 1, 1 - end - -PokemonMansion_1F_EventScript_1BE95D:: @ 81BE95D - giveitem ITEM_CARBOS, 1, 1 - end - -PokemonMansion_1F_EventScript_1BE96A:: @ 81BE96A - giveitem ITEM_ESCAPE_ROPE, 1, 1 - end - -PokemonMansion_2F_EventScript_1BE977:: @ 81BE977 - giveitem ITEM_CALCIUM, 1, 1 - end - -PokemonMansion_3F_EventScript_1BE984:: @ 81BE984 - giveitem ITEM_MAX_POTION, 1, 1 - end - -PokemonMansion_3F_EventScript_1BE991:: @ 81BE991 - giveitem ITEM_IRON, 1, 1 - end - -PokemonMansion_B1F_EventScript_1BE99E:: @ 81BE99E - giveitem ITEM_TM14, 1, 1 - end - -PokemonMansion_B1F_EventScript_1BE9AB:: @ 81BE9AB - giveitem ITEM_FULL_RESTORE, 1, 1 - end - -PokemonMansion_B1F_EventScript_1BE9B8:: @ 81BE9B8 - giveitem ITEM_TM22, 1, 1 - end - -PokemonMansion_B1F_EventScript_1BE9C5:: @ 81BE9C5 - giveitem ITEM_SECRET_KEY, 1, 1 - end - -VictoryRoad_1F_EventScript_1BE9D2:: @ 81BE9D2 - giveitem ITEM_RARE_CANDY, 1, 1 - end - -VictoryRoad_1F_EventScript_1BE9DF:: @ 81BE9DF - giveitem ITEM_TM02, 1, 1 - end - -VictoryRoad_2F_EventScript_1BE9EC:: @ 81BE9EC - giveitem ITEM_GUARD_SPEC, 1, 1 - end - -VictoryRoad_2F_EventScript_1BE9F9:: @ 81BE9F9 - giveitem ITEM_TM07, 1, 1 - end - -VictoryRoad_2F_EventScript_1BEA06:: @ 81BEA06 - giveitem ITEM_FULL_HEAL, 1, 1 - end - -VictoryRoad_2F_EventScript_1BEA13:: @ 81BEA13 - giveitem ITEM_TM37, 1, 1 - end - -VictoryRoad_3F_EventScript_1BEA20:: @ 81BEA20 - giveitem ITEM_MAX_REVIVE, 1, 1 - end - -VictoryRoad_3F_EventScript_1BEA2D:: @ 81BEA2D - giveitem ITEM_TM50, 1, 1 - end - -CeruleanCave_1F_EventScript_1BEA3A:: @ 81BEA3A - giveitem ITEM_MAX_ELIXIR, 1, 1 - end - -CeruleanCave_1F_EventScript_1BEA47:: @ 81BEA47 - giveitem ITEM_NUGGET, 1, 1 - end - -CeruleanCave_1F_EventScript_1BEA54:: @ 81BEA54 - giveitem ITEM_FULL_RESTORE, 1, 1 - end - -CeruleanCave_2F_EventScript_1BEA61:: @ 81BEA61 - giveitem ITEM_FULL_RESTORE, 1, 1 - end - -CeruleanCave_2F_EventScript_1BEA6E:: @ 81BEA6E - giveitem ITEM_PP_UP, 1, 1 - end - -CeruleanCave_2F_EventScript_1BEA7B:: @ 81BEA7B - giveitem ITEM_ULTRA_BALL, 1, 1 - end - -CeruleanCave_B1F_EventScript_1BEA88:: @ 81BEA88 - giveitem ITEM_MAX_REVIVE, 1, 1 - end - -CeruleanCave_B1F_EventScript_1BEA95:: @ 81BEA95 - giveitem ITEM_ULTRA_BALL, 1, 1 - end - -FuchsiaCity_Building1_EventScript_1BEAA2:: @ 81BEAA2 - giveitem ITEM_RARE_CANDY, 1, 1 - end - -TwoIsland_EventScript_1BEAAF:: @ 81BEAAF - giveitem ITEM_REVIVE, 1, 1 - end - -ThreeIsland_EventScript_1BEABC:: @ 81BEABC - giveitem ITEM_ZINC, 1, 1 - end - -ViridianForest_EventScript_1BEAC9:: @ 81BEAC9 - giveitem ITEM_POTION, 1, 1 - end - -MtMoon_B2F_EventScript_1BEAD6:: @ 81BEAD6 - giveitem ITEM_REVIVE, 1, 1 - end - -MtMoon_B2F_EventScript_1BEAE3:: @ 81BEAE3 - giveitem ITEM_ANTIDOTE, 1, 1 - end - -Route11_EventScript_1BEAF0:: @ 81BEAF0 - giveitem ITEM_X_DEFEND, 1, 1 - end - -Route9_EventScript_1BEAFD:: @ 81BEAFD - giveitem ITEM_BURN_HEAL, 1, 1 - end - -RockTunnel_1F_EventScript_1BEB0A:: @ 81BEB0A - giveitem ITEM_REPEL, 1, 1 - end - -RockTunnel_1F_EventScript_1BEB17:: @ 81BEB17 - giveitem ITEM_PEARL, 1, 1 - end - -RockTunnel_1F_EventScript_1BEB24:: @ 81BEB24 - giveitem ITEM_ESCAPE_ROPE, 1, 1 - end - -RockTunnel_B1F_EventScript_1BEB31:: @ 81BEB31 - giveitem ITEM_REVIVE, 1, 1 - end - -RockTunnel_B1F_EventScript_1BEB3E:: @ 81BEB3E - giveitem ITEM_MAX_ETHER, 1, 1 - end - -SilphCo_8F_EventScript_1BEB4B:: @ 81BEB4B - giveitem ITEM_IRON, 1, 1 - end - -SilphCo_11F_EventScript_1BEB58:: @ 81BEB58 - giveitem ITEM_ZINC, 1, 1 - end - -PokemonMansion_1F_EventScript_1BEB65:: @ 81BEB65 - giveitem ITEM_PROTEIN, 1, 1 - end - -PokemonMansion_2F_EventScript_1BEB72:: @ 81BEB72 - giveitem ITEM_ZINC, 1, 1 - end - -PokemonMansion_2F_EventScript_1BEB7F:: @ 81BEB7F - giveitem ITEM_HP_UP, 1, 1 - end - -ViridianCity_EventScript_1BEB8C:: @ 81BEB8C - giveitem ITEM_POTION, 1, 1 - end - -Route11_EventScript_1BEB99:: @ 81BEB99 - giveitem ITEM_GREAT_BALL, 1, 1 - end - -Route11_EventScript_1BEBA6:: @ 81BEBA6 - giveitem ITEM_AWAKENING, 1, 1 - end - -PokemonTower_5F_EventScript_1BEBB3:: @ 81BEBB3 - giveitem ITEM_CLEANSE_TAG, 1, 1 - end - -CeladonCity_EventScript_1BEBC0:: @ 81BEBC0 - giveitem ITEM_ETHER, 1, 1 - end - -RocketHideout_B3F_EventScript_1BEBCD:: @ 81BEBCD - giveitem ITEM_BLACK_GLASSES, 1, 1 - end - -SafariZone_North_EventScript_1BEBDA:: @ 81BEBDA - giveitem ITEM_QUICK_CLAW, 1, 1 - end - -SeafoamIslands_1F_EventScript_1BEBE7:: @ 81BEBE7 - giveitem ITEM_ICE_HEAL, 1, 1 - end - -SeafoamIslands_B1F_EventScript_1BEBF4:: @ 81BEBF4 - giveitem ITEM_WATER_STONE, 1, 1 - end - -SeafoamIslands_B1F_EventScript_1BEC01:: @ 81BEC01 - giveitem ITEM_REVIVE, 1, 1 - end - -SeafoamIslands_B2F_EventScript_1BEC0E:: @ 81BEC0E - giveitem ITEM_BIG_PEARL, 1, 1 - end - -SeafoamIslands_B4F_EventScript_1BEC1B:: @ 81BEC1B - giveitem ITEM_ULTRA_BALL, 1, 1 - end - -FourIsland_EventScript_1BEC28:: @ 81BEC28 - giveitem ITEM_STAR_PIECE, 1, 1 - end - -FourIsland_EventScript_1BEC35:: @ 81BEC35 - giveitem ITEM_STARDUST, 1, 1 - end - -OneIsland_KindleRoad_EventScript_1BEC42:: @ 81BEC42 - giveitem ITEM_ETHER, 1, 1 - end - -OneIsland_KindleRoad_EventScript_1BEC4F:: @ 81BEC4F - giveitem ITEM_MAX_REPEL, 1, 1 - end - -OneIsland_KindleRoad_EventScript_1BEC5C:: @ 81BEC5C - giveitem ITEM_CARBOS, 1, 1 - end - -FiveIsland_Meadow_EventScript_1BEC69:: @ 81BEC69 - giveitem ITEM_MAX_POTION, 1, 1 - end - -FiveIsland_Meadow_EventScript_1BEC76:: @ 81BEC76 - giveitem ITEM_PP_UP, 1, 1 - end - -FiveIsland_MemorialPillar_EventScript_1BEC83:: @ 81BEC83 - giveitem ITEM_METAL_COAT, 1, 1 - end - -SixIsland_OutcastIsland_EventScript_1BEC90:: @ 81BEC90 - giveitem ITEM_PP_UP, 1, 1 - end - -SixIsland_WaterPath_EventScript_1BEC9D:: @ 81BEC9D - giveitem ITEM_ELIXIR, 1, 1 - end - -SixIsland_WaterPath_EventScript_1BECAA:: @ 81BECAA - giveitem ITEM_DRAGON_SCALE, 1, 1 - end - -SixIsland_RuinValley_EventScript_1BECB7:: @ 81BECB7 - giveitem ITEM_FULL_RESTORE, 1, 1 - end - -SixIsland_RuinValley_EventScript_1BECC4:: @ 81BECC4 - giveitem ITEM_HP_UP, 1, 1 - end - -SixIsland_RuinValley_EventScript_1BECD1:: @ 81BECD1 - giveitem ITEM_SUN_STONE, 1, 1 - end - -SevenIsland_SevaultCanyon_EventScript_1BECDE:: @ 81BECDE - giveitem ITEM_KINGS_ROCK, 1, 1 - end - -SevenIsland_SevaultCanyon_EventScript_1BECEB:: @ 81BECEB - giveitem ITEM_MAX_ELIXIR, 1, 1 - end - -SevenIsland_SevaultCanyon_EventScript_1BECF8:: @ 81BECF8 - giveitem ITEM_NUGGET, 1, 1 - end - -ThreeIsland_BerryForest_EventScript_1BED05:: @ 81BED05 - giveitem ITEM_MAX_ETHER, 1, 1 - end - -ThreeIsland_BerryForest_EventScript_1BED12:: @ 81BED12 - giveitem ITEM_FULL_HEAL, 1, 1 - end - -ThreeIsland_BerryForest_EventScript_1BED1F:: @ 81BED1F - giveitem ITEM_MAX_ELIXIR, 1, 1 - end - -MtEmber_Exterior_EventScript_1BED2C:: @ 81BED2C - giveitem ITEM_ULTRA_BALL, 1, 1 - end - -MtEmber_Exterior_EventScript_1BED39:: @ 81BED39 - giveitem ITEM_FIRE_STONE, 1, 1 - end - -MtEmber_Exterior_EventScript_1BED46:: @ 81BED46 - giveitem ITEM_DIRE_HIT, 1, 1 - end - -FourIsland_IcefallCave_1F_EventScript_1BED53:: @ 81BED53 - giveitem ITEM_ULTRA_BALL, 1, 1 - end - -FourIsland_IcefallCave_1F_EventScript_1BED60:: @ 81BED60 - giveitem ITEM_HM07, 1, 1 - end - -FourIsland_IcefallCave_B1F_EventScript_1BED6D:: @ 81BED6D - giveitem ITEM_FULL_RESTORE, 1, 1 - end - -FourIsland_IcefallCave_B1F_EventScript_1BED7A:: @ 81BED7A - giveitem ITEM_NEVER_MELT_ICE, 1, 1 - end - -FiveIsland_RocketWarehouse_EventScript_1BED87:: @ 81BED87 - giveitem ITEM_BIG_PEARL, 1, 1 - end - -FiveIsland_RocketWarehouse_EventScript_1BED94:: @ 81BED94 - giveitem ITEM_TM36, 1, 1 - end - -FiveIsland_RocketWarehouse_EventScript_1BEDA1:: @ 81BEDA1 - giveitem ITEM_PEARL, 1, 1 - end - -FiveIsland_RocketWarehouse_EventScript_1BEDAE:: @ 81BEDAE - giveitem ITEM_UP_GRADE, 1, 1 - end - -FiveIsland_LostCave_Room10_EventScript_1BEDBB:: @ 81BEDBB - giveitem ITEM_SILK_SCARF, 1, 1 - end - -FiveIsland_LostCave_Room11_EventScript_1BEDC8:: @ 81BEDC8 - giveitem ITEM_LAX_INCENSE, 1, 1 - end - -FiveIsland_LostCave_Room12_EventScript_1BEDD5:: @ 81BEDD5 - giveitem ITEM_SEA_INCENSE, 1, 1 - end - -FiveIsland_LostCave_Room13_EventScript_1BEDE2:: @ 81BEDE2 - giveitem ITEM_MAX_REVIVE, 1, 1 - end - -FiveIsland_LostCave_Room14_EventScript_1BEDEF:: @ 81BEDEF - giveitem ITEM_RARE_CANDY, 1, 1 - end - -SevenIsland_SevaultCanyon_House_EventScript_1BEDFC:: @ 81BEDFC - giveitem ITEM_LUCKY_PUNCH, 1, 1 - end - -SilphCo_4F_EventScript_1BEE09:: @ 81BEE09 - giveitem ITEM_TM41, 1, 1 - end - -PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 - lock - faceplayer - compare VAR_0x4001, 1 - goto_if eq, EventScript_1BEE3A - checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE - goto_if TRUE, EventScript_1BEECD - msgbox Text_1BEF88 - goto EventScript_1BEE44 - end - -EventScript_1BEE3A:: @ 81BEE3A - msgbox gUnknown_81BF36A - release - end - -EventScript_1BEE44:: @ 81BEE44 - message Text_1BF017 - waitmessage - multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE - switch VAR_RESULT - case 0, EventScript_1BEE8F - case 1, EventScript_1BEEC3 - case 2, EventScript_1BEE81 - case SCR_MENU_CANCEL, EventScript_1BEEC3 - end - -EventScript_1BEE81:: @ 81BEE81 - msgbox gUnknown_81BF053 - goto EventScript_1BEE44 - end - -EventScript_1BEE8F:: @ 81BEE8F - msgbox gUnknown_81BF166 - closemessage - goto EventScript_1BEF5A - end - -EventScript_1BEE9E:: @ 81BEE9E - msgbox gUnknown_81BF1B2 - release - end - -EventScript_1BEEA8:: @ 81BEEA8 - setvar VAR_0x4001, 1 - setvar VAR_0x8004, 0 - special Special_BufferEasyChatMessage - waitmessage - delay 80 - msgbox gUnknown_81BF28E - release - end - -EventScript_1BEEC3:: @ 81BEEC3 - msgbox gUnknown_81BF17B - release - end - -EventScript_1BEECD:: @ 81BEECD - msgbox gUnknown_81BF1E8 - goto EventScript_1BEEDB - end - -EventScript_1BEEDB:: @ 81BEEDB - message Text_1BF1FB - waitmessage - multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE - switch VAR_RESULT - case 0, EventScript_1BEF26 - case 1, EventScript_1BEF35 - case 2, EventScript_1BEF18 - case SCR_MENU_CANCEL, EventScript_1BEF35 - end - -EventScript_1BEF18:: @ 81BEF18 - msgbox gUnknown_81BF053 - goto EventScript_1BEEDB - end - -EventScript_1BEF26:: @ 81BEF26 - msgbox gUnknown_81BF222 - closemessage - goto EventScript_1BEF5A - end - -EventScript_1BEF35:: @ 81BEF35 - msgbox gUnknown_81BF252 - release - end - -EventScript_1BEF3F:: @ 81BEF3F - setvar VAR_0x4001, 1 - setvar VAR_0x8004, 0 - special Special_BufferEasyChatMessage - waitmessage - delay 80 - msgbox gUnknown_81BF30D - release - end - -EventScript_1BEF5A:: @ 81BEF5A - setvar VAR_0x8004, 0 - call EventScript_1A6AC0 - lock - faceplayer - compare VAR_0x8004, 0 - goto_if eq, EventScript_1BEF3F - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BEE9E - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BEEA8 - end - -Text_1BEF88:: @ 81BEF88 - .string "Hi, glad to meet you!\p" - .string "…That's unfriendly of you.\n" - .string "How about saying hi back?\p" - .string "So, come on, tell me about\n" - .string "yourself.\p" - .string "I'd love to hear your profile!$" - -Text_1BF017:: @ 81BF017 - .string "Tell me something good about\n" - .string "yourself. What's your profile?$" - -gUnknown_81BF053:: @ 81BF053 - .string "A profile is written using four\n" - .string "words or phrases.\p" - .string "There're plenty of words to choose\n" - .string "from for your profile.\p" - .string "The words and phrases are placed\n" - .string "in several convenient groups.\p" - .string "First, choose a group, then choose\n" - .string "a word or phrase.\p" - .string "…It's easier than it sounds.\n" - .string "Why don't you try it?$" - -gUnknown_81BF166:: @ 81BF166 - .string "What's your profile?$" - -gUnknown_81BF17B:: @ 81BF17B - .string "Aww… Don't be like that.\n" - .string "You can tell me your profile.$" - -gUnknown_81BF1B2:: @ 81BF1B2 - .string "Oh, you've decided not to?\n" - .string "You're fickle, aren't you?$" - -gUnknown_81BF1E8:: @ 81BF1E8 - .string "Hi!\n" - .string "We meet again!$" - -Text_1BF1FB:: @ 81BF1FB - .string "Would you like to change your\n" - .string "profile?$" - -gUnknown_81BF222:: @ 81BF222 - .string "What are you like now?\n" - .string "I'd really like to know.$" - -gUnknown_81BF252:: @ 81BF252 - .string "Okay, you like your profile the\n" - .string "way it is.\p" - .string "I think so, too.$" - -gUnknown_81BF28E:: @ 81BF28E - .string "Hmhm…\p" - .string "Your profile really says something\n" - .string "about who you are.\p" - .string "Now that I know you better, it \n" - .string "makes us better friends than ever!$" - -gUnknown_81BF30D:: @ 81BF30D - .string "Oh, I've heard that before…\p" - .string "My cousin, who lives far away,\n" - .string "always used to say that, I think.$" - -gUnknown_81BF36A:: @ 81BF36A - .string "Please tell me more about\n" - .string "yourself next time!$" - -Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lock - faceplayer - showmoneybox 0, 0, 0 - specialvar VAR_RESULT, IsThereMonInRoute5Daycare - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF46E - msgbox Text_19DD66, 5 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF3DD - msgbox Text_19DDB2 - goto EventScript_1BF541 - end - -EventScript_1BF3DD:: @ 81BF3DD - specialvar VAR_RESULT, CountPartyNonEggMons - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF452 - msgbox Text_19DDBE - fadescreen 1 - hidemoneybox 0, 0 - special ChooseSendDaycareMon - waitstate - showmoneybox 0, 0, 0 - compare VAR_0x8004, 6 - goto_if ge, EventScript_1BF444 - specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BF460 - specialvar VAR_0x8005, GetSelectedMonNickAndSpecies - msgbox Text_19DDF9 - waitse - playmoncry VAR_0x8005, 0 - msgbox Text_19DE24 - waitmoncry - special PutMonInRoute5Daycare - incrementgamestat GAME_STAT_USED_DAYCARE - goto EventScript_1BF541 - end - -EventScript_1BF444:: @ 81BF444 - msgbox Text_19DDDC - goto EventScript_1BF541 - end - -EventScript_1BF452:: @ 81BF452 - msgbox Text_19DEF5 - goto EventScript_1BF541 - end - -EventScript_1BF460:: @ 81BF460 - msgbox Text_19DF1D - goto EventScript_1BF541 - end - -EventScript_1BF46E:: @ 81BF46E - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon - compare VAR_RESULT, 0 - call_if ne, EventScript_1BF4AA - compare VAR_RESULT, 0 - call_if eq, EventScript_1BF4B3 - special GetCostToWithdrawRoute5DaycareMon - msgbox Text_19DE80, 5 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF4BC - goto EventScript_1BF444 - end - -EventScript_1BF4AA:: @ 81BF4AA - msgbox Text_19DF56 - return - -EventScript_1BF4B3:: @ 81BF4B3 - msgbox Text_19DE3C - return - -EventScript_1BF4BC:: @ 81BF4BC - specialvar VAR_RESULT, CalculatePlayerPartyCount - compare VAR_RESULT, 6 - goto_if eq, EventScript_1BF533 - specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF4EA - msgbox Text_19E001 - goto EventScript_1BF541 - end - -EventScript_1BF4EA:: @ 81BF4EA - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, TakePokemonFromRoute5Daycare - special SubtractMoneyFromVar0x8005 - updatemoneybox 0, 0, 0 - copyvar VAR_0x8008, VAR_RESULT - countpokemon - subvar VAR_RESULT, 1 - getpartymonname 0, VAR_RESULT - copyvar VAR_RESULT, VAR_0x8008 - msgbox Text_19DEAF - textcolor 3 - waitse - playmoncry VAR_RESULT, 0 - msgbox Text_19DECF - call EventScript_1A6675 - waitmoncry - goto EventScript_1BF541 - end - -EventScript_1BF533:: @ 81BF533 - msgbox Text_19DFC2 - goto EventScript_1BF541 - end - -EventScript_1BF541:: @ 81BF541 - hidemoneybox 0, 0 - release - end - -EventScript_81BF546:: @ 81BF546 - lockall - msgbox Text_1BFB5A - special EggHatch - waitstate - releaseall - end - -gUnknown_81BF555:: @ 81BF555 - .string "I'm the DAY-CARE MAN.\p" - .string "I help take care of the precious\n" - .string "POKéMON of TRAINERS.\p" - .string "If you'd like me to raise your\n" - .string "POKéMON, have a word with my wife.$" - -gUnknown_81BF5E3:: @ 81BF5E3 - .string "Ah, it's you!\p" - .string "We were raising your POKéMON, and\n" - .string "my goodness, were we surprised!\p" - .string "Your POKéMON had an EGG!\p" - .string "We don't know how it got there,\n" - .string "but your POKéMON had it.\p" - .string "You do want it, yes?$" - -gUnknown_81BF69A:: @ 81BF69A - .string "Ah, it's you! Good to see you.\n" - .string "Your {STR_VAR_1}'s doing fine.$" - -gUnknown_81BF6CF:: @ 81BF6CF - .string "Well then, I'll keep it.\n" - .string "Thanks!$" - -gUnknown_81BF6F0:: @ 81BF6F0 - .string "You have no room for it…\n" - .string "Come back when you've made room.$" - -Text_1BF72A:: @ 81BF72A - .string "{PLAYER} received the EGG from\n" - .string "the DAY-CARE MAN.$" - -gUnknown_81BF755:: @ 81BF755 - .string "Take good care of it.$" - -Text_1BF76B:: @ 81BF76B - .string "ポケモンを　ひきとりたい　ときは\n" - .string "ばさんに　いって　おくれ$" - -gUnknown_81BF789:: @ 81BF789 - .string "Ah, it's you! Your {STR_VAR_1} and\n" - .string "{STR_VAR_2} are doing fine.$" - -gUnknown_81BF7B6:: @ 81BF7B6 - .string "I really will keep it.\n" - .string "You do want this, yes?$" - -gUnknown_81BF7E4:: @ 81BF7E4 - .string "I'm the DAY-CARE LADY.\p" - .string "We can raise POKéMON for you.\p" - .string "Would you like us to raise one?$" - -gUnknown_81BF839:: @ 81BF839 - .string "Which POKéMON should we raise for\n" - .string "you?$" - -gUnknown_81BF860:: @ 81BF860 - .string "Fine, we'll raise your {STR_VAR_1}\n" - .string "for a while.\p" - .string "Come back for it later.$" - -gUnknown_81BF89F:: @ 81BF89F - .string "We can raise two of your POKéMON.\p" - .string "Would you like us to raise one\n" - .string "more POKéMON for you?$" - -gUnknown_81BF8F6:: @ 81BF8F6 - .string "My husband was looking for you.$" - -gUnknown_81BF916:: @ 81BF916 - .string "Oh, fine, then.\n" - .string "Come again.$" - -gUnknown_81BF932:: @ 81BF932 - .string "You don't have enough money…$" - -gUnknown_81BF94F:: @ 81BF94F - .string "Will you take back the other one,\n" - .string "too?$" - -gUnknown_81BF976:: @ 81BF976 - .string "Fine.\n" - .string "Come again.$" - -gUnknown_81BF988:: @ 81BF988 - .string "Ah, it's you!\n" - .string "Good to see you.\p" - .string "Your POKéMON can only be doing\n" - .string "good!$" - -gUnknown_81BF9CC:: @ 81BF9CC - .string "By level, your {STR_VAR_1} has\n" - .string "grown by {STR_VAR_2}.$" - -gUnknown_81BF9EF:: @ 81BF9EF - .string "Your POKéMON party is full.\n" - .string "Make room, then come see me.$" - -Text_1BFA28:: @ 81BFA28 - .string "どっちの　ポケモンを　ひきとるかい？$" - -gUnknown_81BFA3B:: @ 81BFA3B - .string "If you want your {STR_VAR_1} back,\n" - .string "it will cost ¥{STR_VAR_2}.$" - -gUnknown_81BFA67:: @ 81BFA67 - .string "Perfect!\n" - .string "Here's your POKéMON.$" - -gUnknown_81BFA85:: @ 81BFA85 - .string "{PLAYER} took back {STR_VAR_1} from\n" - .string "the DAY-CARE LADY.$" - -gUnknown_81BFAAD:: @ 81BFAAD - .string "Oh? But you have just one\n" - .string "POKéMON.\p" - .string "Come back another time.$" - -gUnknown_81BFAE8:: @ 81BFAE8 - .string "Will you take your POKéMON back?$" - -gUnknown_81BFB09:: @ 81BFB09 - .string "If you leave me that POKéMON,\n" - .string "what will you battle with?\p" - .string "Come back another time.$" - -Text_1BFB5A:: @ 81BFB5A - .string "Huh?$" - -EventScript_81BFB5F:: @ 81BFB5F - animateflash 0 - setflashradius 0 - end - -EventScript_RepelWoreOff:: @ 81BFB65 - msgbox Text_1BFB6E, 3 - end - -Text_1BFB6E:: @ 81BFB6E - .string "REPEL's effect wore off…$" + .include "data/scripts/field_moves.inc" + .include "data/scripts/item_ball_scripts.inc" + .include "data/scripts/mystery_event_club.inc" + .include "data/scripts/day_care.inc" + .include "data/scripts/flash.inc" + .include "data/scripts/repel.inc" + +@@ Block below consists of at least safari_zone.inc and flavor_text.inc. JP text making it hard to define boundaries EventScript_SafariWarpOut:: @ 81BFB87 setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3 @@ -12360,37 +7216,7 @@ gUnknown_81C1300:: @ 81C1300 .string "There's a POKéMON on TV!\n" .string "It looks like it's having fun.$" -EventScript_1C1338:: @ 81C1338 - map_script_2 VAR_0x4030, 0, EventScript_1C1348 - .2byte 0 - copyvar VAR_0x4030, 1 - end - -EventScript_1C1348:: @ 81C1348 - lockall - delay 20 - applymovement 255, Movement_1C137A - waitmovement 0 - playse SE_RU_HYUU - delay 60 - warphole 0xFFFF - waitstate - end - -EventScript_1C1361:: @ 81C1361 - lockall - delay 20 - applymovement 255, Movement_1C137A - waitmovement 0 - playse SE_RU_HYUU - delay 60 - special DoFallWarp - waitstate - end - -Movement_1C137A:: @ 81C137A - step_60 - step_end + .include "data/scripts/hole.inc" gUnknown_81C137C:: @ 81C137C .string "The battery isn't charged enough.\p" @@ -13399,604 +8225,7 @@ Text_1C476A:: @ 81C476A .string "Today, in addition to our lesson,\n" .string "we came to see the chamber again.$" -VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE - lock - faceplayer - checkflag FLAG_TUTOR_DOUBLE_EDGE - goto_if TRUE, EventScript_1C480C - msgbox Text_1749F9, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4802 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4802 - msgbox Text_174AE2 - setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4802 - setflag FLAG_TUTOR_DOUBLE_EDGE - goto EventScript_1C480C - end - -EventScript_1C4802:: @ 81C4802 - msgbox Text_174ABC - release - end - -EventScript_1C480C:: @ 81C480C - msgbox Text_174B0C - release - end - -EventScript_1C4816:: @ 81C4816 - lock - faceplayer - checkflag FLAG_TUTOR_THUNDER_WAVE - goto_if TRUE, EventScript_1C4874 - msgbox Text_175711, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C486A - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C486A - msgbox Text_1757C1 - setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C486A - setflag FLAG_TUTOR_THUNDER_WAVE - goto EventScript_1C4874 - end - -EventScript_1C486A:: @ 81C486A - msgbox Text_17579D - release - end - -EventScript_1C4874:: @ 81C4874 - msgbox Text_1757EC - release - end - -RockTunnel_B1F_EventScript_1C487E:: @ 81C487E - lock - faceplayer - checkflag FLAG_TUTOR_ROCK_SLIDE - goto_if TRUE, EventScript_1C48DC - msgbox Text_1799E0, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C48D2 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C48D2 - msgbox Text_179AE1 - setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C48D2 - setflag FLAG_TUTOR_ROCK_SLIDE - goto EventScript_1C48DC - end - -EventScript_1C48D2:: @ 81C48D2 - msgbox Text_179AC0 - release - end - -EventScript_1C48DC:: @ 81C48DC - msgbox Text_179B0A - release - end - -MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 - lock - faceplayer - checkflag FLAG_TUTOR_EXPLOSION - goto_if TRUE, EventScript_1C4944 - msgbox Text_17A642, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C493A - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C493A - msgbox Text_17A717 - setvar VAR_0x8005, MOVETUTOR_EXPLOSION - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C493A - setflag FLAG_TUTOR_EXPLOSION - goto EventScript_1C4944 - end - -EventScript_1C493A:: @ 81C493A - msgbox Text_17A6ED - release - end - -EventScript_1C4944:: @ 81C4944 - msgbox Text_17A756 - release - end - -Route4_EventScript_1C494E:: @ 81C494E - lock - faceplayer - checkflag FLAG_TUTOR_META_PUNCH - goto_if TRUE, EventScript_1C49AC - msgbox Text_1839D5, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C49A2 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C49A2 - msgbox Text_183ABF - setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C49A2 - setflag FLAG_TUTOR_META_PUNCH - goto EventScript_1C49AC - end - -EventScript_1C49A2:: @ 81C49A2 - msgbox Text_183A83 - release - end - -EventScript_1C49AC:: @ 81C49AC - msgbox Text_183AE2 - release - end - -Route4_EventScript_1C49B6:: @ 81C49B6 - lock - faceplayer - checkflag FLAG_TUTOR_MEGA_KICK - goto_if TRUE, EventScript_1C4A14 - msgbox Text_183B74, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A0A - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A0A - msgbox Text_183C68 - setvar VAR_0x8005, MOVETUTOR_MEGA_KICK - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A0A - setflag FLAG_TUTOR_MEGA_KICK - goto EventScript_1C4A14 - end - -EventScript_1C4A0A:: @ 81C4A0A - msgbox Text_183C25 - release - end - -EventScript_1C4A14:: @ 81C4A14 - msgbox Text_183C94 - release - end - -EventScript_1C4A1E:: @ 81C4A1E - lock - faceplayer - checkflag FLAG_TUTOR_DREAM_EATER - goto_if TRUE, EventScript_1C4A7C - msgbox Text_17E316, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A72 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A72 - msgbox Text_17E3F1 - setvar VAR_0x8005, MOVETUTOR_DREAM_EATER - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A72 - setflag FLAG_TUTOR_DREAM_EATER - goto EventScript_1C4A7C - end - -EventScript_1C4A72:: @ 81C4A72 - msgbox Text_17E3E9 - release - end - -EventScript_1C4A7C:: @ 81C4A7C - msgbox Text_17E41B - release - end - -EventScript_1C4A86:: @ 81C4A86 - lock - faceplayer - checkflag FLAG_TUTOR_SOFT_BOILED - goto_if TRUE, EventScript_1C4AE4 - msgbox Text_180388, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4ADA - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4ADA - msgbox Text_180484 - setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4ADA - setflag FLAG_TUTOR_SOFT_BOILED - goto EventScript_1C4AE4 - end - -EventScript_1C4ADA:: @ 81C4ADA - msgbox Text_18043F - release - end - -EventScript_1C4AE4:: @ 81C4AE4 - msgbox Text_1804C4 - release - end - -FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE - lock - faceplayer - checkflag FLAG_TUTOR_SUBSTITUTE - goto_if TRUE, EventScript_1C4B4C - msgbox Text_180948, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4B42 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4B42 - msgbox Text_180A57 - setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4B42 - setflag FLAG_TUTOR_SUBSTITUTE - goto EventScript_1C4B4C - end - -EventScript_1C4B42:: @ 81C4B42 - msgbox Text_180A32 - release - end - -EventScript_1C4B4C:: @ 81C4B4C - msgbox Text_180A80 - release - end - -SevenIsland_EventScript_1C4B56:: @ 81C4B56 - lock - faceplayer - checkflag FLAG_TUTOR_SWORDS_DANCE - goto_if TRUE, EventScript_1C4BB4 - msgbox Text_182F01, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4BAA - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4BAA - msgbox Text_182FD9 - setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4BAA - setflag FLAG_TUTOR_SWORDS_DANCE - goto EventScript_1C4BB4 - end - -EventScript_1C4BAA:: @ 81C4BAA - msgbox Text_182FC1 - release - end - -EventScript_1C4BB4:: @ 81C4BB4 - msgbox Text_18300D - release - end - -PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE - lock - faceplayer - checkflag FLAG_TUTOR_SEISMIC_TOSS - goto_if TRUE, EventScript_1C4C1C - msgbox Text_1909A3, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C12 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C12 - msgbox Text_190AD5 - setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C12 - setflag FLAG_TUTOR_SEISMIC_TOSS - goto EventScript_1C4C1C - end - -EventScript_1C4C12:: @ 81C4C12 - msgbox Text_190AA9 - release - end - -EventScript_1C4C1C:: @ 81C4C1C - msgbox Text_190B00 - release - end - -EventScript_1C4C26:: @ 81C4C26 - lock - faceplayer - checkflag FLAG_TUTOR_COUNTER - goto_if TRUE, EventScript_1C4C84 - msgbox Text_195928, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C7A - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C7A - msgbox Text_195A08 - setvar VAR_0x8005, MOVETUTOR_COUNTER - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C7A - setflag FLAG_TUTOR_COUNTER - goto EventScript_1C4C84 - end - -EventScript_1C4C7A:: @ 81C4C7A - msgbox Text_1959CC - release - end - -EventScript_1C4C84:: @ 81C4C84 - msgbox Text_195A31 - release - end - -EventScript_1C4C8E:: @ 81C4C8E - lock - faceplayer - checkflag FLAG_TUTOR_METRONOME - goto_if TRUE, EventScript_1C4CEC - msgbox Text_19A137, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4CE2 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4CE2 - msgbox Text_19A1EA - setvar VAR_0x8005, MOVETUTOR_METRONOME - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4CE2 - setflag FLAG_TUTOR_METRONOME - goto EventScript_1C4CEC - end - -EventScript_1C4CE2:: @ 81C4CE2 - msgbox Text_19A1CB - release - end - -EventScript_1C4CEC:: @ 81C4CEC - msgbox Text_19A20E - release - end - -EventScript_1C4CF6:: @ 81C4CF6 - checkflag FLAG_TUTOR_MIMIC - goto_if TRUE, EventScript_1C4D59 - msgbox Text_19AD85, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4D4F - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4D4F - msgbox Text_19ADEE - setvar VAR_0x8005, MOVETUTOR_MIMIC - call EventScript_1C4F30 - lock - faceplayer - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4D4F - removeitem ITEM_POKE_DOLL, 1 - setflag FLAG_TUTOR_MIMIC - goto EventScript_1C4D59 - end - -EventScript_1C4D4F:: @ 81C4D4F - msgbox Text_19ADD8 - release - end - -EventScript_1C4D59:: @ 81C4D59 - checkplayergender - compare VAR_RESULT, 0 - call_if eq, EventScript_1C4D72 - compare VAR_RESULT, 1 - call_if eq, EventScript_1C4D7B - release - end - -EventScript_1C4D72:: @ 81C4D72 - msgbox Text_19AE1C - return - -EventScript_1C4D7B:: @ 81C4D7B - msgbox Text_19AE90 - return - -FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 - lock - faceplayer - checkflag FLAG_TUTOR_BODY_SLAM - goto_if TRUE, EventScript_1C4DE2 - msgbox Text_1A3505, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4DD8 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4DD8 - msgbox Text_1A35DA - setvar VAR_0x8005, MOVETUTOR_BODY_SLAM - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4DD8 - setflag FLAG_TUTOR_BODY_SLAM - goto EventScript_1C4DE2 - end - -EventScript_1C4DD8:: @ 81C4DD8 - msgbox Text_1A35C7 - release - end - -EventScript_1C4DE2:: @ 81C4DE2 - msgbox Text_1A3609 - release - end - -TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - checkflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK - goto_if TRUE, EventScript_1C4EA1 - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_1C4E97 - getfirstpartymonname 0 - msgbox Text_1A46C6 - specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4F26 - copyvar VAR_0x8009, VAR_0x8005 - compare VAR_FACING, 2 - call_if eq, EventScript_1C4EF0 - compare VAR_FACING, 1 - call_if eq, EventScript_1C4EFB - compare VAR_FACING, 4 - call_if eq, EventScript_1C4F06 - compare VAR_FACING, 3 - call_if eq, EventScript_1C4F11 - msgbox Text_1A4751, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4F1C - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4F1C - msgbox Text_1A4814 - closemessage - fadescreen 1 - goto EventScript_1C4EDA - -EventScript_1C4E8F:: @ 81C4E8F - fadescreen 0 - goto EventScript_1C4EAB - end - -EventScript_1C4E97:: @ 81C4E97 - msgbox Text_1A48B3 - release - end - -EventScript_1C4EA1:: @ 81C4EA1 - msgbox Text_1A4972 - release - end - -EventScript_1C4EAB:: @ 81C4EAB - copyvar VAR_0x8005, VAR_0x8009 - specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor - compare VAR_RESULT, 1 - goto_if eq, EventScript_1C4ECD - msgbox Text_1A4865 - setflag FLAG_TEMP_2 - release - end - -EventScript_1C4ECD:: @ 81C4ECD - msgbox Text_1A48F3 - setflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK - release - end - -EventScript_1C4EDA:: @ 81C4EDA - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4F1C - goto EventScript_1C4EAB - end - -EventScript_1C4EF0:: @ 81C4EF0 - applymovement 1, Movement_1C4F4C - waitmovement 0 - return - -EventScript_1C4EFB:: @ 81C4EFB - applymovement 1, Movement_1C4F4E - waitmovement 0 - return - -EventScript_1C4F06:: @ 81C4F06 - applymovement 1, Movement_1C4F50 - waitmovement 0 - return - -EventScript_1C4F11:: @ 81C4F11 - applymovement 1, Movement_1C4F52 - waitmovement 0 - return - -EventScript_1C4F1C:: @ 81C4F1C - msgbox Text_1A47E5 - release - end - -EventScript_1C4F26:: @ 81C4F26 - msgbox Text_1A4737 - release - end - -EventScript_1C4F30:: @ 81C4F30 - special ChooseMonForMoveTutor - waitstate - lock - faceplayer - return - -EventScript_1C4F37:: @ 81C4F37 - textcolor 3 - special sub_80699BC - signmsg - msgbox Text_1A644F, 5 - normalmsg - call EventScript_1A6675 - return - -Movement_1C4F4C:: @ 81C4F4C - step_52 - step_end - -Movement_1C4F4E:: @ 81C4F4E - step_53 - step_end - -Movement_1C4F50:: @ 81C4F50 - step_54 - step_end - -Movement_1C4F52:: @ 81C4F52 - step_55 - step_end + .include "data/scripts/move_tutors.inc" SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54 SevenIsland_TrainerTower_2F_MapScript1_1C4F54:: @ 81C4F54 @@ -14317,7 +8546,7 @@ EventScript_1C5410: msgbox Text_17CB09 textcolor 3 playfanfare MUS_FANFA1 - message Text_1A51F6 + message Text_ObtainedTheX waitfanfare waitmessage getstdstring 2, 24 @@ -14327,7 +8556,7 @@ EventScript_1C5410: EventScript_1C543A:: @ 81C543A msgbox Text_17CB09 - msgbox gUnknown_81A5207 + msgbox Text_BagIsFull goto EventScript_1C544F EventScript_1C544F:: @ 81C544F @@ -14414,7 +8643,7 @@ EventScript_1C5528:: @ 81C5528 playse SE_PINPON msgbox Text_17CC73 closemessage - applymovement 255, Movement_1C5544 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1C5544 waitmovement 0 releaseall end diff --git a/data/map_events.s b/data/map_events.s index 99b85e154..a18b8b4aa 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,9 +1,9 @@ @#include "constants/bg_event_constants.h" @#include "constants/event_object_movement_constants.h" -@#include "constants/event_objects.h" +#include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" -@#include "constants/map_scripts.h" +#include "constants/map_scripts.h" #include "constants/layouts.h" #include "constants/maps.h" @#include "constants/secret_bases.h" diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 10aedd1da..1d7318ac7 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index ae2c8cad5..cad1e3f47 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -164,7 +164,7 @@ EventScript_16B055:: @ 816B055 end EventScript_16B0BF:: @ 816B0BF - msgbox gUnknown_81A5207 + msgbox Text_BagIsFull special sub_815F114 release end diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index c3bbbbe70..01d9dfd82 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38 CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 824f0268c..9891c0a94 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -197,7 +197,7 @@ Movement_1670DE:: @ 81670DE Movement_1670E2:: @ 81670E2 step_11 step_1a - step_60 + set_invisible step_end EventScript_1670E6:: @ 81670E6 @@ -269,7 +269,7 @@ Movement_16719D:: @ 816719D step_10 step_13 step_1a - step_60 + set_invisible step_end Movement_1671A4:: @ 81671A4 @@ -301,7 +301,7 @@ Movement_1671AF:: @ 81671AF Movement_1671B6:: @ 81671B6 step_13 step_1a - step_60 + set_invisible step_end Movement_1671BA:: @ 81671BA @@ -313,7 +313,7 @@ Movement_1671BA:: @ 81671BA step_1a step_13 step_1a - step_60 + set_invisible step_end Movement_1671C4:: @ 81671C4 @@ -321,7 +321,7 @@ Movement_1671C4:: @ 81671C4 step_1a step_13 step_1a - step_60 + set_invisible step_end CinnabarIsland_EventScript_1671CA:: @ 81671CA diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index b935d812e..dbe7a3d3e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end @@ -85,7 +85,7 @@ Movement_16E9AF:: @ 816E9AF step_10 step_10 step_1b - step_60 + set_invisible step_end Movement_16E9B9:: @ 816E9B9 @@ -111,7 +111,7 @@ Movement_16E9C3:: @ 816E9C3 step_10 step_10 step_1b - step_60 + set_invisible step_end Movement_16E9CF:: @ 816E9CF @@ -128,7 +128,7 @@ Movement_16E9CF:: @ 816E9CF step_1b step_10 step_1b - step_60 + set_invisible step_end Movement_16E9DE:: @ 816E9DE diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index 48311f359..8336c5fcb 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index b4ccfd848..bca5ec39d 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -36,7 +36,7 @@ EventScript_168808:: @ 8168808 Movement_168841:: @ 8168841 step_11 - step_60 + set_invisible step_end FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 92bda55bf..1a51b5b8c 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -29,5 +29,5 @@ EventScript_163D65:: @ 8163D65 end Movement_163D7F:: @ 8163D7F - step_60 + set_invisible step_end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 9f06f57ff..656354413 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 3b82f3521..57def4833 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -171,7 +171,7 @@ Movement_171B71:: @ 8171B71 step_1c step_01 step_up - step_60 + set_invisible step_1c step_1c step_1c diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index b33de6d5e..a5ebbfb56 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 37fcdd37d..7b467aa83 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -71,6 +71,6 @@ Items_16EAF4:: @ 816EAF4 IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index e43fee459..df6eb0e89 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 1c207941d..171e91428 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -53,7 +53,7 @@ Movement_1674F4:: @ 81674F4 Movement_167501:: @ 8167501 step_11 step_11 - step_60 + set_invisible step_end Movement_167505:: @ 8167505 @@ -77,7 +77,7 @@ Movement_167507:: @ 8167507 Movement_167514:: @ 8167514 step_11 - step_60 + set_invisible step_end OneIsland_EventScript_167517:: @ 8167517 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 514ed9ee7..25dcbcbe5 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -186,7 +186,7 @@ Movement_170E91:: @ 8170E91 OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 7f268aafe..9d2562263 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -320,7 +320,7 @@ Movement_165719:: @ 8165719 Movement_16572E:: @ 816572E step_11 - step_60 + set_invisible step_end Movement_165731:: @ 8165731 @@ -369,7 +369,7 @@ Movement_165744:: @ 8165744 Movement_165758:: @ 8165758 step_13 step_11 - step_60 + set_invisible step_end PalletTown_EventScript_16575C:: @ 816575C diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index e4d214e67..d8e30aff3 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 4dfdf4e94..47ec9cc6c 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -190,7 +190,7 @@ Movement_162D12:: @ 8162D12 step_11 step_11 step_1b - step_60 + set_invisible step_end Movement_162D1F:: @ 8162D1F @@ -230,7 +230,7 @@ Movement_162D37:: @ 8162D37 step_11 step_11 step_1b - step_60 + set_invisible step_end Movement_162D41:: @ 8162D41 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 54906ebbe..7b8f1f95e 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -13,7 +13,7 @@ Route1_EventScript_167EFE:: @ 8167EFE goto_if eq, EventScript_1A6BF9 getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 - message Text_1A51F6 + message Text_ObtainedTheX waitmessage waitfanfare additem ITEM_POTION, 1 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 854604f58..7e04196d3 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -11,7 +11,7 @@ Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 4ee1acf22..333edbb05 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -142,7 +142,7 @@ EventScript_16F8AC:: @ 816F8AC Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index c9dda1809..6be25699b 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 7d5a3d311..53155e776 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index e09c67109..1baeb89c2 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -102,7 +102,7 @@ EventScript_16495C:: @ 816495C SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index dd4bd695c..910608d45 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -66,7 +66,7 @@ Movement_171E02:: @ 8171E02 SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 35c7abeb3..96cfb8b74 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index 1742e15e2..fb1ccc7b4 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index bcfe4ad6e..9e2b4f752 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 574ef9c1f..6c24a177b 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc new file mode 100644 index 000000000..3576b40e8 --- /dev/null +++ b/data/scripts/day_care.inc @@ -0,0 +1,257 @@ +Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lock + faceplayer + showmoneybox 0, 0, 0 + specialvar VAR_RESULT, IsThereMonInRoute5Daycare + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BF46E + msgbox Text_19DD66, 5 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BF3DD + msgbox Text_19DDB2 + goto EventScript_1BF541 + end + +EventScript_1BF3DD:: @ 81BF3DD + specialvar VAR_RESULT, CountPartyNonEggMons + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BF452 + msgbox Text_19DDBE + fadescreen 1 + hidemoneybox 0, 0 + special ChooseSendDaycareMon + waitstate + showmoneybox 0, 0, 0 + compare VAR_0x8004, 6 + goto_if ge, EventScript_1BF444 + specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BF460 + specialvar VAR_0x8005, GetSelectedMonNickAndSpecies + msgbox Text_19DDF9 + waitse + playmoncry VAR_0x8005, 0 + msgbox Text_19DE24 + waitmoncry + special PutMonInRoute5Daycare + incrementgamestat GAME_STAT_USED_DAYCARE + goto EventScript_1BF541 + end + +EventScript_1BF444:: @ 81BF444 + msgbox Text_19DDDC + goto EventScript_1BF541 + end + +EventScript_1BF452:: @ 81BF452 + msgbox Text_19DEF5 + goto EventScript_1BF541 + end + +EventScript_1BF460:: @ 81BF460 + msgbox Text_19DF1D + goto EventScript_1BF541 + end + +EventScript_1BF46E:: @ 81BF46E + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon + compare VAR_RESULT, 0 + call_if ne, EventScript_1BF4AA + compare VAR_RESULT, 0 + call_if eq, EventScript_1BF4B3 + special GetCostToWithdrawRoute5DaycareMon + msgbox Text_19DE80, 5 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BF4BC + goto EventScript_1BF444 + end + +EventScript_1BF4AA:: @ 81BF4AA + msgbox Text_19DF56 + return + +EventScript_1BF4B3:: @ 81BF4B3 + msgbox Text_19DE3C + return + +EventScript_1BF4BC:: @ 81BF4BC + specialvar VAR_RESULT, CalculatePlayerPartyCount + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_1BF533 + specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BF4EA + msgbox Text_19E001 + goto EventScript_1BF541 + end + +EventScript_1BF4EA:: @ 81BF4EA + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, TakePokemonFromRoute5Daycare + special SubtractMoneyFromVar0x8005 + updatemoneybox 0, 0, 0 + copyvar VAR_0x8008, VAR_RESULT + countpokemon + subvar VAR_RESULT, 1 + getpartymonname 0, VAR_RESULT + copyvar VAR_RESULT, VAR_0x8008 + msgbox Text_19DEAF + textcolor 3 + waitse + playmoncry VAR_RESULT, 0 + msgbox Text_19DECF + call EventScript_1A6675 + waitmoncry + goto EventScript_1BF541 + end + +EventScript_1BF533:: @ 81BF533 + msgbox Text_19DFC2 + goto EventScript_1BF541 + end + +EventScript_1BF541:: @ 81BF541 + hidemoneybox 0, 0 + release + end + +EventScript_81BF546:: @ 81BF546 + lockall + msgbox Text_1BFB5A + special EggHatch + waitstate + releaseall + end + +gUnknown_81BF555:: @ 81BF555 + .string "I'm the DAY-CARE MAN.\p" + .string "I help take care of the precious\n" + .string "POKéMON of TRAINERS.\p" + .string "If you'd like me to raise your\n" + .string "POKéMON, have a word with my wife.$" + +gUnknown_81BF5E3:: @ 81BF5E3 + .string "Ah, it's you!\p" + .string "We were raising your POKéMON, and\n" + .string "my goodness, were we surprised!\p" + .string "Your POKéMON had an EGG!\p" + .string "We don't know how it got there,\n" + .string "but your POKéMON had it.\p" + .string "You do want it, yes?$" + +gUnknown_81BF69A:: @ 81BF69A + .string "Ah, it's you! Good to see you.\n" + .string "Your {STR_VAR_1}'s doing fine.$" + +gUnknown_81BF6CF:: @ 81BF6CF + .string "Well then, I'll keep it.\n" + .string "Thanks!$" + +gUnknown_81BF6F0:: @ 81BF6F0 + .string "You have no room for it…\n" + .string "Come back when you've made room.$" + +Text_1BF72A:: @ 81BF72A + .string "{PLAYER} received the EGG from\n" + .string "the DAY-CARE MAN.$" + +gUnknown_81BF755:: @ 81BF755 + .string "Take good care of it.$" + +Text_1BF76B:: @ 81BF76B + .string "ポケモンを　ひきとりたい　ときは\n" + .string "ばさんに　いって　おくれ$" + +gUnknown_81BF789:: @ 81BF789 + .string "Ah, it's you! Your {STR_VAR_1} and\n" + .string "{STR_VAR_2} are doing fine.$" + +gUnknown_81BF7B6:: @ 81BF7B6 + .string "I really will keep it.\n" + .string "You do want this, yes?$" + +gUnknown_81BF7E4:: @ 81BF7E4 + .string "I'm the DAY-CARE LADY.\p" + .string "We can raise POKéMON for you.\p" + .string "Would you like us to raise one?$" + +gUnknown_81BF839:: @ 81BF839 + .string "Which POKéMON should we raise for\n" + .string "you?$" + +gUnknown_81BF860:: @ 81BF860 + .string "Fine, we'll raise your {STR_VAR_1}\n" + .string "for a while.\p" + .string "Come back for it later.$" + +gUnknown_81BF89F:: @ 81BF89F + .string "We can raise two of your POKéMON.\p" + .string "Would you like us to raise one\n" + .string "more POKéMON for you?$" + +gUnknown_81BF8F6:: @ 81BF8F6 + .string "My husband was looking for you.$" + +gUnknown_81BF916:: @ 81BF916 + .string "Oh, fine, then.\n" + .string "Come again.$" + +gUnknown_81BF932:: @ 81BF932 + .string "You don't have enough money…$" + +gUnknown_81BF94F:: @ 81BF94F + .string "Will you take back the other one,\n" + .string "too?$" + +gUnknown_81BF976:: @ 81BF976 + .string "Fine.\n" + .string "Come again.$" + +gUnknown_81BF988:: @ 81BF988 + .string "Ah, it's you!\n" + .string "Good to see you.\p" + .string "Your POKéMON can only be doing\n" + .string "good!$" + +gUnknown_81BF9CC:: @ 81BF9CC + .string "By level, your {STR_VAR_1} has\n" + .string "grown by {STR_VAR_2}.$" + +gUnknown_81BF9EF:: @ 81BF9EF + .string "Your POKéMON party is full.\n" + .string "Make room, then come see me.$" + +Text_1BFA28:: @ 81BFA28 + .string "どっちの　ポケモンを　ひきとるかい？$" + +gUnknown_81BFA3B:: @ 81BFA3B + .string "If you want your {STR_VAR_1} back,\n" + .string "it will cost ¥{STR_VAR_2}.$" + +gUnknown_81BFA67:: @ 81BFA67 + .string "Perfect!\n" + .string "Here's your POKéMON.$" + +gUnknown_81BFA85:: @ 81BFA85 + .string "{PLAYER} took back {STR_VAR_1} from\n" + .string "the DAY-CARE LADY.$" + +gUnknown_81BFAAD:: @ 81BFAAD + .string "Oh? But you have just one\n" + .string "POKéMON.\p" + .string "Come back another time.$" + +gUnknown_81BFAE8:: @ 81BFAE8 + .string "Will you take your POKéMON back?$" + +gUnknown_81BFB09:: @ 81BFB09 + .string "If you leave me that POKéMON,\n" + .string "what will you battle with?\p" + .string "Come back another time.$" + +Text_1BFB5A:: @ 81BFB5A + .string "Huh?$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc new file mode 100644 index 000000000..88e1fa1f5 --- /dev/null +++ b/data/scripts/fame_checker.inc @@ -0,0 +1,286 @@ +ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65 + lock + faceplayer + famechecker FAMECHECKER_OAK, 3 + famechecker FAMECHECKER_DAISY, 3 + textcolor 3 + msgbox gUnknown_81B1AB9 + release + end + +EventScript_1ACD8D:: @ 81ACD8D + lock + faceplayer + famechecker FAMECHECKER_DAISY, 1 + famechecker FAMECHECKER_OAK, 4 + textcolor 3 + msgbox gUnknown_81B1AB9 + release + end + +EventScript_1ACDB5:: @ 81ACDB5 + lock + faceplayer + famechecker FAMECHECKER_DAISY, 4 + textcolor 3 + msgbox gUnknown_81B1AB9 + release + end + +FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0 + lockall + famechecker FAMECHECKER_DAISY, 5 + textcolor 3 + msgbox gUnknown_81B1B3D + releaseall + end + +Route4_EventScript_1ACDEA:: @ 81ACDEA + lock + faceplayer + famechecker FAMECHECKER_BROCK, 3 + msgbox Text_183D26 + release + end + +MtMoon_1F_EventScript_1ACE03:: @ 81ACE03 + lock + faceplayer + famechecker FAMECHECKER_BROCK, 4 + msgbox Text_172B00 + release + end + +PewterCity_Museum_1F_EventScript_1ACE1C:: @ 81ACE1C + lockall + famechecker FAMECHECKER_BROCK, 5 + textcolor 3 + msgbox gUnknown_81B146A + releaseall + end + +Route20_EventScript_1ACE36:: @ 81ACE36 + lock + faceplayer + famechecker FAMECHECKER_MISTY, 3 + msgbox Text_1882E1 + release + end + +Route25_EventScript_1ACE4F:: @ 81ACE4F + lock + faceplayer + famechecker FAMECHECKER_MISTY, 4 + msgbox Text_189569 + release + end + +CeruleanCity_PokemonCenter_1F_EventScript_1ACE68:: @ 81ACE68 + lock + faceplayer + famechecker FAMECHECKER_MISTY, 5 + textcolor 3 + msgbox gUnknown_81B14E8 + release + end + +VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83 + lockall + famechecker FAMECHECKER_LTSURGE, 5 + textcolor 3 + msgbox gUnknown_81B1558 + releaseall + end + +CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D + lock + faceplayer + famechecker FAMECHECKER_ERIKA, 5 + textcolor 3 + msgbox gUnknown_81B161B + release + end + +FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8 + lock + faceplayer + famechecker FAMECHECKER_KOGA, 4 + textcolor 3 + msgbox gUnknown_81B16A8 + release + end + +SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3 + lock + faceplayer + famechecker FAMECHECKER_KOGA, 5 + msgbox Text_177C47 + release + end + +SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC + lock + faceplayer + famechecker FAMECHECKER_SABRINA, 4 + textcolor 3 + msgbox gUnknown_81B1753 + release + end + +CinnabarIsland_Gym_EventScript_1ACF07:: @ 81ACF07 + lockall + famechecker FAMECHECKER_BLAINE, 4 + famechecker FAMECHECKER_MRFUJI, 4 + msgbox Text_199E8A + releaseall + end + +FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C + lockall + famechecker FAMECHECKER_BLAINE, 5 + textcolor 3 + msgbox gUnknown_81B17E9 + releaseall + end + +FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46 + lock + faceplayer + famechecker FAMECHECKER_LORELEI, 2 + msgbox Text_1A3A60 + release + end + +FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F + lock + faceplayer + famechecker FAMECHECKER_LORELEI, 3 + textcolor 3 + msgbox gUnknown_81B187F + release + end + +SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A + lock + faceplayer + famechecker FAMECHECKER_BRUNO, 2 + textcolor 3 + msgbox gUnknown_81B1913 + release + end + +SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95 + lock + faceplayer + famechecker FAMECHECKER_BRUNO, 5 + msgbox Text_18CF4D + release + end + +IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE + lock + faceplayer + famechecker FAMECHECKER_AGATHA, 1 + famechecker FAMECHECKER_AGATHA, 2 + msgbox Text_19A9E7 + release + end + +SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4 + lock + faceplayer + famechecker FAMECHECKER_AGATHA, 3 + textcolor 3 + msgbox gUnknown_81B19A8 + release + end + +SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF + lock + faceplayer + famechecker FAMECHECKER_AGATHA, 5 + msgbox Text_1A41CA + release + end + +EventScript_1AD008:: @ 81AD008 + lock + faceplayer + famechecker FAMECHECKER_LANCE, 0 + msgbox gFameCheckerFlavorText_Lance0 + release + end + +EventScript_1AD021:: @ 81AD021 + lock + faceplayer + famechecker FAMECHECKER_LANCE, 1 + msgbox Text_181569 + release + end + +SaffronCity_EventScript_1AD03A:: @ 81AD03A + lock + faceplayer + famechecker FAMECHECKER_LANCE, 2 + msgbox Text_181569 + release + end + +CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053 + lock + faceplayer + famechecker FAMECHECKER_LANCE, 3 + msgbox Text_19566B + release + end + +IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C + lock + faceplayer + famechecker FAMECHECKER_LANCE, 4 + textcolor 3 + msgbox gUnknown_81B1A31 + release + end + +IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087 + lock + faceplayer + famechecker FAMECHECKER_LANCE, 5 + msgbox Text_19AB16 + release + end + +LavenderTown_PokemonCenter_1F_EventScript_1AD0A0:: @ 81AD0A0 + lock + faceplayer + famechecker FAMECHECKER_MRFUJI, 3 + msgbox Text_19358E + release + end + +CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9 + lock + faceplayer + famechecker FAMECHECKER_MRFUJI, 5 + textcolor 3 + msgbox gUnknown_81B1BD1 + release + end + +SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4 + lock + faceplayer + famechecker FAMECHECKER_GIOVANNI, 1 + msgbox Text_175E99 + release + end + +SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED + lock + faceplayer + famechecker FAMECHECKER_GIOVANNI, 2 + msgbox Text_176ACB + release + end diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc new file mode 100644 index 000000000..d0729d900 --- /dev/null +++ b/data/scripts/field_moves.inc @@ -0,0 +1,310 @@ +EventScript_InteractWithCutTreeObject:: @ 81BDF13 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lockall + checkflag FLAG_BADGE02_GET + goto_if FALSE, EventScript_1BDF87 + checkpartymove MOVE_CUT + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_1BDF87 + setfieldeffectarg 0, VAR_RESULT + getpartymonname 0, VAR_RESULT + getmovename 1, MOVE_CUT + msgbox gUnknown_81BDF94, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BDF91 + msgbox gUnknown_81BDFD7 + closemessage + dofieldeffect FLDEFF_USE_CUT_ON_TREE + waitstate + goto EventScript_1BDF76 + end + +gUnknown_81BDF6B:: @ 81BDF6B + lockall + dofieldeffect FLDEFF_USE_CUT_ON_TREE + waitstate + goto EventScript_1BDF76 + end + +EventScript_1BDF76:: @ 81BDF76 + applymovement VAR_LAST_TALKED, Movement_1BDF85 + waitmovement 0 + removeobject VAR_LAST_TALKED + releaseall + end + +Movement_1BDF85:: @ 81BDF85 + step_69 + step_end + +EventScript_1BDF87:: @ 81BDF87 + msgbox gUnknown_81BDFE3, 3 + releaseall + end + +EventScript_1BDF91:: @ 81BDF91 + closemessage + releaseall + end + +gUnknown_81BDF94:: @ 81BDF94 + .string "This tree looks like it can be CUT\n" + .string "down!\p" + .string "Would you like to CUT it?$" + +gUnknown_81BDFD7:: @ 81BDFD7 + .string "{STR_VAR_1} used {STR_VAR_2}!$" + +gUnknown_81BDFE3:: @ 81BDFE3 + .string "This tree looks like it can be CUT\n" + .string "down!$" + +EventScript_InteractWithRockSmashRockObject:: @ 81BE00C + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lockall + checkflag FLAG_BADGE06_GET + goto_if FALSE, EventScript_1BE091 + checkpartymove MOVE_ROCK_SMASH + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_1BE091 + setfieldeffectarg 0, VAR_RESULT + getpartymonname 0, VAR_RESULT + getmovename 1, MOVE_ROCK_SMASH + msgbox Text_1BE09D, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BE09A + msgbox gUnknown_81BDFD7 + closemessage + dofieldeffect FLDEFF_USE_ROCK_SMASH + waitstate + goto EventScript_1BE06F + end + +EventScript_FldEffRockSmash:: @ 81BE064 + lockall + dofieldeffect FLDEFF_USE_ROCK_SMASH + waitstate + goto EventScript_1BE06F + end + +EventScript_1BE06F:: @ 81BE06F + applymovement VAR_LAST_TALKED, Movement_1BE08F + waitmovement 0 + removeobject VAR_LAST_TALKED + special ScrSpecial_RockSmashWildEncounter + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BE08D + waitstate + releaseall + end + +EventScript_1BE08D:: @ 81BE08D + releaseall + end + +Movement_1BE08F:: @ 81BE08F + step_68 + step_end + +EventScript_1BE091:: @ 81BE091 + msgbox gUnknown_81BE0E2, 3 + end + +EventScript_1BE09A:: @ 81BE09A + closemessage + releaseall + end + +Text_1BE09D:: @ 81BE09D + .string "This rock appears to be breakable.\n" + .string "Would you like to use ROCK SMASH?$" + +gUnknown_81BE0E2:: @ 81BE0E2 + .string "It's a rugged rock, but a POKéMON\n" + .string "may be able to smash it.$" + +EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lockall + checkflag FLAG_BADGE04_GET + goto_if FALSE, EventScript_1BE185 + checkflag FLAG_SYS_STRENGTH_ACTIVE + goto_if TRUE, EventScript_1BE18E + checkpartymove MOVE_STRENGTH + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_1BE185 + setfieldeffectarg 0, VAR_RESULT + msgbox gUnknown_81BE19A, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BE197 + closemessage + dofieldeffect FLDEFF_USE_STRENGTH + waitstate + goto EventScript_1BE179 + end + +EventScript_FldEffStrength:: @ 81BE16E + lockall + dofieldeffect FLDEFF_USE_STRENGTH + waitstate + goto EventScript_1BE179 + end + +EventScript_1BE179:: @ 81BE179 + setflag FLAG_SYS_STRENGTH_ACTIVE + msgbox gUnknown_81BE1FA, 3 + end + +EventScript_1BE185:: @ 81BE185 + msgbox gUnknown_81BE244, 3 + end + +EventScript_1BE18E:: @ 81BE18E + msgbox gUnknown_81BE284, 3 + end + +EventScript_1BE197:: @ 81BE197 + closemessage + releaseall + end + +gUnknown_81BE19A:: @ 81BE19A + .string "It's a big boulder, but a POKéMON\n" + .string "may be able to push it aside.\p" + .string "Would you like to use STRENGTH?$" + +gUnknown_81BE1FA:: @ 81BE1FA + .string "{STR_VAR_1} used STRENGTH!\p" + .string "{STR_VAR_1}'s STRENGTH made it\n" + .string "possible to move boulders around!$" + +gUnknown_81BE244:: @ 81BE244 + .string "It's a big boulder, but a POKéMON\n" + .string "may be able to push it aside.$" + +gUnknown_81BE284:: @ 81BE284 + .string "STRENGTH made it possible to move\n" + .string "boulders around.$" + +gUnknown_81BE2B7:: @ 81BE2B7 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lockall + checkpartymove MOVE_WATERFALL + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_1BE300 + getpartymonname 0, VAR_RESULT + setfieldeffectarg 0, VAR_RESULT + msgbox gUnknown_81BE33F, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BE308 + msgbox gUnknown_81BE378 + dofieldeffect FLDEFF_USE_WATERFALL + goto EventScript_1BE308 + +EventScript_81BE2FF:: @ 81BE2FF + lockall +EventScript_1BE300: + msgbox gUnknown_81BE30A +EventScript_1BE308: + releaseall + end + +gUnknown_81BE30A:: @ 81BE30A + .string "A wall of water is crashing down\n" + .string "with a mighty roar.$" + +gUnknown_81BE33F:: @ 81BE33F + .string "It's a large waterfall.\n" + .string "Would you like to use WATERFALL?$" + +gUnknown_81BE378:: @ 81BE378 + .string "{STR_VAR_1} used WATERFALL.$" + +@ Unused leftover from R/S +EventScript_1BE38B:: @ 81BE38B + lockall + checkpartymove MOVE_DIVE + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_1BE3CA + getpartymonname 0, VAR_RESULT + setfieldeffectarg 0, VAR_RESULT + setfieldeffectarg 1, 1 + msgbox gUnknown_81BE469, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BE3D2 + msgbox gUnknown_81BE49B + dofieldeffect FLDEFF_USE_DIVE + goto EventScript_1BE3D2 + +EventScript_1BE3C9:: @ 81BE3C9 + lockall +EventScript_1BE3CA: + msgbox Text_1BE42B +EventScript_1BE3D2: + releaseall + end + +EventScript_1BE3D4:: @ 81BE3D4 + lockall + checkpartymove MOVE_DIVE + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_1BE412 + getpartymonname 0, VAR_RESULT + setfieldeffectarg 0, VAR_RESULT + setfieldeffectarg 1, 1 + msgbox gUnknown_81BE4EF, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BE429 + msgbox gUnknown_81BE49B + dofieldeffect FLDEFF_USE_DIVE + goto EventScript_1BE429 + +EventScript_1BE412:: @ 81BE412 + lockall + msgbox gUnknown_81BE4A9 + goto EventScript_1BE429 + +EventScript_1BE420:: @ 81BE420 + lockall + msgbox gUnknown_81BE52F +EventScript_1BE429: + releaseall + end + +Text_1BE42B:: @ 81BE42B + .string "The sea is deep here. A POKéMON\n" + .string "may be able to go underwater.$" + +gUnknown_81BE469:: @ 81BE469 + .string "The sea is deep here.\n" + .string "Would you like to use DIVE?$" + +gUnknown_81BE49B:: @ 81BE49B + .string "{STR_VAR_1} used DIVE.$" + +gUnknown_81BE4A9:: @ 81BE4A9 + .string "Light is filtering down from above.\n" + .string "A POKéMON may be able to surface.$" + +gUnknown_81BE4EF:: @ 81BE4EF + .string "Light is filtering down from above.\n" + .string "Would you like to use DIVE?$" + +gUnknown_81BE52F:: @ 81BE52F + .string "There is an obstacle above.\n" + .string "DIVE can't be used here.$" + +EventScript_FailSweetScent:: @ 81BE564 + msgbox Text_1BE56D, 3 + end + +Text_1BE56D:: @ 81BE56D + .string "Looks like there's nothing here…$" diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc new file mode 100644 index 000000000..c05b7fcdd --- /dev/null +++ b/data/scripts/flash.inc @@ -0,0 +1,4 @@ +EventScript_81BFB5F:: @ 81BFB5F + animateflash 0 + setflashradius 0 + end diff --git a/data/scripts/hole.inc b/data/scripts/hole.inc new file mode 100644 index 000000000..3b7c671e9 --- /dev/null +++ b/data/scripts/hole.inc @@ -0,0 +1,31 @@ +EventScript_1C1338:: @ 81C1338 + map_script_2 VAR_0x4030, 0, EventScript_1C1348 + .2byte 0 + copyvar VAR_0x4030, 1 + end + +EventScript_1C1348:: @ 81C1348 + lockall + delay 20 + applymovement 255, Movement_1C137A + waitmovement 0 + playse SE_RU_HYUU + delay 60 + warphole 0xFFFF + waitstate + end + +EventScript_1C1361:: @ 81C1361 + lockall + delay 20 + applymovement 255, Movement_1C137A + waitmovement 0 + playse SE_RU_HYUU + delay 60 + special DoFallWarp + waitstate + end + +Movement_1C137A:: @ 81C137A + set_invisible + step_end diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc new file mode 100644 index 000000000..76d2436ee --- /dev/null +++ b/data/scripts/item_ball_scripts.inc @@ -0,0 +1,671 @@ +Route2_EventScript_1BE58E:: @ 81BE58E + giveitem ITEM_ETHER, 1, 1 + end + +Route2_EventScript_1BE59B:: @ 81BE59B + giveitem ITEM_PARALYZE_HEAL, 1, 1 + end + +ViridianForest_EventScript_1BE5A8:: @ 81BE5A8 + giveitem ITEM_POKE_BALL, 1, 1 + end + +ViridianForest_EventScript_1BE5B5:: @ 81BE5B5 + giveitem ITEM_ANTIDOTE, 1, 1 + end + +ViridianForest_EventScript_1BE5C2:: @ 81BE5C2 + giveitem ITEM_POTION, 1, 1 + end + +MtMoon_1F_EventScript_1BE5CF:: @ 81BE5CF + giveitem ITEM_PARALYZE_HEAL, 1, 1 + end + +MtMoon_1F_EventScript_1BE5DC:: @ 81BE5DC + giveitem ITEM_TM09, 1, 1 + end + +MtMoon_1F_EventScript_1BE5E9:: @ 81BE5E9 + giveitem ITEM_POTION, 1, 1 + end + +MtMoon_1F_EventScript_1BE5F6:: @ 81BE5F6 + giveitem ITEM_RARE_CANDY, 1, 1 + end + +MtMoon_1F_EventScript_1BE603:: @ 81BE603 + giveitem ITEM_ESCAPE_ROPE, 1, 1 + end + +MtMoon_1F_EventScript_1BE610:: @ 81BE610 + giveitem ITEM_MOON_STONE, 1, 1 + end + +MtMoon_B2F_EventScript_1BE61D:: @ 81BE61D + giveitem ITEM_STAR_PIECE, 1, 1 + end + +MtMoon_B2F_EventScript_1BE62A:: @ 81BE62A + giveitem ITEM_TM46, 1, 1 + end + +Route4_EventScript_1BE637:: @ 81BE637 + giveitem ITEM_TM05, 1, 1 + end + +Route24_EventScript_1BE644:: @ 81BE644 + giveitem ITEM_TM45, 1, 1 + end + +Route25_EventScript_1BE651:: @ 81BE651 + giveitem ITEM_TM43, 1, 1 + end + +SSAnne_1F_Room2_EventScript_1BE65E:: @ 81BE65E + giveitem ITEM_TM31, 1, 1 + end + +SSAnne_2F_Room2_EventScript_1BE66B:: @ 81BE66B + giveitem ITEM_STARDUST, 1, 1 + end + +SSAnne_2F_Room4_EventScript_1BE678:: @ 81BE678 + giveitem ITEM_X_ATTACK, 1, 1 + end + +SSAnne_B1F_Room2_EventScript_1BE685:: @ 81BE685 + giveitem ITEM_TM44, 1, 1 + end + +SSAnne_B1F_Room3_EventScript_1BE692:: @ 81BE692 + giveitem ITEM_ETHER, 1, 1 + end + +SSAnne_B1F_Room5_EventScript_1BE69F:: @ 81BE69F + giveitem ITEM_SUPER_POTION, 1, 1 + end + +SSAnne_Kitchen_EventScript_1BE6AC:: @ 81BE6AC + giveitem ITEM_GREAT_BALL, 1, 1 + end + +Route9_EventScript_1BE6B9:: @ 81BE6B9 + giveitem ITEM_TM40, 1, 1 + end + +RocketHideout_B1F_EventScript_1BE6C6:: @ 81BE6C6 + giveitem ITEM_ESCAPE_ROPE, 1, 1 + end + +RocketHideout_B1F_EventScript_1BE6D3:: @ 81BE6D3 + giveitem ITEM_HYPER_POTION, 1, 1 + end + +RocketHideout_B2F_EventScript_1BE6E0:: @ 81BE6E0 + giveitem ITEM_X_SPEED, 1, 1 + end + +RocketHideout_B2F_EventScript_1BE6ED:: @ 81BE6ED + giveitem ITEM_MOON_STONE, 1, 1 + end + +RocketHideout_B2F_EventScript_1BE6FA:: @ 81BE6FA + giveitem ITEM_TM12, 1, 1 + end + +RocketHideout_B2F_EventScript_1BE707:: @ 81BE707 + giveitem ITEM_SUPER_POTION, 1, 1 + end + +RocketHideout_B3F_EventScript_1BE714:: @ 81BE714 + giveitem ITEM_RARE_CANDY, 1, 1 + end + +RocketHideout_B3F_EventScript_1BE721:: @ 81BE721 + giveitem ITEM_TM21, 1, 1 + end + +RocketHideout_B4F_EventScript_1BE72E:: @ 81BE72E + giveitem ITEM_TM49, 1, 1 + end + +RocketHideout_B4F_EventScript_1BE73B:: @ 81BE73B + giveitem ITEM_MAX_ETHER, 1, 1 + end + +RocketHideout_B4F_EventScript_1BE748:: @ 81BE748 + giveitem ITEM_CALCIUM, 1, 1 + end + +PokemonTower_3F_EventScript_1BE755:: @ 81BE755 + giveitem ITEM_ESCAPE_ROPE, 1, 1 + end + +PokemonTower_4F_EventScript_1BE762:: @ 81BE762 + giveitem ITEM_ELIXIR, 1, 1 + end + +PokemonTower_4F_EventScript_1BE76F:: @ 81BE76F + giveitem ITEM_AWAKENING, 1, 1 + end + +PokemonTower_4F_EventScript_1BE77C:: @ 81BE77C + giveitem ITEM_GREAT_BALL, 1, 1 + end + +PokemonTower_5F_EventScript_1BE789:: @ 81BE789 + giveitem ITEM_NUGGET, 1, 1 + end + +PokemonTower_6F_EventScript_1BE796:: @ 81BE796 + giveitem ITEM_RARE_CANDY, 1, 1 + end + +PokemonTower_6F_EventScript_1BE7A3:: @ 81BE7A3 + giveitem ITEM_X_ACCURACY, 1, 1 + end + +Route12_EventScript_1BE7B0:: @ 81BE7B0 + giveitem ITEM_TM48, 1, 1 + end + +Route12_EventScript_1BE7BD:: @ 81BE7BD + giveitem ITEM_IRON, 1, 1 + end + +Route15_EventScript_1BE7CA:: @ 81BE7CA + giveitem ITEM_TM18, 1, 1 + end + +SafariZone_Center_EventScript_1BE7D7:: @ 81BE7D7 + giveitem ITEM_NUGGET, 1, 1 + end + +SafariZone_East_EventScript_1BE7E4:: @ 81BE7E4 + giveitem ITEM_MAX_POTION, 1, 1 + end + +SafariZone_East_EventScript_1BE7F1:: @ 81BE7F1 + giveitem ITEM_FULL_RESTORE, 1, 1 + end + +SafariZone_East_EventScript_1BE7FE:: @ 81BE7FE + giveitem ITEM_TM11, 1, 1 + end + +SafariZone_East_EventScript_1BE80B:: @ 81BE80B + giveitem ITEM_LEAF_STONE, 1, 1 + end + +SafariZone_North_EventScript_1BE818:: @ 81BE818 + giveitem ITEM_PROTEIN, 1, 1 + end + +SafariZone_North_EventScript_1BE825:: @ 81BE825 + giveitem ITEM_TM47, 1, 1 + end + +SafariZone_West_EventScript_1BE832:: @ 81BE832 + giveitem ITEM_TM32, 1, 1 + end + +SafariZone_West_EventScript_1BE83F:: @ 81BE83F + giveitem ITEM_GOLD_TEETH, 1, 1 + end + +SafariZone_West_EventScript_1BE84C:: @ 81BE84C + giveitem ITEM_MAX_POTION, 1, 1 + end + +SafariZone_West_EventScript_1BE859:: @ 81BE859 + giveitem ITEM_MAX_REVIVE, 1, 1 + end + +SilphCo_3F_EventScript_1BE866:: @ 81BE866 + giveitem ITEM_HYPER_POTION, 1, 1 + end + +SilphCo_4F_EventScript_1BE873:: @ 81BE873 + giveitem ITEM_MAX_REVIVE, 1, 1 + end + +SilphCo_4F_EventScript_1BE880:: @ 81BE880 + giveitem ITEM_ESCAPE_ROPE, 1, 1 + end + +SilphCo_4F_EventScript_1BE88D:: @ 81BE88D + giveitem ITEM_FULL_HEAL, 1, 1 + end + +SilphCo_5F_EventScript_1BE89A:: @ 81BE89A + giveitem ITEM_PROTEIN, 1, 1 + end + +SilphCo_5F_EventScript_1BE8A7:: @ 81BE8A7 + giveitem ITEM_TM01, 1, 1 + end + +SilphCo_5F_EventScript_1BE8B4:: @ 81BE8B4 + giveitem ITEM_CARD_KEY, 1, 1 + end + +SilphCo_6F_EventScript_1BE8C1:: @ 81BE8C1 + giveitem ITEM_HP_UP, 1, 1 + end + +SilphCo_6F_EventScript_1BE8CE:: @ 81BE8CE + giveitem ITEM_X_SPECIAL, 1, 1 + end + +SilphCo_7F_EventScript_1BE8DB:: @ 81BE8DB + giveitem ITEM_CALCIUM, 1, 1 + end + +SilphCo_7F_EventScript_1BE8E8:: @ 81BE8E8 + giveitem ITEM_TM08, 1, 1 + end + +SilphCo_10F_EventScript_1BE8F5:: @ 81BE8F5 + giveitem ITEM_CARBOS, 1, 1 + end + +SilphCo_10F_EventScript_1BE902:: @ 81BE902 + giveitem ITEM_ULTRA_BALL, 1, 1 + end + +SilphCo_10F_EventScript_1BE90F:: @ 81BE90F + giveitem ITEM_RARE_CANDY, 1, 1 + end + +PowerPlant_EventScript_1BE91C:: @ 81BE91C + giveitem ITEM_MAX_POTION, 1, 1 + end + +PowerPlant_EventScript_1BE929:: @ 81BE929 + giveitem ITEM_TM17, 1, 1 + end + +PowerPlant_EventScript_1BE936:: @ 81BE936 + giveitem ITEM_TM25, 1, 1 + end + +PowerPlant_EventScript_1BE943:: @ 81BE943 + giveitem ITEM_THUNDER_STONE, 1, 1 + end + +PowerPlant_EventScript_1BE950:: @ 81BE950 + giveitem ITEM_ELIXIR, 1, 1 + end + +PokemonMansion_1F_EventScript_1BE95D:: @ 81BE95D + giveitem ITEM_CARBOS, 1, 1 + end + +PokemonMansion_1F_EventScript_1BE96A:: @ 81BE96A + giveitem ITEM_ESCAPE_ROPE, 1, 1 + end + +PokemonMansion_2F_EventScript_1BE977:: @ 81BE977 + giveitem ITEM_CALCIUM, 1, 1 + end + +PokemonMansion_3F_EventScript_1BE984:: @ 81BE984 + giveitem ITEM_MAX_POTION, 1, 1 + end + +PokemonMansion_3F_EventScript_1BE991:: @ 81BE991 + giveitem ITEM_IRON, 1, 1 + end + +PokemonMansion_B1F_EventScript_1BE99E:: @ 81BE99E + giveitem ITEM_TM14, 1, 1 + end + +PokemonMansion_B1F_EventScript_1BE9AB:: @ 81BE9AB + giveitem ITEM_FULL_RESTORE, 1, 1 + end + +PokemonMansion_B1F_EventScript_1BE9B8:: @ 81BE9B8 + giveitem ITEM_TM22, 1, 1 + end + +PokemonMansion_B1F_EventScript_1BE9C5:: @ 81BE9C5 + giveitem ITEM_SECRET_KEY, 1, 1 + end + +VictoryRoad_1F_EventScript_1BE9D2:: @ 81BE9D2 + giveitem ITEM_RARE_CANDY, 1, 1 + end + +VictoryRoad_1F_EventScript_1BE9DF:: @ 81BE9DF + giveitem ITEM_TM02, 1, 1 + end + +VictoryRoad_2F_EventScript_1BE9EC:: @ 81BE9EC + giveitem ITEM_GUARD_SPEC, 1, 1 + end + +VictoryRoad_2F_EventScript_1BE9F9:: @ 81BE9F9 + giveitem ITEM_TM07, 1, 1 + end + +VictoryRoad_2F_EventScript_1BEA06:: @ 81BEA06 + giveitem ITEM_FULL_HEAL, 1, 1 + end + +VictoryRoad_2F_EventScript_1BEA13:: @ 81BEA13 + giveitem ITEM_TM37, 1, 1 + end + +VictoryRoad_3F_EventScript_1BEA20:: @ 81BEA20 + giveitem ITEM_MAX_REVIVE, 1, 1 + end + +VictoryRoad_3F_EventScript_1BEA2D:: @ 81BEA2D + giveitem ITEM_TM50, 1, 1 + end + +CeruleanCave_1F_EventScript_1BEA3A:: @ 81BEA3A + giveitem ITEM_MAX_ELIXIR, 1, 1 + end + +CeruleanCave_1F_EventScript_1BEA47:: @ 81BEA47 + giveitem ITEM_NUGGET, 1, 1 + end + +CeruleanCave_1F_EventScript_1BEA54:: @ 81BEA54 + giveitem ITEM_FULL_RESTORE, 1, 1 + end + +CeruleanCave_2F_EventScript_1BEA61:: @ 81BEA61 + giveitem ITEM_FULL_RESTORE, 1, 1 + end + +CeruleanCave_2F_EventScript_1BEA6E:: @ 81BEA6E + giveitem ITEM_PP_UP, 1, 1 + end + +CeruleanCave_2F_EventScript_1BEA7B:: @ 81BEA7B + giveitem ITEM_ULTRA_BALL, 1, 1 + end + +CeruleanCave_B1F_EventScript_1BEA88:: @ 81BEA88 + giveitem ITEM_MAX_REVIVE, 1, 1 + end + +CeruleanCave_B1F_EventScript_1BEA95:: @ 81BEA95 + giveitem ITEM_ULTRA_BALL, 1, 1 + end + +FuchsiaCity_Building1_EventScript_1BEAA2:: @ 81BEAA2 + giveitem ITEM_RARE_CANDY, 1, 1 + end + +TwoIsland_EventScript_1BEAAF:: @ 81BEAAF + giveitem ITEM_REVIVE, 1, 1 + end + +ThreeIsland_EventScript_1BEABC:: @ 81BEABC + giveitem ITEM_ZINC, 1, 1 + end + +ViridianForest_EventScript_1BEAC9:: @ 81BEAC9 + giveitem ITEM_POTION, 1, 1 + end + +MtMoon_B2F_EventScript_1BEAD6:: @ 81BEAD6 + giveitem ITEM_REVIVE, 1, 1 + end + +MtMoon_B2F_EventScript_1BEAE3:: @ 81BEAE3 + giveitem ITEM_ANTIDOTE, 1, 1 + end + +Route11_EventScript_1BEAF0:: @ 81BEAF0 + giveitem ITEM_X_DEFEND, 1, 1 + end + +Route9_EventScript_1BEAFD:: @ 81BEAFD + giveitem ITEM_BURN_HEAL, 1, 1 + end + +RockTunnel_1F_EventScript_1BEB0A:: @ 81BEB0A + giveitem ITEM_REPEL, 1, 1 + end + +RockTunnel_1F_EventScript_1BEB17:: @ 81BEB17 + giveitem ITEM_PEARL, 1, 1 + end + +RockTunnel_1F_EventScript_1BEB24:: @ 81BEB24 + giveitem ITEM_ESCAPE_ROPE, 1, 1 + end + +RockTunnel_B1F_EventScript_1BEB31:: @ 81BEB31 + giveitem ITEM_REVIVE, 1, 1 + end + +RockTunnel_B1F_EventScript_1BEB3E:: @ 81BEB3E + giveitem ITEM_MAX_ETHER, 1, 1 + end + +SilphCo_8F_EventScript_1BEB4B:: @ 81BEB4B + giveitem ITEM_IRON, 1, 1 + end + +SilphCo_11F_EventScript_1BEB58:: @ 81BEB58 + giveitem ITEM_ZINC, 1, 1 + end + +PokemonMansion_1F_EventScript_1BEB65:: @ 81BEB65 + giveitem ITEM_PROTEIN, 1, 1 + end + +PokemonMansion_2F_EventScript_1BEB72:: @ 81BEB72 + giveitem ITEM_ZINC, 1, 1 + end + +PokemonMansion_2F_EventScript_1BEB7F:: @ 81BEB7F + giveitem ITEM_HP_UP, 1, 1 + end + +ViridianCity_EventScript_1BEB8C:: @ 81BEB8C + giveitem ITEM_POTION, 1, 1 + end + +Route11_EventScript_1BEB99:: @ 81BEB99 + giveitem ITEM_GREAT_BALL, 1, 1 + end + +Route11_EventScript_1BEBA6:: @ 81BEBA6 + giveitem ITEM_AWAKENING, 1, 1 + end + +PokemonTower_5F_EventScript_1BEBB3:: @ 81BEBB3 + giveitem ITEM_CLEANSE_TAG, 1, 1 + end + +CeladonCity_EventScript_1BEBC0:: @ 81BEBC0 + giveitem ITEM_ETHER, 1, 1 + end + +RocketHideout_B3F_EventScript_1BEBCD:: @ 81BEBCD + giveitem ITEM_BLACK_GLASSES, 1, 1 + end + +SafariZone_North_EventScript_1BEBDA:: @ 81BEBDA + giveitem ITEM_QUICK_CLAW, 1, 1 + end + +SeafoamIslands_1F_EventScript_1BEBE7:: @ 81BEBE7 + giveitem ITEM_ICE_HEAL, 1, 1 + end + +SeafoamIslands_B1F_EventScript_1BEBF4:: @ 81BEBF4 + giveitem ITEM_WATER_STONE, 1, 1 + end + +SeafoamIslands_B1F_EventScript_1BEC01:: @ 81BEC01 + giveitem ITEM_REVIVE, 1, 1 + end + +SeafoamIslands_B2F_EventScript_1BEC0E:: @ 81BEC0E + giveitem ITEM_BIG_PEARL, 1, 1 + end + +SeafoamIslands_B4F_EventScript_1BEC1B:: @ 81BEC1B + giveitem ITEM_ULTRA_BALL, 1, 1 + end + +FourIsland_EventScript_1BEC28:: @ 81BEC28 + giveitem ITEM_STAR_PIECE, 1, 1 + end + +FourIsland_EventScript_1BEC35:: @ 81BEC35 + giveitem ITEM_STARDUST, 1, 1 + end + +OneIsland_KindleRoad_EventScript_1BEC42:: @ 81BEC42 + giveitem ITEM_ETHER, 1, 1 + end + +OneIsland_KindleRoad_EventScript_1BEC4F:: @ 81BEC4F + giveitem ITEM_MAX_REPEL, 1, 1 + end + +OneIsland_KindleRoad_EventScript_1BEC5C:: @ 81BEC5C + giveitem ITEM_CARBOS, 1, 1 + end + +FiveIsland_Meadow_EventScript_1BEC69:: @ 81BEC69 + giveitem ITEM_MAX_POTION, 1, 1 + end + +FiveIsland_Meadow_EventScript_1BEC76:: @ 81BEC76 + giveitem ITEM_PP_UP, 1, 1 + end + +FiveIsland_MemorialPillar_EventScript_1BEC83:: @ 81BEC83 + giveitem ITEM_METAL_COAT, 1, 1 + end + +SixIsland_OutcastIsland_EventScript_1BEC90:: @ 81BEC90 + giveitem ITEM_PP_UP, 1, 1 + end + +SixIsland_WaterPath_EventScript_1BEC9D:: @ 81BEC9D + giveitem ITEM_ELIXIR, 1, 1 + end + +SixIsland_WaterPath_EventScript_1BECAA:: @ 81BECAA + giveitem ITEM_DRAGON_SCALE, 1, 1 + end + +SixIsland_RuinValley_EventScript_1BECB7:: @ 81BECB7 + giveitem ITEM_FULL_RESTORE, 1, 1 + end + +SixIsland_RuinValley_EventScript_1BECC4:: @ 81BECC4 + giveitem ITEM_HP_UP, 1, 1 + end + +SixIsland_RuinValley_EventScript_1BECD1:: @ 81BECD1 + giveitem ITEM_SUN_STONE, 1, 1 + end + +SevenIsland_SevaultCanyon_EventScript_1BECDE:: @ 81BECDE + giveitem ITEM_KINGS_ROCK, 1, 1 + end + +SevenIsland_SevaultCanyon_EventScript_1BECEB:: @ 81BECEB + giveitem ITEM_MAX_ELIXIR, 1, 1 + end + +SevenIsland_SevaultCanyon_EventScript_1BECF8:: @ 81BECF8 + giveitem ITEM_NUGGET, 1, 1 + end + +ThreeIsland_BerryForest_EventScript_1BED05:: @ 81BED05 + giveitem ITEM_MAX_ETHER, 1, 1 + end + +ThreeIsland_BerryForest_EventScript_1BED12:: @ 81BED12 + giveitem ITEM_FULL_HEAL, 1, 1 + end + +ThreeIsland_BerryForest_EventScript_1BED1F:: @ 81BED1F + giveitem ITEM_MAX_ELIXIR, 1, 1 + end + +MtEmber_Exterior_EventScript_1BED2C:: @ 81BED2C + giveitem ITEM_ULTRA_BALL, 1, 1 + end + +MtEmber_Exterior_EventScript_1BED39:: @ 81BED39 + giveitem ITEM_FIRE_STONE, 1, 1 + end + +MtEmber_Exterior_EventScript_1BED46:: @ 81BED46 + giveitem ITEM_DIRE_HIT, 1, 1 + end + +FourIsland_IcefallCave_1F_EventScript_1BED53:: @ 81BED53 + giveitem ITEM_ULTRA_BALL, 1, 1 + end + +FourIsland_IcefallCave_1F_EventScript_1BED60:: @ 81BED60 + giveitem ITEM_HM07, 1, 1 + end + +FourIsland_IcefallCave_B1F_EventScript_1BED6D:: @ 81BED6D + giveitem ITEM_FULL_RESTORE, 1, 1 + end + +FourIsland_IcefallCave_B1F_EventScript_1BED7A:: @ 81BED7A + giveitem ITEM_NEVER_MELT_ICE, 1, 1 + end + +FiveIsland_RocketWarehouse_EventScript_1BED87:: @ 81BED87 + giveitem ITEM_BIG_PEARL, 1, 1 + end + +FiveIsland_RocketWarehouse_EventScript_1BED94:: @ 81BED94 + giveitem ITEM_TM36, 1, 1 + end + +FiveIsland_RocketWarehouse_EventScript_1BEDA1:: @ 81BEDA1 + giveitem ITEM_PEARL, 1, 1 + end + +FiveIsland_RocketWarehouse_EventScript_1BEDAE:: @ 81BEDAE + giveitem ITEM_UP_GRADE, 1, 1 + end + +FiveIsland_LostCave_Room10_EventScript_1BEDBB:: @ 81BEDBB + giveitem ITEM_SILK_SCARF, 1, 1 + end + +FiveIsland_LostCave_Room11_EventScript_1BEDC8:: @ 81BEDC8 + giveitem ITEM_LAX_INCENSE, 1, 1 + end + +FiveIsland_LostCave_Room12_EventScript_1BEDD5:: @ 81BEDD5 + giveitem ITEM_SEA_INCENSE, 1, 1 + end + +FiveIsland_LostCave_Room13_EventScript_1BEDE2:: @ 81BEDE2 + giveitem ITEM_MAX_REVIVE, 1, 1 + end + +FiveIsland_LostCave_Room14_EventScript_1BEDEF:: @ 81BEDEF + giveitem ITEM_RARE_CANDY, 1, 1 + end + +SevenIsland_SevaultCanyon_House_EventScript_1BEDFC:: @ 81BEDFC + giveitem ITEM_LUCKY_PUNCH, 1, 1 + end + +SilphCo_4F_EventScript_1BEE09:: @ 81BEE09 + giveitem ITEM_TM41, 1, 1 + end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc new file mode 100644 index 000000000..51f87a6f5 --- /dev/null +++ b/data/scripts/move_tutors.inc @@ -0,0 +1,598 @@ +VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE + lock + faceplayer + checkflag FLAG_TUTOR_DOUBLE_EDGE + goto_if TRUE, EventScript_1C480C + msgbox Text_1749F9, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4802 + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4802 + msgbox Text_174AE2 + setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4802 + setflag FLAG_TUTOR_DOUBLE_EDGE + goto EventScript_1C480C + end + +EventScript_1C4802:: @ 81C4802 + msgbox Text_174ABC + release + end + +EventScript_1C480C:: @ 81C480C + msgbox Text_174B0C + release + end + +EventScript_1C4816:: @ 81C4816 + lock + faceplayer + checkflag FLAG_TUTOR_THUNDER_WAVE + goto_if TRUE, EventScript_1C4874 + msgbox Text_175711, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C486A + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C486A + msgbox Text_1757C1 + setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C486A + setflag FLAG_TUTOR_THUNDER_WAVE + goto EventScript_1C4874 + end + +EventScript_1C486A:: @ 81C486A + msgbox Text_17579D + release + end + +EventScript_1C4874:: @ 81C4874 + msgbox Text_1757EC + release + end + +RockTunnel_B1F_EventScript_1C487E:: @ 81C487E + lock + faceplayer + checkflag FLAG_TUTOR_ROCK_SLIDE + goto_if TRUE, EventScript_1C48DC + msgbox Text_1799E0, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C48D2 + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C48D2 + msgbox Text_179AE1 + setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C48D2 + setflag FLAG_TUTOR_ROCK_SLIDE + goto EventScript_1C48DC + end + +EventScript_1C48D2:: @ 81C48D2 + msgbox Text_179AC0 + release + end + +EventScript_1C48DC:: @ 81C48DC + msgbox Text_179B0A + release + end + +MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 + lock + faceplayer + checkflag FLAG_TUTOR_EXPLOSION + goto_if TRUE, EventScript_1C4944 + msgbox Text_17A642, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C493A + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C493A + msgbox Text_17A717 + setvar VAR_0x8005, MOVETUTOR_EXPLOSION + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C493A + setflag FLAG_TUTOR_EXPLOSION + goto EventScript_1C4944 + end + +EventScript_1C493A:: @ 81C493A + msgbox Text_17A6ED + release + end + +EventScript_1C4944:: @ 81C4944 + msgbox Text_17A756 + release + end + +Route4_EventScript_1C494E:: @ 81C494E + lock + faceplayer + checkflag FLAG_TUTOR_META_PUNCH + goto_if TRUE, EventScript_1C49AC + msgbox Text_1839D5, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C49A2 + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C49A2 + msgbox Text_183ABF + setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C49A2 + setflag FLAG_TUTOR_META_PUNCH + goto EventScript_1C49AC + end + +EventScript_1C49A2:: @ 81C49A2 + msgbox Text_183A83 + release + end + +EventScript_1C49AC:: @ 81C49AC + msgbox Text_183AE2 + release + end + +Route4_EventScript_1C49B6:: @ 81C49B6 + lock + faceplayer + checkflag FLAG_TUTOR_MEGA_KICK + goto_if TRUE, EventScript_1C4A14 + msgbox Text_183B74, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4A0A + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4A0A + msgbox Text_183C68 + setvar VAR_0x8005, MOVETUTOR_MEGA_KICK + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4A0A + setflag FLAG_TUTOR_MEGA_KICK + goto EventScript_1C4A14 + end + +EventScript_1C4A0A:: @ 81C4A0A + msgbox Text_183C25 + release + end + +EventScript_1C4A14:: @ 81C4A14 + msgbox Text_183C94 + release + end + +EventScript_1C4A1E:: @ 81C4A1E + lock + faceplayer + checkflag FLAG_TUTOR_DREAM_EATER + goto_if TRUE, EventScript_1C4A7C + msgbox Text_17E316, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4A72 + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4A72 + msgbox Text_17E3F1 + setvar VAR_0x8005, MOVETUTOR_DREAM_EATER + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4A72 + setflag FLAG_TUTOR_DREAM_EATER + goto EventScript_1C4A7C + end + +EventScript_1C4A72:: @ 81C4A72 + msgbox Text_17E3E9 + release + end + +EventScript_1C4A7C:: @ 81C4A7C + msgbox Text_17E41B + release + end + +EventScript_1C4A86:: @ 81C4A86 + lock + faceplayer + checkflag FLAG_TUTOR_SOFT_BOILED + goto_if TRUE, EventScript_1C4AE4 + msgbox Text_180388, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4ADA + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4ADA + msgbox Text_180484 + setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4ADA + setflag FLAG_TUTOR_SOFT_BOILED + goto EventScript_1C4AE4 + end + +EventScript_1C4ADA:: @ 81C4ADA + msgbox Text_18043F + release + end + +EventScript_1C4AE4:: @ 81C4AE4 + msgbox Text_1804C4 + release + end + +FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE + lock + faceplayer + checkflag FLAG_TUTOR_SUBSTITUTE + goto_if TRUE, EventScript_1C4B4C + msgbox Text_180948, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4B42 + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4B42 + msgbox Text_180A57 + setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4B42 + setflag FLAG_TUTOR_SUBSTITUTE + goto EventScript_1C4B4C + end + +EventScript_1C4B42:: @ 81C4B42 + msgbox Text_180A32 + release + end + +EventScript_1C4B4C:: @ 81C4B4C + msgbox Text_180A80 + release + end + +SevenIsland_EventScript_1C4B56:: @ 81C4B56 + lock + faceplayer + checkflag FLAG_TUTOR_SWORDS_DANCE + goto_if TRUE, EventScript_1C4BB4 + msgbox Text_182F01, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4BAA + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4BAA + msgbox Text_182FD9 + setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4BAA + setflag FLAG_TUTOR_SWORDS_DANCE + goto EventScript_1C4BB4 + end + +EventScript_1C4BAA:: @ 81C4BAA + msgbox Text_182FC1 + release + end + +EventScript_1C4BB4:: @ 81C4BB4 + msgbox Text_18300D + release + end + +PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE + lock + faceplayer + checkflag FLAG_TUTOR_SEISMIC_TOSS + goto_if TRUE, EventScript_1C4C1C + msgbox Text_1909A3, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4C12 + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4C12 + msgbox Text_190AD5 + setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4C12 + setflag FLAG_TUTOR_SEISMIC_TOSS + goto EventScript_1C4C1C + end + +EventScript_1C4C12:: @ 81C4C12 + msgbox Text_190AA9 + release + end + +EventScript_1C4C1C:: @ 81C4C1C + msgbox Text_190B00 + release + end + +EventScript_1C4C26:: @ 81C4C26 + lock + faceplayer + checkflag FLAG_TUTOR_COUNTER + goto_if TRUE, EventScript_1C4C84 + msgbox Text_195928, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4C7A + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4C7A + msgbox Text_195A08 + setvar VAR_0x8005, MOVETUTOR_COUNTER + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4C7A + setflag FLAG_TUTOR_COUNTER + goto EventScript_1C4C84 + end + +EventScript_1C4C7A:: @ 81C4C7A + msgbox Text_1959CC + release + end + +EventScript_1C4C84:: @ 81C4C84 + msgbox Text_195A31 + release + end + +EventScript_1C4C8E:: @ 81C4C8E + lock + faceplayer + checkflag FLAG_TUTOR_METRONOME + goto_if TRUE, EventScript_1C4CEC + msgbox Text_19A137, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4CE2 + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4CE2 + msgbox Text_19A1EA + setvar VAR_0x8005, MOVETUTOR_METRONOME + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4CE2 + setflag FLAG_TUTOR_METRONOME + goto EventScript_1C4CEC + end + +EventScript_1C4CE2:: @ 81C4CE2 + msgbox Text_19A1CB + release + end + +EventScript_1C4CEC:: @ 81C4CEC + msgbox Text_19A20E + release + end + +EventScript_1C4CF6:: @ 81C4CF6 + checkflag FLAG_TUTOR_MIMIC + goto_if TRUE, EventScript_1C4D59 + msgbox Text_19AD85, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4D4F + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4D4F + msgbox Text_19ADEE + setvar VAR_0x8005, MOVETUTOR_MIMIC + call EventScript_1C4F30 + lock + faceplayer + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4D4F + removeitem ITEM_POKE_DOLL, 1 + setflag FLAG_TUTOR_MIMIC + goto EventScript_1C4D59 + end + +EventScript_1C4D4F:: @ 81C4D4F + msgbox Text_19ADD8 + release + end + +EventScript_1C4D59:: @ 81C4D59 + checkplayergender + compare VAR_RESULT, 0 + call_if eq, EventScript_1C4D72 + compare VAR_RESULT, 1 + call_if eq, EventScript_1C4D7B + release + end + +EventScript_1C4D72:: @ 81C4D72 + msgbox Text_19AE1C + return + +EventScript_1C4D7B:: @ 81C4D7B + msgbox Text_19AE90 + return + +FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 + lock + faceplayer + checkflag FLAG_TUTOR_BODY_SLAM + goto_if TRUE, EventScript_1C4DE2 + msgbox Text_1A3505, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4DD8 + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4DD8 + msgbox Text_1A35DA + setvar VAR_0x8005, MOVETUTOR_BODY_SLAM + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4DD8 + setflag FLAG_TUTOR_BODY_SLAM + goto EventScript_1C4DE2 + end + +EventScript_1C4DD8:: @ 81C4DD8 + msgbox Text_1A35C7 + release + end + +EventScript_1C4DE2:: @ 81C4DE2 + msgbox Text_1A3609 + release + end + +TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + checkflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK + goto_if TRUE, EventScript_1C4EA1 + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_1C4E97 + getfirstpartymonname 0 + msgbox Text_1A46C6 + specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4F26 + copyvar VAR_0x8009, VAR_0x8005 + compare VAR_FACING, 2 + call_if eq, EventScript_1C4EF0 + compare VAR_FACING, 1 + call_if eq, EventScript_1C4EFB + compare VAR_FACING, 4 + call_if eq, EventScript_1C4F06 + compare VAR_FACING, 3 + call_if eq, EventScript_1C4F11 + msgbox Text_1A4751, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4F1C + call EventScript_1C4F37 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4F1C + msgbox Text_1A4814 + closemessage + fadescreen 1 + goto EventScript_1C4EDA + +EventScript_1C4E8F:: @ 81C4E8F + fadescreen 0 + goto EventScript_1C4EAB + end + +EventScript_1C4E97:: @ 81C4E97 + msgbox Text_1A48B3 + release + end + +EventScript_1C4EA1:: @ 81C4EA1 + msgbox Text_1A4972 + release + end + +EventScript_1C4EAB:: @ 81C4EAB + copyvar VAR_0x8005, VAR_0x8009 + specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor + compare VAR_RESULT, 1 + goto_if eq, EventScript_1C4ECD + msgbox Text_1A4865 + setflag FLAG_TEMP_2 + release + end + +EventScript_1C4ECD:: @ 81C4ECD + msgbox Text_1A48F3 + setflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK + release + end + +EventScript_1C4EDA:: @ 81C4EDA + call EventScript_1C4F30 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C4F1C + goto EventScript_1C4EAB + end + +EventScript_1C4EF0:: @ 81C4EF0 + applymovement 1, Movement_1C4F4C + waitmovement 0 + return + +EventScript_1C4EFB:: @ 81C4EFB + applymovement 1, Movement_1C4F4E + waitmovement 0 + return + +EventScript_1C4F06:: @ 81C4F06 + applymovement 1, Movement_1C4F50 + waitmovement 0 + return + +EventScript_1C4F11:: @ 81C4F11 + applymovement 1, Movement_1C4F52 + waitmovement 0 + return + +EventScript_1C4F1C:: @ 81C4F1C + msgbox Text_1A47E5 + release + end + +EventScript_1C4F26:: @ 81C4F26 + msgbox Text_1A4737 + release + end + +EventScript_1C4F30:: @ 81C4F30 + special ChooseMonForMoveTutor + waitstate + lock + faceplayer + return + +EventScript_1C4F37:: @ 81C4F37 + textcolor 3 + special sub_80699BC + signmsg + msgbox Text_1A644F, 5 + normalmsg + call EventScript_1A6675 + return + +Movement_1C4F4C:: @ 81C4F4C + step_52 + step_end + +Movement_1C4F4E:: @ 81C4F4E + step_53 + step_end + +Movement_1C4F50:: @ 81C4F50 + step_54 + step_end + +Movement_1C4F52:: @ 81C4F52 + step_55 + step_end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc new file mode 100644 index 000000000..6db5e89ff --- /dev/null +++ b/data/scripts/mystery_event_club.inc @@ -0,0 +1,180 @@ +PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 + lock + faceplayer + compare VAR_0x4001, 1 + goto_if eq, EventScript_1BEE3A + checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE + goto_if TRUE, EventScript_1BEECD + msgbox Text_1BEF88 + goto EventScript_1BEE44 + end + +EventScript_1BEE3A:: @ 81BEE3A + msgbox gUnknown_81BF36A + release + end + +EventScript_1BEE44:: @ 81BEE44 + message Text_1BF017 + waitmessage + multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE + switch VAR_RESULT + case 0, EventScript_1BEE8F + case 1, EventScript_1BEEC3 + case 2, EventScript_1BEE81 + case SCR_MENU_CANCEL, EventScript_1BEEC3 + end + +EventScript_1BEE81:: @ 81BEE81 + msgbox gUnknown_81BF053 + goto EventScript_1BEE44 + end + +EventScript_1BEE8F:: @ 81BEE8F + msgbox gUnknown_81BF166 + closemessage + goto EventScript_1BEF5A + end + +EventScript_1BEE9E:: @ 81BEE9E + msgbox gUnknown_81BF1B2 + release + end + +EventScript_1BEEA8:: @ 81BEEA8 + setvar VAR_0x4001, 1 + setvar VAR_0x8004, 0 + special Special_BufferEasyChatMessage + waitmessage + delay 80 + msgbox gUnknown_81BF28E + release + end + +EventScript_1BEEC3:: @ 81BEEC3 + msgbox gUnknown_81BF17B + release + end + +EventScript_1BEECD:: @ 81BEECD + msgbox gUnknown_81BF1E8 + goto EventScript_1BEEDB + end + +EventScript_1BEEDB:: @ 81BEEDB + message Text_1BF1FB + waitmessage + multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE + switch VAR_RESULT + case 0, EventScript_1BEF26 + case 1, EventScript_1BEF35 + case 2, EventScript_1BEF18 + case SCR_MENU_CANCEL, EventScript_1BEF35 + end + +EventScript_1BEF18:: @ 81BEF18 + msgbox gUnknown_81BF053 + goto EventScript_1BEEDB + end + +EventScript_1BEF26:: @ 81BEF26 + msgbox gUnknown_81BF222 + closemessage + goto EventScript_1BEF5A + end + +EventScript_1BEF35:: @ 81BEF35 + msgbox gUnknown_81BF252 + release + end + +EventScript_1BEF3F:: @ 81BEF3F + setvar VAR_0x4001, 1 + setvar VAR_0x8004, 0 + special Special_BufferEasyChatMessage + waitmessage + delay 80 + msgbox gUnknown_81BF30D + release + end + +EventScript_1BEF5A:: @ 81BEF5A + setvar VAR_0x8004, 0 + call EventScript_1A6AC0 + lock + faceplayer + compare VAR_0x8004, 0 + goto_if eq, EventScript_1BEF3F + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BEE9E + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BEEA8 + end + +Text_1BEF88:: @ 81BEF88 + .string "Hi, glad to meet you!\p" + .string "…That's unfriendly of you.\n" + .string "How about saying hi back?\p" + .string "So, come on, tell me about\n" + .string "yourself.\p" + .string "I'd love to hear your profile!$" + +Text_1BF017:: @ 81BF017 + .string "Tell me something good about\n" + .string "yourself. What's your profile?$" + +gUnknown_81BF053:: @ 81BF053 + .string "A profile is written using four\n" + .string "words or phrases.\p" + .string "There're plenty of words to choose\n" + .string "from for your profile.\p" + .string "The words and phrases are placed\n" + .string "in several convenient groups.\p" + .string "First, choose a group, then choose\n" + .string "a word or phrase.\p" + .string "…It's easier than it sounds.\n" + .string "Why don't you try it?$" + +gUnknown_81BF166:: @ 81BF166 + .string "What's your profile?$" + +gUnknown_81BF17B:: @ 81BF17B + .string "Aww… Don't be like that.\n" + .string "You can tell me your profile.$" + +gUnknown_81BF1B2:: @ 81BF1B2 + .string "Oh, you've decided not to?\n" + .string "You're fickle, aren't you?$" + +gUnknown_81BF1E8:: @ 81BF1E8 + .string "Hi!\n" + .string "We meet again!$" + +Text_1BF1FB:: @ 81BF1FB + .string "Would you like to change your\n" + .string "profile?$" + +gUnknown_81BF222:: @ 81BF222 + .string "What are you like now?\n" + .string "I'd really like to know.$" + +gUnknown_81BF252:: @ 81BF252 + .string "Okay, you like your profile the\n" + .string "way it is.\p" + .string "I think so, too.$" + +gUnknown_81BF28E:: @ 81BF28E + .string "Hmhm…\p" + .string "Your profile really says something\n" + .string "about who you are.\p" + .string "Now that I know you better, it \n" + .string "makes us better friends than ever!$" + +gUnknown_81BF30D:: @ 81BF30D + .string "Oh, I've heard that before…\p" + .string "My cousin, who lives far away,\n" + .string "always used to say that, I think.$" + +gUnknown_81BF36A:: @ 81BF36A + .string "Please tell me more about\n" + .string "yourself next time!$" diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc new file mode 100644 index 000000000..adf709ee3 --- /dev/null +++ b/data/scripts/pkmn_center_nurse.inc @@ -0,0 +1,72 @@ +EventScript_PkmnCenterNurse:: @ 81A6578 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + message Text_WelcomeWantToHealPkmn + waitmessage + multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1) + switch VAR_RESULT + case 0, EventScript_PkmnCenterNurse_HealPkmn + case 1 EventScript_PkmnCenterNurse_Goodbye + case SCR_MENU_CANCEL, EventScript_PkmnCenterNurse_Goodbye + end + +EventScript_PkmnCenterNurse_HealPkmn:: @ 81A65B8 + incrementgamestat GAME_STAT_USED_POKECENTER + message Text_TakeYourPkmnForFewSeconds + waitmessage + call EventScript_PkmnCenterNurse_TakeAndHealPkmn + special sub_80CC524 + goto EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom + end + +EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE + applymovement VAR_LAST_TALKED, Movement_1A75E7 + waitmovement 0 + dofieldeffect FLDEFF_POKECENTER_HEAL + waitfieldeffect FLDEFF_POKECENTER_HEAL + applymovement VAR_LAST_TALKED, Movement_1A75ED + waitmovement 0 + special sp000_heal_pokemon + return + +EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC + specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby + compare VAR_RESULT, FALSE + goto_if eq, EventScript_PkmnCenterNurse_ReturnPkmn + specialvar VAR_RESULT, BufferUnionRoomPlayerName + copyvar VAR_0x8008, VAR_RESULT + compare VAR_0x8008, 0 + goto_if eq, EventScript_PkmnCenterNurse_ReturnPkmn + compare VAR_0x8008, 1 + goto_if eq, EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom + end + +EventScript_PkmnCenterNurse_ReturnPkmn:: @ 81A661D + message Text_RestoredPkmnToFullHealth + waitmessage + applymovement VAR_LAST_TALKED, Movement_1A666C + waitmovement 0 + msgbox Text_WeHopeToSeeYouAgain + return + +EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: @ 81A6636 + checkflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER + goto_if TRUE, EventScript_PkmnCenterNurse_ReturnPkmn + msgbox Text_RestoredPkmnToFullHealth + setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER + message Text_PlayerIsPlayingRightNowGoForIt + waitmessage + applymovement VAR_LAST_TALKED, Movement_1A666C + waitmovement 0 + msgbox Text_WeHopeToSeeYouAgain + return + +EventScript_PkmnCenterNurse_Goodbye:: @ 81A6663 + msgbox Text_WeHopeToSeeYouAgain + return + +Movement_1A666C:: @ 81A666C + step_5b + step_1a + step_end diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc new file mode 100644 index 000000000..addd6894e --- /dev/null +++ b/data/scripts/repel.inc @@ -0,0 +1,6 @@ +EventScript_RepelWoreOff:: @ 81BFB65 + msgbox Text_1BFB6E, 3 + end + +Text_1BFB6E:: @ 81BFB6E + .string "REPEL's effect wore off…$" diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc new file mode 100644 index 000000000..d90fb1e81 --- /dev/null +++ b/data/scripts/set_gym_trainers.inc @@ -0,0 +1,76 @@ +EventScript_SetGymTrainers:: @ 81A6B18 + switch VAR_0x8008 + case 1, EventScript_SetPewterGymTrainers + case 2, EventScript_SetCeruleanGymTrainers + case 3, EventScript_SetVermilionGymTrainers + case 4, EventScript_SetCeladonGymTrainers + case 5, EventScript_SetFuchsiaGymTrainers + case 6, EventScript_SetSaffronGymTrainers + case 7, EventScript_SetCinnabarGymTrainers + case 8, EventScript_SetViridianGymTrainers + end + +EventScript_SetPewterGymTrainers:: @ 81A6B76 + settrainerflag TRAINER_CAMPER_LIAM + return + +EventScript_SetCeruleanGymTrainers:: @ 81A6B7A + settrainerflag TRAINER_PICNICKER_DIANA + settrainerflag TRAINER_SWIMMER_MALE_LUIS + return + +EventScript_SetVermilionGymTrainers:: @ 81A6B81 + settrainerflag TRAINER_SAILOR_DWAYNE + settrainerflag TRAINER_ENGINEER_BAILY + settrainerflag TRAINER_GENTLEMAN_TUCKER + return + +EventScript_SetCeladonGymTrainers:: @ 81A6B8B + settrainerflag TRAINER_LASS_KAY + settrainerflag TRAINER_LASS_LISA + settrainerflag TRAINER_PICNICKER_TINA + settrainerflag TRAINER_BEAUTY_BRIDGET + settrainerflag TRAINER_BEAUTY_TAMIA + settrainerflag TRAINER_BEAUTY_LORI + settrainerflag TRAINER_COOLTRAINER_MARY + return + +EventScript_SetFuchsiaGymTrainers:: @ 81A6BA1 + settrainerflag TRAINER_TAMER_PHIL + settrainerflag TRAINER_TAMER_EDGAR + settrainerflag TRAINER_JUGGLER_KIRK + settrainerflag TRAINER_JUGGLER_SHAWN + settrainerflag TRAINER_JUGGLER_KAYDEN + settrainerflag TRAINER_JUGGLER_NATE + return + +EventScript_SetSaffronGymTrainers:: @ 81A6BB4 + settrainerflag TRAINER_PSYCHIC_JOHAN + settrainerflag TRAINER_PSYCHIC_TYRON + settrainerflag TRAINER_PSYCHIC_CAMERON + settrainerflag TRAINER_PSYCHIC_PRESTON + settrainerflag TRAINER_CHANNELER_AMANDA + settrainerflag TRAINER_CHANNELER_STACY + settrainerflag TRAINER_CHANNELER_TASHA + return + +EventScript_SetCinnabarGymTrainers:: @ 81A6BCA + settrainerflag TRAINER_SUPER_NERD_ERIK + settrainerflag TRAINER_SUPER_NERD_AVERY + settrainerflag TRAINER_SUPER_NERD_DEREK + settrainerflag TRAINER_SUPER_NERD_ZAC + settrainerflag TRAINER_BURGLAR_QUINN + settrainerflag TRAINER_BURGLAR_RAMON + settrainerflag TRAINER_BURGLAR_DUSTY + return + +EventScript_SetViridianGymTrainers:: @ 81A6BE0 + settrainerflag TRAINER_TAMER_JASON + settrainerflag TRAINER_TAMER_COLE + settrainerflag TRAINER_BLACK_BELT_ATSUSHI + settrainerflag TRAINER_BLACK_BELT_KIYO + settrainerflag TRAINER_BLACK_BELT_TAKASHI + settrainerflag TRAINER_COOLTRAINER_SAMUEL + settrainerflag TRAINER_COOLTRAINER_YUJI + settrainerflag TRAINER_COOLTRAINER_WARREN + return diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc new file mode 100644 index 000000000..e5955d9cb --- /dev/null +++ b/data/scripts/surf.inc @@ -0,0 +1,25 @@ +EventScript_UseSurf:: @ 81A6AC8 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_UseSurfEnd + checkpartymove MOVE_SURF + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_UseSurfEnd + getpartymonname 0, VAR_RESULT + setfieldeffectarg 0, VAR_RESULT + lockall + msgbox Text_1A556E, 5 + compare VAR_RESULT, 0 + goto_if eq, EventScript_UseSurfRelease + msgbox Text_1A55A5 + dofieldeffect FLDEFF_USE_SURF +EventScript_UseSurfRelease:@ 81A6B0B + releaseall +EventScript_UseSurfEnd: @ 81A6B0C + end + +gUnknown_81A6B0D:: @ 81A6B0D + lockall + msgbox Text_CurrentTooFast + releaseall + end diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc new file mode 100644 index 000000000..8d44b2783 --- /dev/null +++ b/data/scripts/trainer_battle.inc @@ -0,0 +1,158 @@ +gUnknown_81A4EB4:: @ 81A4EB4 + lock + special PlayTrainerEncounterMusic + special ScrSpecial_EndTrainerApproach + waitstate + goto EventScript_1A4FC7 + +EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 + lock + faceplayer + applymovement VAR_LAST_TALKED, Movement_1A4FC5 + waitmovement 0 + specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + compare VAR_RESULT, 0 + goto_if ne, EventScript_1A4EE8 + special PlayTrainerEncounterMusic + special SetUpTrainerMovement + goto EventScript_1A4FC7 + +EventScript_1A4EE8:: @ 81A4EE8 + ontrainerbattleend + +EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 + lock + faceplayer + call EventScript_1A4FBA + specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + compare VAR_RESULT, 0 + goto_if ne, EventScript_1A4F20 + special CheckForAlivePartyMons + compare VAR_RESULT, 0 + goto_if ne, EventScript_1A4F19 + special PlayTrainerEncounterMusic + special SetUpTrainerMovement + goto EventScript_1A4FC7 + +EventScript_1A4F19:: @ 81A4F19 + special ScrSpecial_ShowTrainerNonBattlingSpeech + waitmessage + waitbuttonpress + release + end + +EventScript_1A4F20:: @ 81A4F20 + ontrainerbattleend + +EventScript_DoTrainerBattle:: @ 81A4F21 + applymovement VAR_LAST_TALKED, Movement_1A4FC5 + waitmovement 0 + special PlayTrainerEncounterMusic + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A501A + battlebegin + ontrainerbattleend + +EventScript_TryDoRematchBattle:: @ 81A4F3E + call EventScript_1A4FBA + specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag + compare VAR_RESULT, 0 + goto_if eq, EventScript_1A4F72 + special PlayTrainerEncounterMusic + special SetUpTrainerMovement + special ScrSpecial_ShowTrainerIntroSpeech + waitmessage + waitbuttonpress + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A4FB8 + special ScrSpecial_StartTrainerEyeRematch + waitstate + releaseall + end + +EventScript_1A4F72:: @ 81A4F72 + ontrainerbattleend + +EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 + specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag + compare VAR_RESULT, 0 + goto_if eq, EventScript_1A4FB0 + special CheckForAlivePartyMons + compare VAR_RESULT, 0 + goto_if ne, EventScript_1A4FB1 + special PlayTrainerEncounterMusic + special SetUpTrainerMovement + special ScrSpecial_ShowTrainerIntroSpeech + waitmessage + waitbuttonpress + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A4FB8 + special ScrSpecial_StartTrainerEyeRematch + waitstate + releaseall + end + +EventScript_1A4FB0:: @ 81A4FB0 + ontrainerbattleend + +EventScript_1A4FB1:: @ 81A4FB1 + special ScrSpecial_ShowTrainerNonBattlingSpeech + waitmessage + waitbuttonpress + release + end + +EventScript_1A4FB8:: @ 81A4FB8 + releaseall + end + +EventScript_1A4FBA:: @ 81A4FBA + applymovement VAR_LAST_TALKED, Movement_1A4FC5 + waitmovement 0 + return + +Movement_1A4FC5:: @ 81A4FC5 + step_67 + step_end + +EventScript_1A4FC7:: @ 81A4FC7 + special ScrSpecial_ShowTrainerIntroSpeech + waitmessage + waitbuttonpress + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A501A + battlebegin + specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode + compare VAR_RESULT, 0 + goto_if eq, EventScript_1A5017 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A5019 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A5019 + compare VAR_RESULT, 6 + goto_if eq, EventScript_1A5019 + compare VAR_RESULT, 8 + goto_if eq, EventScript_1A5019 + +EventScript_1A5017:: @ 81A5017 + releaseall + end + +EventScript_1A5019:: @ 81A5019 + ontrainerbattleendgoto + +EventScript_1A501A:: @ 81A501A + special SetBattledTrainerFlag + releaseall + end + +gStdScript_Message_WaitButton_AndRelease:: @ 81A501F + message 0x0 + waitmessage + waitbuttonpress + release + return diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc new file mode 100644 index 000000000..0f59cabd1 --- /dev/null +++ b/data/scripts/trainers.inc @@ -0,0 +1,3041 @@ +Route3_EventScript_1A93C9:: @ 81A93C9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_BEN, 0, Text_183560, Text_1835A0 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A93F0 + msgbox Text_1835B4, 6 + end + +EventScript_1A93F0:: @ 81A93F0 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_BEN, 0, Text_1C149D, Text_1835A0 + msgbox Text_1835B4, 6 + end + +Route3_EventScript_1A9407:: @ 81A9407 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CALVIN, 0, Text_183786, Text_1837BD + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A942E + msgbox Text_1837CF, 6 + end + +EventScript_1A942E:: @ 81A942E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_CALVIN, 0, Text_1C1588, Text_1837BD + msgbox Text_1837CF, 6 + end + +Route3_EventScript_1A9445:: @ 81A9445 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_COLTON, 0, Text_1834E6, Text_183509 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A946C + msgbox Text_18351C, 6 + end + +EventScript_1A946C:: @ 81A946C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_COLTON, 0, Text_1C147A, Text_183509 + msgbox Text_18351C, 6 + end + +Route3_EventScript_1A9483:: @ 81A9483 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GREG, 0, Text_183682, Text_1836B3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A94AA + msgbox Text_1836D9, 6 + end + +EventScript_1A94AA:: @ 81A94AA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_GREG, 0, Text_1C1521, Text_1836B3 + msgbox Text_1836D9, 6 + end + +Route3_EventScript_1A94C1:: @ 81A94C1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JAMES, 0, Text_183807, Text_183837 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A94E8 + msgbox Text_183849, 6 + end + +EventScript_1A94E8:: @ 81A94E8 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_JAMES, 0, Text_1C15C5, Text_183837 + msgbox Text_183849, 6 + end + +Route3_EventScript_1A94FF:: @ 81A94FF + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JANICE, 0, Text_183616, Text_18363F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9526 + msgbox Text_18364C, 6 + end + +EventScript_1A9526:: @ 81A9526 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_JANICE, 0, Text_1C14F3, Text_18363F + msgbox Text_18364C, 6 + end + +Route3_EventScript_1A953D:: @ 81A953D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_SALLY, 0, Text_18371B, Text_183746 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9564 + msgbox Text_18374F, 6 + end + +EventScript_1A9564:: @ 81A9564 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_SALLY, 0, Text_1C155D, Text_183746 + msgbox Text_18374F, 6 + end + +Route3_EventScript_1A957B:: @ 81A957B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ROBIN, 0, Text_18387A, Text_183891 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A95A2 + msgbox Text_18389C, 6 + end + +EventScript_1A95A2:: @ 81A95A2 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ROBIN, 0, Text_1C15F9, Text_183891 + msgbox Text_18389C, 6 + end + +Route4_EventScript_1A95B9:: @ 81A95B9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_CRISSY, 0, Text_183906, Text_183938 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A95E0 + msgbox Text_183957, 6 + end + +EventScript_1A95E0:: @ 81A95E0 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_CRISSY, 0, Text_1C160F, Text_183938 + msgbox Text_183957, 6 + end + +Route24_EventScript_1A95F7:: @ 81A95F7 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_TIMMY, 0, Text_188F76, Text_188F95 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A961E + msgbox Text_188FA7, 6 + end + +EventScript_1A961E:: @ 81A961E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_TIMMY, 0, Text_1C3657, Text_188F95 + msgbox Text_188FA7, 6 + end + +Route24_EventScript_1A9635:: @ 81A9635 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CALE, 0, Text_18901B, Text_18908C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A965C + msgbox Text_18909E, 6 + end + +EventScript_1A965C:: @ 81A965C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_CALE, 0, Text_1C36DA, Text_18908C + msgbox Text_18909E, 6 + end + +Route24_EventScript_1A9673:: @ 81A9673 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_RELI, 0, Text_188F2C, Text_188F46 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A969A + msgbox Text_188F53, 6 + end + +EventScript_1A969A:: @ 81A969A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_RELI, 0, Text_1C3624, Text_188F46 + msgbox Text_188F53, 6 + end + +Route24_EventScript_1A96B1:: @ 81A96B1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ALI, 0, Text_188FC9, Text_188FE7 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A96D8 + msgbox Text_188FF9, 6 + end + +EventScript_1A96D8:: @ 81A96D8 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ALI, 0, Text_1C3685, Text_188FE7 + msgbox Text_188FF9, 6 + end + +Route24_EventScript_1A96EF:: @ 81A96EF + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_SHANE, 0, Text_188E74, Text_188E94 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9716 + msgbox Text_188EA3, 6 + end + +EventScript_1A9716:: @ 81A9716 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_SHANE, 0, Text_1C35EE, Text_188E94 + msgbox Text_188EA3, 6 + end + +Route24_EventScript_1A972D:: @ 81A972D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_ETHAN, 0, Text_188ED9, Text_188EFA + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9754 + msgbox Text_188F0A, 6 + end + +EventScript_1A9754:: @ 81A9754 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_ETHAN, 0, Text_1C360E, Text_188EFA + msgbox Text_188F0A, 6 + end + +Route25_EventScript_1A976B:: @ 81A976B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOEY, 0, Text_1890C0, Text_1890E6 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9792 + msgbox Text_1890F5, 6 + end + +EventScript_1A9792:: @ 81A9792 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_JOEY, 0, Text_1C33E7, Text_1890E6 + msgbox Text_1890F5, 6 + end + +Route25_EventScript_1A97A9:: @ 81A97A9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAN, 0, Text_189165, Text_1891A6 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A97D0 + msgbox Text_1891B3, 6 + end + +EventScript_1A97D0:: @ 81A97D0 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DAN, 0, Text_1C3404, Text_1891A6 + msgbox Text_1891B3, 6 + end + +Route25_EventScript_1A97E7:: @ 81A97E7 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CHAD, 0, Text_1892A9, Text_1892D9 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A980E + msgbox Text_1892EF, 6 + end + +EventScript_1A980E:: @ 81A980E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_CHAD, 0, Text_1C34D4, Text_1892D9 + msgbox Text_1892EF, 6 + end + +Route25_EventScript_1A9825:: @ 81A9825 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KELSEY, 0, Text_189247, Text_189261 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A984C + msgbox Text_189281, 6 + end + +EventScript_1A984C:: @ 81A984C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_KELSEY, 0, Text_1C349C, Text_189261 + msgbox Text_189281, 6 + end + +Route25_EventScript_1A9863:: @ 81A9863 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_HALEY, 0, Text_189333, Text_189364 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A988A + msgbox Text_189378, 6 + end + +EventScript_1A988A:: @ 81A988A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_HALEY, 0, Text_1C350A, Text_189364 + msgbox Text_189378, 6 + end + +Route25_EventScript_1A98A1:: @ 81A98A1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_FRANKLIN, 0, Text_1893A7, Text_1893EA + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A98C8 + msgbox Text_1893FB, 6 + end + +EventScript_1A98C8:: @ 81A98C8 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_FRANKLIN, 0, Text_1C353B, Text_1893EA + msgbox Text_1893FB, 6 + end + +Route25_EventScript_1A98DF:: @ 81A98DF + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_NOB, 0, Text_189423, Text_189459 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9906 + msgbox Text_18947E, 6 + end + +EventScript_1A9906:: @ 81A9906 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_NOB, 0, Text_1C357E, Text_189459 + msgbox Text_18947E, 6 + end + +Route25_EventScript_1A991D:: @ 81A991D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_WAYNE, 0, Text_1894DE, Text_18950A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9944 + msgbox Text_18951C, 6 + end + +EventScript_1A9944:: @ 81A9944 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_WAYNE, 0, Text_1C35BC, Text_18950A + msgbox Text_18951C, 6 + end + +Route25_EventScript_1A995B:: @ 81A995B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_FLINT, 0, Text_1891EB, Text_189212 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9982 + msgbox Text_18921D, 6 + end + +EventScript_1A9982:: @ 81A9982 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_FLINT, 0, Text_1C3445, Text_189212 + msgbox Text_18921D, 6 + end + +Route6_EventScript_1A9999:: @ 81A9999 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KEIGO, 0, Text_183E9F, Text_183EC0 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A99C0 + msgbox Text_183ED4, 6 + end + +EventScript_1A99C0:: @ 81A99C0 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_KEIGO, 0, Text_1C16E2, Text_183EC0 + msgbox Text_183ED4, 6 + end + +Route6_EventScript_1A99D7:: @ 81A99D7 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_183FF0, Text_18401A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A99FE + msgbox Text_18402B, 6 + end + +EventScript_1A99FE:: @ 81A99FE + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_1C176B, Text_18401A + msgbox Text_18402B, 6 + end + +Route6_EventScript_1A9A15:: @ 81A9A15 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RICKY, 0, Text_183E04, Text_183E2A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9A3C + msgbox Text_183E3C, 6 + end + +EventScript_1A9A3C:: @ 81A9A3C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_RICKY, 0, Text_1C163C, Text_183E2A + msgbox Text_183E3C, 6 + end + +Route6_EventScript_1A9A53:: @ 81A9A53 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JEFF, 0, Text_183F07, Text_183F24 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9A7A + msgbox Text_183F51, 6 + end + +EventScript_1A9A7A:: @ 81A9A7A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_JEFF, 0, Text_1C1723, Text_183F24 + msgbox Text_183F51, 6 + end + +Route6_EventScript_1A9A91:: @ 81A9A91 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_NANCY, 0, Text_183E4E, Text_183E79 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9AB8 + msgbox Text_183E8D, 6 + end + +EventScript_1A9AB8:: @ 81A9AB8 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_NANCY, 0, Text_1C166D, Text_183E79 + msgbox Text_183E8D, 6 + end + +Route6_EventScript_1A9ACF:: @ 81A9ACF + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ISABELLE, 0, Text_183F90, Text_183FAB + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9AF6 + msgbox Text_183FC4, 6 + end + +EventScript_1A9AF6:: @ 81A9AF6 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ISABELLE, 0, Text_1C1746, Text_183FAB + msgbox Text_183FC4, 6 + end + +Route11_EventScript_1A9B0D:: @ 81A9B0D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_EDDIE, 0, Text_184FBD, Text_184FD8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9B34 + msgbox Text_184FEF, 6 + end + +EventScript_1A9B34:: @ 81A9B34 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_EDDIE, 0, Text_1C1DB5, Text_184FD8 + msgbox Text_184FEF, 6 + end + +Route11_EventScript_1A9B4B:: @ 81A9B4B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DILLON, 0, Text_18506A, Text_18509B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9B72 + msgbox Text_1850CF, 6 + end + +EventScript_1A9B72:: @ 81A9B72 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DILLON, 0, Text_1C1E1F, Text_18509B + msgbox Text_1850CF, 6 + end + +Route11_EventScript_1A9B89:: @ 81A9B89 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_YASU, 0, Text_18517B, Text_1851AC + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9BB0 + msgbox Text_1851D2, 6 + end + +EventScript_1A9BB0:: @ 81A9BB0 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_YASU, 0, Text_1C1EE2, Text_1851AC + msgbox Text_1851D2, 6 + end + +Route11_EventScript_1A9BC7:: @ 81A9BC7 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAVE, 0, Text_185285, Text_1852C1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9BEE + msgbox Text_1852E3, 6 + end + +EventScript_1A9BEE:: @ 81A9BEE + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DAVE, 0, Text_1C1F40, Text_1852C1 + msgbox Text_1852E3, 6 + end + +Route11_EventScript_1A9C05:: @ 81A9C05 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BRAXTON, 0, Text_185011, Text_185037 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9C2C + msgbox Text_18504A, 6 + end + +EventScript_1A9C2C:: @ 81A9C2C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ENGINEER_BRAXTON, 0, Text_1C1DE1, Text_185037 + msgbox Text_18504A, 6 + end + +Route11_EventScript_1A9C43:: @ 81A9C43 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BERNIE, 0, Text_185236, Text_185250 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9C6A + msgbox Text_185266, 6 + end + +EventScript_1A9C6A:: @ 81A9C6A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ENGINEER_BERNIE, 0, Text_1C1F1D, Text_185250 + msgbox Text_185266, 6 + end + +Route11_EventScript_1A9C81:: @ 81A9C81 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_HUGO, 0, Text_184F01, Text_184F15 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9CA8 + msgbox Text_184F2E, 6 + end + +EventScript_1A9CA8:: @ 81A9CA8 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_HUGO, 0, Text_1C1D50, Text_184F15 + msgbox Text_184F2E, 6 + end + +Route11_EventScript_1A9CBF:: @ 81A9CBF + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_JASPER, 0, Text_184F5D, Text_184F7E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9CE6 + msgbox Text_184F8E, 6 + end + +EventScript_1A9CE6:: @ 81A9CE6 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_JASPER, 0, Text_1C1D79, Text_184F7E + msgbox Text_184F8E, 6 + end + +Route11_EventScript_1A9CFD:: @ 81A9CFD + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DIRK, 0, Text_1850E9, Text_185105 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9D24 + msgbox Text_185114, 6 + end + +EventScript_1A9D24:: @ 81A9D24 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_DIRK, 0, Text_1C1E57, Text_185105 + msgbox Text_185114, 6 + end + +Route11_EventScript_1A9D3B:: @ 81A9D3B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DARIAN, 0, Text_185135, Text_18514E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9D62 + msgbox Text_185161, 6 + end + +EventScript_1A9D62:: @ 81A9D62 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_DARIAN, 0, Text_1C1E9F, Text_18514E + msgbox Text_185161, 6 + end + +Route9_EventScript_1A9D79:: @ 81A9D79 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_BRENT, 0, Text_184A2F, Text_184A6A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9DA0 + msgbox Text_184A8C, 6 + end + +EventScript_1A9DA0:: @ 81A9DA0 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_BRENT, 0, Text_1C1B83, Text_184A6A + msgbox Text_184A8C, 6 + end + +Route9_EventScript_1A9DB7:: @ 81A9DB7 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CONNER, 0, Text_184B18, Text_184B32 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9DDE + msgbox Text_184B3B, 6 + end + +EventScript_1A9DDE:: @ 81A9DDE + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_CONNER, 0, Text_1C1BDC, Text_184B32 + msgbox Text_184B3B, 6 + end + +Route9_EventScript_1A9DF5:: @ 81A9DF5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_CHRIS, 0, Text_184844, Text_18487E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9E1C + msgbox Text_184890, 6 + end + +EventScript_1A9E1C:: @ 81A9E1C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_CHRIS, 0, Text_1C1A5D, Text_18487E + msgbox Text_184890, 6 + end + +Route9_EventScript_1A9E33:: @ 81A9E33 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_DREW, 0, Text_18489E, Text_1848CC + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9E5A + msgbox Text_1848DE, 6 + end + +EventScript_1A9E5A:: @ 81A9E5A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_DREW, 0, Text_1C1A9B, Text_1848CC + msgbox Text_1848DE, 6 + end + +Route9_EventScript_1A9E71:: @ 81A9E71 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALICIA, 0, Text_1847B7, Text_1847DF + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9E98 + msgbox Text_1847F0, 6 + end + +EventScript_1A9E98:: @ 81A9E98 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ALICIA, 0, Text_1C1A2E, Text_1847DF + msgbox Text_1847F0, 6 + end + +Route9_EventScript_1A9EAF:: @ 81A9EAF + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAITLIN, 0, Text_1848FF, Text_18491C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9ED6 + msgbox Text_184931, 6 + end + +EventScript_1A9ED6:: @ 81A9ED6 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CAITLIN, 0, Text_1C1AFB, Text_18491C + msgbox Text_184931, 6 + end + +Route9_EventScript_1A9EED:: @ 81A9EED + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALAN, 0, Text_184ABE, Text_184AD5 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9F14 + msgbox Text_184AF1, 6 + end + +EventScript_1A9F14:: @ 81A9F14 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_ALAN, 0, Text_1C1BBE, Text_184AD5 + msgbox Text_184AF1, 6 + end + +Route9_EventScript_1A9F2B:: @ 81A9F2B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_BRICE, 0, Text_1849DF, Text_184A04 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9F52 + msgbox Text_184A11, 6 + end + +EventScript_1A9F52:: @ 81A9F52 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_BRICE, 0, Text_1C1B5E, Text_184A04 + msgbox Text_184A11, 6 + end + +Route9_EventScript_1A9F69:: @ 81A9F69 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_JEREMY, 0, Text_18495E, Text_18497F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9F90 + msgbox Text_1849B0, 6 + end + +EventScript_1A9F90:: @ 81A9F90 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_JEREMY, 0, Text_1C1B37, Text_18497F + msgbox Text_1849B0, 6 + end + +Route10_EventScript_1A9FA7:: @ 81A9FA7 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_HEIDI, 0, Text_184CF1, Text_184D31 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9FCE + msgbox Text_184D4D, 6 + end + +EventScript_1A9FCE:: @ 81A9FCE + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_HEIDI, 0, Text_1C1C9A, Text_184D31 + msgbox Text_184D4D, 6 + end + +Route10_EventScript_1A9FE5:: @ 81A9FE5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAROL, 0, Text_184E04, Text_184E3B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA00C + msgbox Text_184E5E, 6 + end + +EventScript_1AA00C:: @ 81AA00C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CAROL, 0, Text_1C1D14, Text_184E3B + msgbox Text_184E5E, 6 + end + +Route10_EventScript_1AA023:: @ 81AA023 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_MARK, 0, Text_184B8A, Text_184BE5 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA04A + msgbox Text_184BFB, 6 + end + +EventScript_1AA04A:: @ 81AA04A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_MARK, 0, Text_1C1BFA, Text_184BE5 + msgbox Text_184BFB, 6 + end + +Route10_EventScript_1AA061:: @ 81AA061 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HERMAN, 0, Text_184C86, Text_184CA7 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA088 + msgbox Text_184CBB, 6 + end + +EventScript_1AA088:: @ 81AA088 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_HERMAN, 0, Text_1C1C76, Text_184CA7 + msgbox Text_184CBB, 6 + end + +Route10_EventScript_1AA09F:: @ 81AA09F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_CLARK, 0, Text_184C1D, Text_184C2D + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA0C6 + msgbox Text_184C60, 6 + end + +EventScript_1AA0C6:: @ 81AA0C6 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_CLARK, 0, Text_1C1C4F, Text_184C2D + msgbox Text_184C60, 6 + end + +Route10_EventScript_1AA0DD:: @ 81AA0DD + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_TRENT, 0, Text_184DAA, Text_184DCE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA104 + msgbox Text_184DE4, 6 + end + +EventScript_1AA104:: @ 81AA104 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_TRENT, 0, Text_1C1CD3, Text_184DCE + msgbox Text_184DE4, 6 + end + +Route8_EventScript_1AA11B:: @ 81AA11B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_PAIGE, 0, Text_1841ED, Text_184210 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA142 + msgbox Text_18421B, 6 + end + +EventScript_1AA142:: @ 81AA142 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_PAIGE, 0, Text_1C1834, Text_184210 + msgbox Text_18421B, 6 + end + +Route8_EventScript_1AA159:: @ 81AA159 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ANDREA, 0, Text_184321, Text_184346 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA180 + msgbox Text_184350, 6 + end + +EventScript_1AA180:: @ 81AA180 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ANDREA, 0, Text_1C18AA, Text_184346 + msgbox Text_184350, 6 + end + +Route8_EventScript_1AA197:: @ 81AA197 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MEGAN, 0, Text_18437A, Text_1843A6 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA1BE + msgbox Text_1843D2, 6 + end + +EventScript_1AA1BE:: @ 81AA1BE + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_MEGAN, 0, Text_1C18DC, Text_1843A6 + msgbox Text_1843D2, 6 + end + +Route8_EventScript_1AA1D5:: @ 81AA1D5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JULIA, 0, Text_1844AC, Text_1844D6 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA1FC + msgbox Text_1844FD, 6 + end + +EventScript_1AA1FC:: @ 81AA1FC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_JULIA, 0, Text_1C1955, Text_1844D6 + msgbox Text_1844FD, 6 + end + +Route8_EventScript_1AA213:: @ 81AA213 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_AIDAN, 0, Text_1840C5, Text_184100 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA23A + msgbox Text_18410E, 6 + end + +EventScript_1AA23A:: @ 81AA23A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_AIDAN, 0, Text_1C1793, Text_184100 + msgbox Text_18410E, 6 + end + +Route8_EventScript_1AA251:: @ 81AA251 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_GLENN, 0, Text_18417C, Text_1841B6 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA278 + msgbox Text_1841C8, 6 + end + +EventScript_1AA278:: @ 81AA278 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_GLENN, 0, Text_1C17F1, Text_1841B6 + msgbox Text_1841C8, 6 + end + +Route8_EventScript_1AA28F:: @ 81AA28F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_LESLIE, 0, Text_184257, Text_18427A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA2B6 + msgbox Text_1842B3, 6 + end + +EventScript_1AA2B6:: @ 81AA2B6 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_LESLIE, 0, Text_1C1873, Text_18427A + msgbox Text_1842B3, 6 + end + +Route8_EventScript_1AA2CD:: @ 81AA2CD + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_STAN, 0, Text_18412F, Text_18414D + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA2F4 + msgbox Text_184162, 6 + end + +EventScript_1AA2F4:: @ 81AA2F4 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_STAN, 0, Text_1C17CD, Text_18414D + msgbox Text_184162, 6 + end + +Route8_EventScript_1AA30B:: @ 81AA30B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_RICH, 0, Text_184432, Text_18444F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA332 + msgbox Text_184466, 6 + end + +EventScript_1AA332:: @ 81AA332 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_RICH, 0, Text_1C191F, Text_18444F + msgbox Text_184466, 6 + end + +Route8_EventScript_1AA349:: @ 81AA349 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1845A4, Text_1845D0, Text_184616 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA374 + msgbox Text_1845F2, 6 + end + +EventScript_1AA374:: @ 81AA374 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1C19E5, Text_1845D0, Text_184616 + msgbox Text_1845F2, 6 + end + +Route8_EventScript_1AA38F:: @ 81AA38F + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_18464A, Text_184675, Text_1846AF + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA3BA + msgbox Text_18468B, 6 + end + +EventScript_1AA3BA:: @ 81AA3BA + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1C1A0D, Text_184675, Text_1846AF + msgbox Text_18468B, 6 + end + +Route8_EventScript_1AA3D5:: @ 81AA3D5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RICARDO, 0, Text_1846E2, Text_1846FC + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA3FC + msgbox Text_184719, 6 + end + +EventScript_1AA3FC:: @ 81AA3FC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_RICARDO, 0, Text_1C199C, Text_1846FC + msgbox Text_184719, 6 + end + +Route8_EventScript_1AA413:: @ 81AA413 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAREN, 0, Text_184742, Text_184767 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA43A + msgbox Text_18477A, 6 + end + +EventScript_1AA43A:: @ 81AA43A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JAREN, 0, Text_1C19BC, Text_184767 + msgbox Text_18477A, 6 + end + +Route12_EventScript_1AA451:: @ 81AA451 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NED, 0, Text_185402, Text_18541B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA478 + msgbox Text_185432, 6 + end + +EventScript_1AA478:: @ 81AA478 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_NED, 0, Text_1C1F9D, Text_18541B + msgbox Text_185432, 6 + end + +Route12_EventScript_1AA48F:: @ 81AA48F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CHIP, 0, Text_18544E, Text_185475 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA4B6 + msgbox Text_185488, 6 + end + +EventScript_1AA4B6:: @ 81AA4B6 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_CHIP, 0, Text_1C1FD8, Text_185475 + msgbox Text_185488, 6 + end + +Route12_EventScript_1AA4CD:: @ 81AA4CD + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_HANK, 0, Text_1855E1, Text_185606 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA4F4 + msgbox Text_185616, 6 + end + +EventScript_1AA4F4:: @ 81AA4F4 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_HANK, 0, Text_1C209C, Text_185606 + msgbox Text_185616, 6 + end + +Route12_EventScript_1AA50B:: @ 81AA50B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ELLIOT, 0, Text_185682, Text_1856D0 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA532 + msgbox Text_1856DF, 6 + end + +EventScript_1AA532:: @ 81AA532 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_ELLIOT, 0, Text_1C20D4, Text_1856D0 + msgbox Text_1856DF, 6 + end + +Route12_EventScript_1AA549:: @ 81AA549 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ANDREW, 0, Text_18570E, Text_185744 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA570 + msgbox Text_18574D, 6 + end + +EventScript_1AA570:: @ 81AA570 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_ANDREW, 0, Text_1C2134, Text_185744 + msgbox Text_18574D, 6 + end + +Route12_EventScript_1AA587:: @ 81AA587 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ROCKER_LUCA, 0, Text_185547, Text_18559B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA5AE + msgbox Text_1855A6, 6 + end + +EventScript_1AA5AE:: @ 81AA5AE + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ROCKER_LUCA, 0, Text_1C203B, Text_18559B + msgbox Text_1855A6, 6 + end + +Route12_EventScript_1AA5C5:: @ 81AA5C5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JUSTIN, 0, Text_1854B9, Text_1854ED + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA5EC + msgbox Text_1854F2, 6 + end + +EventScript_1AA5EC:: @ 81AA5EC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_JUSTIN, 0, Text_1C2008, Text_1854ED + msgbox Text_1854F2, 6 + end + +Route12_EventScript_1AA603:: @ 81AA603 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1857C5, Text_1857F1, Text_185842 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA62E + msgbox Text_18581F, 6 + end + +EventScript_1AA62E:: @ 81AA62E + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C216B, Text_1857F1, Text_185842 + msgbox Text_18581F, 6 + end + +Route12_EventScript_1AA649:: @ 81AA649 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1858A6, Text_1858D0, Text_185908 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA674 + msgbox Text_1858E2, 6 + end + +EventScript_1AA674:: @ 81AA674 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C219B, Text_1858D0, Text_185908 + msgbox Text_1858E2, 6 + end + +Route13_EventScript_1AA68F:: @ 81AA68F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JARED, 0, Text_185D05, Text_185D1D + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA6B6 + msgbox Text_185D33, 6 + end + +EventScript_1AA6B6:: @ 81AA6B6 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JARED, 0, Text_1C236B, Text_185D1D + msgbox Text_185D33, 6 + end + +Route13_EventScript_1AA6CD:: @ 81AA6CD + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LOLA, 0, Text_185BFC, Text_185C1F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA6F4 + msgbox Text_185C35, 6 + end + +EventScript_1AA6F4:: @ 81AA6F4 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_LOLA, 0, Text_1C2306, Text_185C1F + msgbox Text_185C35, 6 + end + +Route13_EventScript_1AA70B:: @ 81AA70B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_SHEILA, 0, Text_185C69, Text_185C95 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA732 + msgbox Text_185CA8, 6 + end + +EventScript_1AA732:: @ 81AA732 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_SHEILA, 0, Text_1C2340, Text_185C95 + msgbox Text_185CA8, 6 + end + +Route13_EventScript_1AA749:: @ 81AA749 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_185955, Text_18597E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA770 + msgbox Text_1859A2, 6 + end + +EventScript_1AA770:: @ 81AA770 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_1C21EE, Text_18597E + msgbox Text_1859A2, 6 + end + +Route13_EventScript_1AA787:: @ 81AA787 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_PERRY, 0, Text_185B8F, Text_185BCA + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA7AE + msgbox Text_185BDB, 6 + end + +EventScript_1AA7AE:: @ 81AA7AE + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_PERRY, 0, Text_1C22CA, Text_185BCA + msgbox Text_185BDB, 6 + end + +Route13_EventScript_1AA7C5:: @ 81AA7C5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_185D3D, Text_185D7B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA7EC + msgbox Text_185D89, 6 + end + +EventScript_1AA7EC:: @ 81AA7EC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_1C2383, Text_185D7B + msgbox Text_185D89, 6 + end + +Route13_EventScript_1AA803:: @ 81AA803 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALMA, 0, Text_185B12, Text_185B48 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA82A + msgbox Text_185B67, 6 + end + +EventScript_1AA82A:: @ 81AA82A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ALMA, 0, Text_1C2299, Text_185B48 + msgbox Text_185B67, 6 + end + +Route13_EventScript_1AA841:: @ 81AA841 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SUSIE, 0, Text_1859CF, Text_1859EC + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA868 + msgbox Text_1859F9, 6 + end + +EventScript_1AA868:: @ 81AA868 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_SUSIE, 0, Text_1C220C, Text_1859EC + msgbox Text_1859F9, 6 + end + +Route13_EventScript_1AA87F:: @ 81AA87F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_VALERIE, 0, Text_185A37, Text_185A56 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA8A6 + msgbox Text_185A62, 6 + end + +EventScript_1AA8A6:: @ 81AA8A6 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_VALERIE, 0, Text_1C223C, Text_185A56 + msgbox Text_185A62, 6 + end + +Route13_EventScript_1AA8BD:: @ 81AA8BD + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_GWEN, 0, Text_185A91, Text_185AC1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA8E4 + msgbox Text_185ADE, 6 + end + +EventScript_1AA8E4:: @ 81AA8E4 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_GWEN, 0, Text_1C225B, Text_185AC1 + msgbox Text_185ADE, 6 + end + +Route14_EventScript_1AA8FB:: @ 81AA8FB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_MALIK, 0, Text_186344, Text_186362 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA922 + msgbox Text_18636E, 6 + end + +EventScript_1AA922:: @ 81AA922 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_MALIK, 0, Text_1C25D6, Text_186362 + msgbox Text_18636E, 6 + end + +Route14_EventScript_1AA939:: @ 81AA939 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LUKAS, 0, Text_1861F7, Text_186223 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA960 + msgbox Text_186239, 6 + end + +EventScript_1AA960:: @ 81AA960 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_LUKAS, 0, Text_1C2531, Text_186223 + msgbox Text_186239, 6 + end + +Route14_EventScript_1AA977:: @ 81AA977 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ISAAC, 0, Text_186263, Text_186291 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA99E + msgbox Text_18629D, 6 + end + +EventScript_1AA99E:: @ 81AA99E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ISAAC, 0, Text_1C2572, Text_186291 + msgbox Text_18629D, 6 + end + +Route14_EventScript_1AA9B5:: @ 81AA9B5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_GERALD, 0, Text_1862BD, Text_1862EF + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AA9DC + msgbox Text_1862F8, 6 + end + +EventScript_1AA9DC:: @ 81AA9DC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_GERALD, 0, Text_1C259E, Text_1862EF + msgbox Text_1862F8, 6 + end + +Route14_EventScript_1AA9F3:: @ 81AA9F3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1860D9, Text_18610A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAA1A + msgbox Text_18611D, 6 + end + +EventScript_1AAA1A:: @ 81AAA1A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1C24CB, Text_18610A + msgbox Text_18611D, 6 + end + +Route14_EventScript_1AAA31:: @ 81AAA31 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BENNY, 0, Text_18618E, Text_1861B3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAA58 + msgbox Text_1861BE, 6 + end + +EventScript_1AAA58:: @ 81AAA58 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_BENNY, 0, Text_1C2505, Text_1861B3 + msgbox Text_1861BE, 6 + end + +Route14_EventScript_1AAA6F:: @ 81AAA6F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CARTER, 0, Text_185E4D, Text_185E81 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAA96 + msgbox Text_185E9C, 6 + end + +EventScript_1AAA96:: @ 81AAA96 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CARTER, 0, Text_1C23C1, Text_185E81 + msgbox Text_185E9C, 6 + end + +Route14_EventScript_1AAAAD:: @ 81AAAAD + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MITCH, 0, Text_185EDF, Text_185F0B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAAD4 + msgbox Text_185F1A, 6 + end + +EventScript_1AAAD4:: @ 81AAAD4 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MITCH, 0, Text_1C23EF, Text_185F0B + msgbox Text_185F1A, 6 + end + +Route14_EventScript_1AAAEB:: @ 81AAAEB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BECK, 0, Text_185F46, Text_185FAE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAB12 + msgbox Text_185FBB, 6 + end + +EventScript_1AAB12:: @ 81AAB12 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_BECK, 0, Text_1C2425, Text_185FAE + msgbox Text_185FBB, 6 + end + +Route14_EventScript_1AAB29:: @ 81AAB29 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MARLON, 0, Text_186021, Text_18607C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAB50 + msgbox Text_186091, 6 + end + +EventScript_1AAB50:: @ 81AAB50 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MARLON, 0, Text_1C2461, Text_18607C + msgbox Text_186091, 6 + end + +Route14_EventScript_1AAB67:: @ 81AAB67 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1863B7, Text_1863EA, Text_18642E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAB92 + msgbox Text_18640D, 6 + end + +EventScript_1AAB92:: @ 81AAB92 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1C25FB, Text_1863EA, Text_18642E + msgbox Text_18640D, 6 + end + +Route14_EventScript_1AABAD:: @ 81AABAD + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_18645B, Text_186487, Text_1864D3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AABD8 + msgbox Text_18649C, 6 + end + +EventScript_1AABD8:: @ 81AABD8 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1C261B, Text_186487, Text_1864D3 + msgbox Text_18649C, 6 + end + +Route15_EventScript_1AABF3:: @ 81AABF3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ERNEST, 0, Text_1868B6, Text_1868E8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAC1A + msgbox Text_1868F1, 6 + end + +EventScript_1AAC1A:: @ 81AAC1A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ERNEST, 0, Text_1C27E7, Text_1868E8 + msgbox Text_1868F1, 6 + end + +Route15_EventScript_1AAC31:: @ 81AAC31 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ALEX, 0, Text_186936, Text_186968 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAC58 + msgbox Text_18697C, 6 + end + +EventScript_1AAC58:: @ 81AAC58 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ALEX, 0, Text_1C2814, Text_186968 + msgbox Text_18697C, 6 + end + +Route15_EventScript_1AAC6F:: @ 81AAC6F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_GRACE, 0, Text_18678B, Text_1867C1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAC96 + msgbox Text_1867DA, 6 + end + +EventScript_1AAC96:: @ 81AAC96 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_GRACE, 0, Text_1C2753, Text_1867C1 + msgbox Text_1867DA, 6 + end + +Route15_EventScript_1AACAD:: @ 81AACAD + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_OLIVIA, 0, Text_18680C, Text_186841 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AACD4 + msgbox Text_18686F, 6 + end + +EventScript_1AACD4:: @ 81AACD4 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_OLIVIA, 0, Text_1C279D, Text_186841 + msgbox Text_18686F, 6 + end + +Route15_EventScript_1AACEB:: @ 81AACEB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_18664F, Text_18667A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAD12 + msgbox Text_18668D, 6 + end + +EventScript_1AAD12:: @ 81AAD12 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_1C26D3, Text_18667A + msgbox Text_18668D, 6 + end + +Route15_EventScript_1AAD29:: @ 81AAD29 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1866D1, Text_186707 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAD50 + msgbox Text_18671A, 6 + end + +EventScript_1AAD50:: @ 81AAD50 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1C2717, Text_186707 + msgbox Text_18671A, 6 + end + +Route15_EventScript_1AAD67:: @ 81AAD67 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_YAZMIN, 0, Text_186A22, Text_186A40 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAD8E + msgbox Text_186A55, 6 + end + +EventScript_1AAD8E:: @ 81AAD8E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_YAZMIN, 0, Text_1C287D, Text_186A40 + msgbox Text_186A55, 6 + end + +Route15_EventScript_1AADA5:: @ 81AADA5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KINDRA, 0, Text_18650B, Text_186549 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AADCC + msgbox Text_18655A, 6 + end + +EventScript_1AADCC:: @ 81AADCC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_KINDRA, 0, Text_1C2650, Text_186549 + msgbox Text_18655A, 6 + end + +Route15_EventScript_1AADE3:: @ 81AADE3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_BECKY, 0, Text_1865D3, Text_186612 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAE0A + msgbox Text_18661D, 6 + end + +EventScript_1AAE0A:: @ 81AAE0A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_BECKY, 0, Text_1C268D, Text_186612 + msgbox Text_18661D, 6 + end + +Route15_EventScript_1AAE21:: @ 81AAE21 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CELIA, 0, Text_1869BA, Text_1869E6 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAE48 + msgbox Text_1869F4, 6 + end + +EventScript_1AAE48:: @ 81AAE48 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CELIA, 0, Text_1C2846, Text_1869E6 + msgbox Text_1869F4, 6 + end + +Route15_EventScript_1AAE5F:: @ 81AAE5F + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186A95, Text_186ACB, Text_186B46 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAE8A + msgbox Text_186B0A, 6 + end + +EventScript_1AAE8A:: @ 81AAE8A + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28A1, Text_186ACB, Text_186B46 + msgbox Text_186B0A, 6 + end + +Route15_EventScript_1AAEA5:: @ 81AAEA5 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186B89, Text_186BB1, Text_186BFE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAED0 + msgbox Text_186BD2, 6 + end + +EventScript_1AAED0:: @ 81AAED0 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28EC, Text_186BB1, Text_186BFE + msgbox Text_186BD2, 6 + end + +Route16_EventScript_1AAEEB:: @ 81AAEEB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LAO, 0, Text_186C4D, Text_186C5F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAF12 + msgbox Text_186C75, 6 + end + +EventScript_1AAF12:: @ 81AAF12 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_LAO, 0, Text_1C2913, Text_186C5F + msgbox Text_186C75, 6 + end + +Route16_EventScript_1AAF29:: @ 81AAF29 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_HIDEO, 0, Text_186D39, Text_186D52 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAF50 + msgbox Text_186D5A, 6 + end + +EventScript_1AAF50:: @ 81AAF50 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_HIDEO, 0, Text_1C297B, Text_186D52 + msgbox Text_186D5A, 6 + end + +Route16_EventScript_1AAF67:: @ 81AAF67 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RUBEN, 0, Text_186E86, Text_186EB4 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAF8E + msgbox Text_186EC7, 6 + end + +EventScript_1AAF8E:: @ 81AAF8E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_RUBEN, 0, Text_1C29EB, Text_186EB4 + msgbox Text_186EC7, 6 + end + +Route16_EventScript_1AAFA5:: @ 81AAFA5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_KOJI, 0, Text_186CA2, Text_186CBB + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AAFCC + msgbox Text_186CC5, 6 + end + +EventScript_1AAFCC:: @ 81AAFCC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_KOJI, 0, Text_1C2925, Text_186CBB + msgbox Text_186CC5, 6 + end + +Route16_EventScript_1AAFE3:: @ 81AAFE3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_LUKE, 0, Text_186CE5, Text_186D06 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB00A + msgbox Text_186D16, 6 + end + +EventScript_1AB00A:: @ 81AB00A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_LUKE, 0, Text_1C2944, Text_186D06 + msgbox Text_186D16, 6 + end + +Route16_EventScript_1AB021:: @ 81AB021 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_CAMRON, 0, Text_186DD9, Text_186E0D + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB048 + msgbox Text_186E1C, 6 + end + +EventScript_1AB048:: @ 81AB048 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_CAMRON, 0, Text_1C29B0, Text_186E0D + msgbox Text_186E1C, 6 + end + +Route16_EventScript_1AB05F:: @ 81AB05F + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_186FBD, Text_186FFA, Text_187057 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB08A + msgbox Text_187027, 6 + end + +EventScript_1AB08A:: @ 81AB08A + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A19, Text_186FFA, Text_187057 + msgbox Text_187027, 6 + end + +Route16_EventScript_1AB0A5:: @ 81AB0A5 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_187097, Text_1870CC, Text_187120 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB0D0 + msgbox Text_1870F9, 6 + end + +EventScript_1AB0D0:: @ 81AB0D0 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A53, Text_1870CC, Text_187120 + msgbox Text_1870F9, 6 + end + +Route17_EventScript_1AB0EB:: @ 81AB0EB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_BILLY, 0, Text_1872BD, Text_1872E3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB112 + msgbox Text_1872EB, 6 + end + +EventScript_1AB112:: @ 81AB112 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_BILLY, 0, Text_1C2B06, Text_1872E3 + msgbox Text_1872EB, 6 + end + +Route17_EventScript_1AB129:: @ 81AB129 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_NIKOLAS, 0, Text_18730A, Text_187325 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB150 + msgbox Text_187333, 6 + end + +EventScript_1AB150:: @ 81AB150 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_NIKOLAS, 0, Text_1C2B2C, Text_187325 + msgbox Text_187333, 6 + end + +Route17_EventScript_1AB167:: @ 81AB167 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAXON, 0, Text_187456, Text_187472 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB18E + msgbox Text_187479, 6 + end + +EventScript_1AB18E:: @ 81AB18E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JAXON, 0, Text_1C2BE6, Text_187472 + msgbox Text_187479, 6 + end + +Route17_EventScript_1AB1A5:: @ 81AB1A5 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_WILLIAM, 0, Text_18749B, Text_1874B6 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB1CC + msgbox Text_1874C9, 6 + end + +EventScript_1AB1CC:: @ 81AB1CC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_WILLIAM, 0, Text_1C2C10, Text_1874B6 + msgbox Text_1874C9, 6 + end + +Route17_EventScript_1AB1E3:: @ 81AB1E3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_RAUL, 0, Text_18717E, Text_1871AE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB20A + msgbox Text_1871BA, 6 + end + +EventScript_1AB20A:: @ 81AB20A + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_RAUL, 0, Text_1C2A88, Text_1871AE + msgbox Text_1871BA, 6 + end + +Route17_EventScript_1AB221:: @ 81AB221 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ISAIAH, 0, Text_187228, Text_187254 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB248 + msgbox Text_18725A, 6 + end + +EventScript_1AB248:: @ 81AB248 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_ISAIAH, 0, Text_1C2AC4, Text_187254 + msgbox Text_18725A, 6 + end + +Route17_EventScript_1AB25F:: @ 81AB25F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ZEEK, 0, Text_187362, Text_187395 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB286 + msgbox Text_18739F, 6 + end + +EventScript_1AB286:: @ 81AB286 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_ZEEK, 0, Text_1C2B5E, Text_187395 + msgbox Text_18739F, 6 + end + +Route17_EventScript_1AB29D:: @ 81AB29D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_JAMAL, 0, Text_1873D1, Text_1873EB + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB2C4 + msgbox Text_1873FF, 6 + end + +EventScript_1AB2C4:: @ 81AB2C4 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_JAMAL, 0, Text_1C2B9C, Text_1873EB + msgbox Text_1873FF, 6 + end + +Route17_EventScript_1AB2DB:: @ 81AB2DB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_COREY, 0, Text_18741D, Text_187429 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB302 + msgbox Text_187432, 6 + end + +EventScript_1AB302:: @ 81AB302 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_COREY, 0, Text_1C2BDA, Text_187429 + msgbox Text_187432, 6 + end + +Route17_EventScript_1AB319:: @ 81AB319 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_VIRGIL, 0, Text_18727D, Text_187295 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB340 + msgbox Text_1872A5, 6 + end + +EventScript_1AB340:: @ 81AB340 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_VIRGIL, 0, Text_1C2AF0, Text_187295 + msgbox Text_1872A5, 6 + end + +Route18_EventScript_1AB357:: @ 81AB357 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_WILTON, 0, Text_187640, Text_187672 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB37E + msgbox Text_187677, 6 + end + +EventScript_1AB37E:: @ 81AB37E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_WILTON, 0, Text_1C2C2B, Text_187672 + msgbox Text_187677, 6 + end + +Route18_EventScript_1AB395:: @ 81AB395 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_18768C, Text_1876B3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB3BC + msgbox Text_1876C5, 6 + end + +EventScript_1AB3BC:: @ 81AB3BC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_1C2C7B, Text_1876B3 + msgbox Text_1876C5, 6 + end + +Route18_EventScript_1AB3D3:: @ 81AB3D3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_JACOB, 0, Text_187704, Text_187726 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB3FA + msgbox Text_18772C, 6 + end + +EventScript_1AB3FA:: @ 81AB3FA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_JACOB, 0, Text_1C2CA8, Text_187726 + msgbox Text_18772C, 6 + end + +Route19_EventScript_1AB411:: @ 81AB411 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1877A3, Text_1877DF + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB438 + msgbox Text_1877EE, 6 + end + +EventScript_1AB438:: @ 81AB438 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1C2CEE, Text_1877DF + msgbox Text_1877EE, 6 + end + +Route19_EventScript_1AB44F:: @ 81AB44F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_REECE, 0, Text_187811, Text_18783E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB476 + msgbox Text_187852, 6 + end + +EventScript_1AB476:: @ 81AB476 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_REECE, 0, Text_1C2D19, Text_18783E + msgbox Text_187852, 6 + end + +Route19_EventScript_1AB48D:: @ 81AB48D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_187884, Text_1878A5 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB4B4 + msgbox Text_1878B1, 6 + end + +EventScript_1AB4B4:: @ 81AB4B4 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_1C2D4B, Text_1878A5 + msgbox Text_1878B1, 6 + end + +Route19_EventScript_1AB4CB:: @ 81AB4CB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1878DD, Text_1878F8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB4F2 + msgbox Text_1878FE, 6 + end + +EventScript_1AB4F2:: @ 81AB4F2 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1C2D7D, Text_1878F8 + msgbox Text_1878FE, 6 + end + +Route19_EventScript_1AB509:: @ 81AB509 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DAVID, 0, Text_187925, Text_187955 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB530 + msgbox Text_18795B, 6 + end + +EventScript_1AB530:: @ 81AB530 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DAVID, 0, Text_1C2DA7, Text_187955 + msgbox Text_18795B, 6 + end + +Route19_EventScript_1AB547:: @ 81AB547 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TONY, 0, Text_187985, Text_1879C3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB56E + msgbox Text_1879D3, 6 + end + +EventScript_1AB56E:: @ 81AB56E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_TONY, 0, Text_1C2DE9, Text_1879C3 + msgbox Text_1879D3, 6 + end + +Route19_EventScript_1AB585:: @ 81AB585 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_AXLE, 0, Text_187AFA, Text_187B25 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB5AC + msgbox Text_187B35, 6 + end + +EventScript_1AB5AC:: @ 81AB5AC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_AXLE, 0, Text_1C2EC0, Text_187B25 + msgbox Text_187B35, 6 + end + +Route19_EventScript_1AB5C3:: @ 81AB5C3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_187A11, Text_187A44 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB5EA + msgbox Text_187A50, 6 + end + +EventScript_1AB5EA:: @ 81AB5EA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_1C2E4A, Text_187A44 + msgbox Text_187A50, 6 + end + +Route19_EventScript_1AB601:: @ 81AB601 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_187A9E, Text_187AC1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB628 + msgbox Text_187ACA, 6 + end + +EventScript_1AB628:: @ 81AB628 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_1C2E9D, Text_187AC1 + msgbox Text_187ACA, 6 + end + +Route19_EventScript_1AB63F:: @ 81AB63F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_187B5D, Text_187B85 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB666 + msgbox Text_187B94, 6 + end + +EventScript_1AB666:: @ 81AB666 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_1C2EFC, Text_187B85 + msgbox Text_187B94, 6 + end + +Route19_EventScript_1AB67D:: @ 81AB67D + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187C32, Text_187C6F, Text_187CF2 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB6A8 + msgbox Text_187C9E, 6 + end + +EventScript_1AB6A8:: @ 81AB6A8 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2F41, Text_187C6F, Text_187CF2 + msgbox Text_187C9E, 6 + end + +Route19_EventScript_1AB6C3:: @ 81AB6C3 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187D45, Text_187D7E, Text_187DE8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB6EE + msgbox Text_187DAD, 6 + end + +EventScript_1AB6EE:: @ 81AB6EE + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2FAE, Text_187D7E, Text_187DE8 + msgbox Text_187DAD, 6 + end + +Route20_EventScript_1AB709:: @ 81AB709 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_BARRY, 0, Text_187E40, Text_187E7B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB730 + msgbox Text_187E83, 6 + end + +EventScript_1AB730:: @ 81AB730 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_BARRY, 0, Text_1C2FF3, Text_187E7B + msgbox Text_187E83, 6 + end + +Route20_EventScript_1AB747:: @ 81AB747 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DEAN, 0, Text_187FDB, Text_187FF7 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB76E + msgbox Text_187FFE, 6 + end + +EventScript_1AB76E:: @ 81AB76E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DEAN, 0, Text_1C30B0, Text_187FF7 + msgbox Text_187FFE, 6 + end + +Route20_EventScript_1AB785:: @ 81AB785 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_18802E, Text_18805C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB7AC + msgbox Text_18806D, 6 + end + +EventScript_1AB7AC:: @ 81AB7AC + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_1C30ED, Text_18805C + msgbox Text_18806D, 6 + end + +Route20_EventScript_1AB7C3:: @ 81AB7C3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_187F24, Text_187F5A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB7EA + msgbox Text_187F61, 6 + end + +EventScript_1AB7EA:: @ 81AB7EA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_1C305F, Text_187F5A + msgbox Text_187F61, 6 + end + +Route20_EventScript_1AB801:: @ 81AB801 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1880F8, Text_188119 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB828 + msgbox Text_188139, 6 + end + +EventScript_1AB828:: @ 81AB828 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1C3149, Text_188119 + msgbox Text_188139, 6 + end + +Route20_EventScript_1AB83F:: @ 81AB83F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_188218, Text_18825C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB866 + msgbox Text_18827B, 6 + end + +EventScript_1AB866:: @ 81AB866 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_1C31C4, Text_18825C + msgbox Text_18827B, 6 + end + +Route20_EventScript_1AB87D:: @ 81AB87D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_187EBB, Text_187EED + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB8A4 + msgbox Text_187EF6, 6 + end + +EventScript_1AB8A4:: @ 81AB8A4 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_1C302E, Text_187EED + msgbox Text_187EF6, 6 + end + +Route20_EventScript_1AB8BB:: @ 81AB8BB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROGER, 0, Text_18808E, Text_1880AB + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB8E2 + msgbox Text_1880C8, 6 + end + +EventScript_1AB8E2:: @ 81AB8E2 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_ROGER, 0, Text_1C312C, Text_1880AB + msgbox Text_1880C8, 6 + end + +Route20_EventScript_1AB8F9:: @ 81AB8F9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MISSY, 0, Text_188165, Text_1881A3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB920 + msgbox Text_1881B8, 6 + end + +EventScript_1AB920:: @ 81AB920 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_MISSY, 0, Text_1C3185, Text_1881A3 + msgbox Text_1881B8, 6 + end + +Route20_EventScript_1AB937:: @ 81AB937 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_IRENE, 0, Text_187F78, Text_187F92 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB95E + msgbox Text_187FA3, 6 + end + +EventScript_1AB95E:: @ 81AB95E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_IRENE, 0, Text_1C3095, Text_187F92 + msgbox Text_187FA3, 6 + end + +Route21_North_EventScript_1AB975:: @ 81AB975 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_RONALD, 0, Text_18835A, Text_188383 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB99C + msgbox Text_188389, 6 + end + +EventScript_1AB99C:: @ 81AB99C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_RONALD, 0, Text_1C3208, Text_188383 + msgbox Text_188389, 6 + end + +Route21_South_EventScript_1AB9B3:: @ 81AB9B3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CLAUDE, 0, Text_1885D8, Text_1885F8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AB9DA + msgbox Text_188632, 6 + end + +EventScript_1AB9DA:: @ 81AB9DA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_CLAUDE, 0, Text_1C331D, Text_1885F8 + msgbox Text_188632, 6 + end + +Route21_North_EventScript_1AB9F1:: @ 81AB9F1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_WADE, 0, Text_1883C6, Text_1883E9 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABA18 + msgbox Text_18841D, 6 + end + +EventScript_1ABA18:: @ 81ABA18 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_WADE, 0, Text_1C3231, Text_1883E9 + msgbox Text_18841D, 6 + end + +Route21_South_EventScript_1ABA2F:: @ 81ABA2F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NOLAN, 0, Text_18868C, Text_1886AE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABA56 + msgbox Text_1886C5, 6 + end + +EventScript_1ABA56:: @ 81ABA56 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_NOLAN, 0, Text_1C3356, Text_1886AE + msgbox Text_1886C5, 6 + end + +Route21_North_EventScript_1ABA6D:: @ 81ABA6D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_18843C, Text_18845F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABA94 + msgbox Text_188465, 6 + end + +EventScript_1ABA94:: @ 81ABA94 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_1C3264, Text_18845F + msgbox Text_188465, 6 + end + +Route21_South_EventScript_1ABAAB:: @ 81ABAAB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JACK, 0, Text_1884D4, Text_1884F0 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABAD2 + msgbox Text_1884FF, 6 + end + +EventScript_1ABAD2:: @ 81ABAD2 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_JACK, 0, Text_1C3298, Text_1884F0 + msgbox Text_1884FF, 6 + end + +Route21_South_EventScript_1ABAE9:: @ 81ABAE9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JEROME, 0, Text_18851F, Text_188543 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABB10 + msgbox Text_188555, 6 + end + +EventScript_1ABB10:: @ 81ABB10 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_JEROME, 0, Text_1C32D3, Text_188543 + msgbox Text_188555, 6 + end + +Route21_South_EventScript_1ABB27:: @ 81ABB27 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_188592, Text_1885B2 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABB4E + msgbox Text_1885BF, 6 + end + +EventScript_1ABB4E:: @ 81ABB4E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_1C32FD, Text_1885B2 + msgbox Text_1885BF, 6 + end + +Route21_North_EventScript_1ABB65:: @ 81ABB65 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1886E2, Text_188712, Text_18875E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABB90 + msgbox Text_188734, 6 + end + +EventScript_1ABB90:: @ 81ABB90 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C3378, Text_188712, Text_18875E + msgbox Text_188734, 6 + end + +Route21_North_EventScript_1ABBAB:: @ 81ABBAB + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1887B4, Text_1887F1, Text_188850 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABBD6 + msgbox Text_188812, 6 + end + +EventScript_1ABBD6:: @ 81ABBD6 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C33AE, Text_1887F1, Text_188850 + msgbox Text_188812, 6 + end + +OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_18961F, Text_18964D + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABC18 + msgbox Text_189657, 6 + end + +EventScript_1ABC18:: @ 81ABC18 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_1C37B5, Text_18964D + msgbox Text_189657, 6 + end + +OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_18968C, Text_1896AC + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABC56 + msgbox Text_1896C1, 6 + end + +EventScript_1ABC56:: @ 81ABC56 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_1C37E7, Text_1896AC + msgbox Text_1896C1, 6 + end + +OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_FINN, 0, Text_1896F9, Text_189728 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABC94 + msgbox Text_189740, 6 + end + +EventScript_1ABC94:: @ 81ABC94 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_FINN, 0, Text_1C3807, Text_189728 + msgbox Text_189740, 6 + end + +OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_189767, Text_1897A4 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABCD2 + msgbox Text_1897C5, 6 + end + +EventScript_1ABCD2:: @ 81ABCD2 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_1C3835, Text_1897A4 + msgbox Text_1897C5, 6 + end + +OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TOMMY, 0, Text_1897FF, Text_189833 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABD10 + msgbox Text_18984B, 6 + end + +EventScript_1ABD10:: @ 81ABD10 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_TOMMY, 0, Text_1C386A, Text_189833 + msgbox Text_18984B, 6 + end + +OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_SHARON, 0, Text_189883, Text_1898AB + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABD4E + msgbox Text_1898C4, 6 + end + +EventScript_1ABD4E:: @ 81ABD4E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_SHARON, 0, Text_1C389F, Text_1898AB + msgbox Text_1898C4, 6 + end + +OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1898F0, Text_18991B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABD8C + msgbox Text_18992C, 6 + end + +EventScript_1ABD8C:: @ 81ABD8C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1C38CA, Text_18991B + msgbox Text_18992C, 6 + end + +OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_SHEA, 0, Text_189950, Text_18998C + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABDCA + msgbox Text_189998, 6 + end + +EventScript_1ABDCA:: @ 81ABDCA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BLACK_BELT_SHEA, 0, Text_1C38FA, Text_18998C + msgbox Text_189998, 6 + end + +OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HUGH, 0, Text_1899CE, Text_189A0A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABE08 + msgbox Text_189A13, 6 + end + +EventScript_1ABE08:: @ 81ABE08 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BLACK_BELT_HUGH, 0, Text_1C3943, Text_189A0A + msgbox Text_189A13, 6 + end + +OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_BRYCE, 0, Text_189A53, Text_189A92 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABE46 + msgbox Text_189A9F, 6 + end + +EventScript_1ABE46:: @ 81ABE46 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_BRYCE, 0, Text_1C3987, Text_189A92 + msgbox Text_189A9F, 6 + end + +OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CLAIRE, 0, Text_189ACB, Text_189B0B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABE84 + msgbox Text_189B24, 6 + end + +EventScript_1ABE84:: @ 81ABE84 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CLAIRE, 0, Text_1C39C6, Text_189B0B + msgbox Text_189B24, 6 + end + +OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189B4D, Text_189B84, Text_189BDE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABEC6 + msgbox Text_189BA3, 6 + end + +EventScript_1ABEC6:: @ 81ABEC6 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A05, Text_189B84, Text_189BDE + msgbox Text_189BA3, 6 + end + +OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189C33, Text_189C62, Text_189CAB + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABF0C + msgbox Text_189C7E, 6 + end + +EventScript_1ABF0C:: @ 81ABF0C + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A55, Text_189C62, Text_189CAB + msgbox Text_189C7E, 6 + end + +OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_189D5A, Text_189D8B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABF4E + msgbox Text_189DA3, 6 + end + +EventScript_1ABF4E:: @ 81ABF4E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_1C3773, Text_189D8B + msgbox Text_189DA3, 6 + end + +ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_NIKKI, 0, Text_189E42, Text_189E72 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABF8C + msgbox Text_189E9E, 6 + end + +EventScript_1ABF8C:: @ 81ABF8C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_NIKKI, 0, Text_1C3AA7, Text_189E72 + msgbox Text_189E9E, 6 + end + +ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_VIOLET, 0, Text_189ED4, Text_189EFA + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ABFCA + msgbox Text_189F21, 6 + end + +EventScript_1ABFCA:: @ 81ABFCA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_VIOLET, 0, Text_1C3ABF, Text_189EFA + msgbox Text_189F21, 6 + end + +ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_AMIRA, 0, Text_189F63, Text_189F9A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC008 + msgbox Text_189FA8, 6 + end + +EventScript_1AC008:: @ 81AC008 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TUBER_AMIRA, 0, Text_1C3AF2, Text_189F9A + msgbox Text_189FA8, 6 + end + +ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_ALEXIS, 0, Text_189FDB, Text_189FEE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC046 + msgbox Text_18A000, 6 + end + +EventScript_1AC046:: @ 81AC046 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TUBER_ALEXIS, 0, Text_1C3B1D, Text_189FEE + msgbox Text_18A000, 6 + end + +ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_18A01F, Text_18A053 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC084 + msgbox Text_18A082, 6 + end + +EventScript_1AC084:: @ 81AC084 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_1C3B30, Text_18A053 + msgbox Text_18A082, 6 + end + +ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A0C4, Text_18A0F7, Text_18A138 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC0C6 + msgbox Text_18A106, 6 + end + +EventScript_1AC0C6:: @ 81AC0C6 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B6E, Text_18A0F7, Text_18A138 + msgbox Text_18A106, 6 + end + +ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A179, Text_18A1A3, Text_18A1CD + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC10C + msgbox Text_18A1B2, 6 + end + +EventScript_1AC10C:: @ 81AC10C + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B99, Text_18A1A3, Text_18A1CD + msgbox Text_18A1B2, 6 + end + +FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_DAISY, 0, Text_18A3E2, Text_18A40E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC14E + msgbox Text_18A430, 6 + end + +EventScript_1AC14E:: @ 81AC14E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_DAISY, 0, Text_1C3BF6, Text_18A40E + msgbox Text_18A430, 6 + end + +FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_CELINA, 0, Text_18A461, Text_18A49E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC18C + msgbox Text_18A4C6, 6 + end + +EventScript_1AC18C:: @ 81AC18C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_CELINA, 0, Text_1C3C28, Text_18A49E + msgbox Text_18A4C6, 6 + end + +FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_RAYNA, 0, Text_18A50E, Text_18A535 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC1CA + msgbox Text_18A555, 6 + end + +EventScript_1AC1CA:: @ 81AC1CA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_RAYNA, 0, Text_1C3C70, Text_18A535 + msgbox Text_18A555, 6 + end + +FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_JACKI, 0, Text_18A5B9, Text_18A5EE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC208 + msgbox Text_18A601, 6 + end + +EventScript_1AC208:: @ 81AC208 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LADY_JACKI, 0, Text_1C3CB0, Text_18A5EE + msgbox Text_18A601, 6 + end + +FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_GILLIAN, 0, Text_18A645, Text_18A67F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC246 + msgbox Text_18A699, 6 + end + +EventScript_1AC246:: @ 81AC246 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LADY_GILLIAN, 0, Text_1C3CF1, Text_18A67F + msgbox Text_18A699, 6 + end + +FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DESTIN, 0, Text_18A6DA, Text_18A6FE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC284 + msgbox Text_18A715, 6 + end + +EventScript_1AC284:: @ 81AC284 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DESTIN, 0, Text_1C3D47, Text_18A6FE + msgbox Text_18A715, 6 + end + +FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TOBY, 0, Text_18A74A, Text_18A786 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC2C2 + msgbox Text_18A7AC, 6 + end + +EventScript_1AC2C2:: @ 81AC2C2 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_TOBY, 0, Text_1C3D73, Text_18A786 + msgbox Text_18A7AC, 6 + end + +FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_18AAD5, Text_18AB0B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC300 + msgbox Text_18AB37, 6 + end + +EventScript_1AC300:: @ 81AC300 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_1C3BB7, Text_18AB0B + msgbox Text_18AB37, 6 + end + +FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MILO, 0, Text_18AE50, Text_18AEA8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC33E + msgbox Text_18AEB6, 6 + end + +EventScript_1AC33E:: @ 81AC33E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MILO, 0, Text_1C3DA2, Text_18AEA8 + msgbox Text_18AEB6, 6 + end + +FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_18AEDC, Text_18AF39 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC37C + msgbox Text_18AF45, 6 + end + +EventScript_1AC37C:: @ 81AC37C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_1C3E0F, Text_18AF39 + msgbox Text_18AF45, 6 + end + +FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_18AF72, Text_18AFCC + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC3BA + msgbox Text_18AFF2, 6 + end + +EventScript_1AC3BA:: @ 81AC3BA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_1C3E6A, Text_18AFCC + msgbox Text_18AFF2, 6 + end + +SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TYLOR, 0, Text_18B400, Text_18B43B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC3F8 + msgbox Text_18B451, 6 + end + +EventScript_1AC3F8:: @ 81AC3F8 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_TYLOR, 0, Text_1C3ED0, Text_18B43B + msgbox Text_18B451, 6 + end + +SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MYMO, 0, Text_18B48F, Text_18B4C5 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC436 + msgbox Text_18B4D1, 6 + end + +EventScript_1AC436:: @ 81AC436 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_MYMO, 0, Text_1C3F11, Text_18B4C5 + msgbox Text_18B4D1, 6 + end + +SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_18B4FA, Text_18B539 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC474 + msgbox Text_18B573, 6 + end + +EventScript_1AC474:: @ 81AC474 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_1C3F51, Text_18B539 + msgbox Text_18B573, 6 + end + +SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B5C8, Text_18B5F4, Text_18B660 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC4B6 + msgbox Text_18B62E, 6 + end + +EventScript_1AC4B6:: @ 81AC4B6 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3F7B, Text_18B5F4, Text_18B660 + msgbox Text_18B62E, 6 + end + +SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B6C1, Text_18B6EF, Text_18B762 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC4FC + msgbox Text_18B720, 6 + end + +EventScript_1AC4FC:: @ 81AC4FC + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3FB3, Text_18B6EF, Text_18B762 + msgbox Text_18B720, 6 + end + +SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JACLYN, 0, Text_18B7B0, Text_18B7F0 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC53E + msgbox Text_18B7FD, 6 + end + +EventScript_1AC53E:: @ 81AC53E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_JACLYN, 0, Text_1C3FE9, Text_18B7F0 + msgbox Text_18B7FD, 6 + end + +SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_ROSE, 0, Text_18B896, Text_18B8C8 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC57C + msgbox Text_18B8F7, 6 + end + +EventScript_1AC57C:: @ 81AC57C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_ROSE, 0, Text_1C4028, Text_18B8C8 + msgbox Text_18B8F7, 6 + end + +SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_EDWARD, 0, Text_18B959, Text_18B988 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC5BA + msgbox Text_18B9A5, 6 + end + +EventScript_1AC5BA:: @ 81AC5BA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_JUGGLER_EDWARD, 0, Text_1C4057, Text_18B988 + msgbox Text_18B9A5, 6 + end + +SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_18B9EC, Text_18BA47 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC5F8 + msgbox Text_18BA57, 6 + end + +EventScript_1AC5F8:: @ 81AC5F8 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_1C407F, Text_18BA47 + msgbox Text_18BA57, 6 + end + +SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_18BA86, Text_18BAC0 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC636 + msgbox Text_18BAE0, 6 + end + +EventScript_1AC636:: @ 81AC636 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_1C40D9, Text_18BAC0 + msgbox Text_18BAE0, 6 + end + +SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC678 + msgbox Text_18BBF6, 6 + end + +EventScript_1AC678:: @ 81AC678 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_1C4138, Text_18BBE2, Text_18BC24 + msgbox Text_18BBF6, 6 + end + +SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BC5A, Text_18BC84, Text_18BCCF + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC6BE + msgbox Text_18BCAE, 6 + end + +EventScript_1AC6BE:: @ 81AC6BE + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_1C4166, Text_18BC84, Text_18BCCF + msgbox Text_18BCAE, 6 + end + +SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_EARL, 0, Text_18BB2D, Text_18BB62 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC700 + msgbox Text_18BB8B, 6 + end + +EventScript_1AC700:: @ 81AC700 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_EARL, 0, Text_1C40FA, Text_18BB62 + msgbox Text_18BB8B, 6 + end + +SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_STANLY, 0, Text_18BE5D, Text_18BE9B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC73E + msgbox Text_18BEA0, 6 + end + +EventScript_1AC73E:: @ 81AC73E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_STANLY, 0, Text_1C4196, Text_18BE9B + msgbox Text_18BEA0, 6 + end + +SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_18BF05, Text_18BF33 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC77C + msgbox Text_18BF6C, 6 + end + +EventScript_1AC77C:: @ 81AC77C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_1C41D4, Text_18BF33 + msgbox Text_18BF6C, 6 + end + +SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LARRY, 0, Text_18BFC5, Text_18C03B + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC7BA + msgbox Text_18C04C, 6 + end + +EventScript_1AC7BA:: @ 81AC7BA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_LARRY, 0, Text_1C4210, Text_18C03B + msgbox Text_18C04C, 6 + end + +SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DARYL, 0, Text_18C09C, Text_18C0BB + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC7F8 + msgbox Text_18C0EA, 6 + end + +EventScript_1AC7F8:: @ 81AC7F8 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_DARYL, 0, Text_1C4280, Text_18C0BB + msgbox Text_18C0EA, 6 + end + +SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HECTOR, 0, Text_18C10A, Text_18C140 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC836 + msgbox Text_18C17A, 6 + end + +EventScript_1AC836:: @ 81AC836 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_HECTOR, 0, Text_1C42A0, Text_18C140 + msgbox Text_18C17A, 6 + end + +SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_DARIO, 0, Text_18C1ED, Text_18C205 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC874 + msgbox Text_18C20E, 6 + end + +EventScript_1AC874:: @ 81AC874 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_DARIO, 0, Text_1C42D6, Text_18C205 + msgbox Text_18C20E, 6 + end + +SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_RODETTE, 0, Text_18C283, Text_18C2BC + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC8B2 + msgbox Text_18C2D5, 6 + end + +EventScript_1AC8B2:: @ 81AC8B2 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_RODETTE, 0, Text_1C42EE, Text_18C2BC + msgbox Text_18C2D5, 6 + end + +SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_MIAH, 0, Text_18C3BC, Text_18C3E7 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC8F0 + msgbox Text_18C3FF, 6 + end + +EventScript_1AC8F0:: @ 81AC8F0 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_MIAH, 0, Text_1C4327, Text_18C3E7 + msgbox Text_18C3FF, 6 + end + +SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C632, Text_18C662, Text_18C6AB + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC932 + msgbox Text_18C683, 6 + end + +EventScript_1AC932:: @ 81AC932 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C4416, Text_18C662, Text_18C6AB + msgbox Text_18C683, 6 + end + +SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C700, Text_18C73B, Text_18C7BD + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC978 + msgbox Text_18C773, 6 + end + +EventScript_1AC978:: @ 81AC978 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C444C, Text_18C73B, Text_18C7BD + msgbox Text_18C773, 6 + end + +SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_MASON, 0, Text_18C44B, Text_18C473 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC9BA + msgbox Text_18C4BA, 6 + end + +EventScript_1AC9BA:: @ 81AC9BA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_JUGGLER_MASON, 0, Text_1C4374, Text_18C473 + msgbox Text_18C4BA, 6 + end + +SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_18C500, Text_18C543 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1AC9F8 + msgbox Text_18C54B, 6 + end + +EventScript_1AC9F8:: @ 81AC9F8 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_1C43AD, Text_18C543 + msgbox Text_18C54B, 6 + end + +SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_MADELINE, 0, Text_18C5AA, Text_18C5CD + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACA36 + msgbox Text_18C5F5, 6 + end + +EventScript_1ACA36:: @ 81ACA36 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_MADELINE, 0, Text_1C43EC, Text_18C5CD + msgbox Text_18C5F5, 6 + end + +SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_18C887, Text_18C8A6 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACA74 + msgbox Text_18C8C2, 6 + end + +EventScript_1ACA74:: @ 81ACA74 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_1C4491, Text_18C8A6 + msgbox Text_18C8C2, 6 + end + +SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EVAN, 0, Text_18C8FD, Text_18C980 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACAB2 + msgbox Text_18C999, 6 + end + +EventScript_1ACAB2:: @ 81ACAB2 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TAMER_EVAN, 0, Text_1C44CB, Text_18C980 + msgbox Text_18C999, 6 + end + +SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_JACKSON, 0, Text_18CA2F, Text_18CA6F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACAF0 + msgbox Text_18CA9C, 6 + end + +EventScript_1ACAF0:: @ 81ACAF0 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_JACKSON, 0, Text_1C454E, Text_18CA6F + msgbox Text_18CA9C, 6 + end + +SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_KATELYN, 0, Text_18CB16, Text_18CB3E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACB2E + msgbox Text_18CB6C, 6 + end + +EventScript_1ACB2E:: @ 81ACB2E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_KATELYN, 0, Text_1C458E, Text_18CB3E + msgbox Text_18CB6C, 6 + end + +SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_LEROY, 0, Text_18CBB4, Text_18CBE0 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACB6C + msgbox Text_18CC09, 6 + end + +EventScript_1ACB6C:: @ 81ACB6C + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_COOLTRAINER_LEROY, 0, Text_1C45C2, Text_18CBE0 + msgbox Text_18CC09, 6 + end + +SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MICHELLE, 0, Text_18CC4F, Text_18CCAE + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACBAA + msgbox Text_18CCEA, 6 + end + +EventScript_1ACBAA:: @ 81ACBAA + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_COOLTRAINER_MICHELLE, 0, Text_1C45FB, Text_18CCAE + msgbox Text_18CCEA, 6 + end + +SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CD49, Text_18CD75, Text_18CDE2 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACBEC + msgbox Text_18CD9C, 6 + end + +EventScript_1ACBEC:: @ 81ACBEC + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4662, Text_18CD75, Text_18CDE2 + msgbox Text_18CD9C, 6 + end + +SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 + trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACC32 + msgbox Text_18CE78, 6 + end + +EventScript_1ACC32:: @ 81ACC32 + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4699, Text_18CE5A, Text_18CEF4 + msgbox Text_18CE78, 6 + end + +SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_18CFFB, Text_18D02A + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACC74 + msgbox Text_18D061, 6 + end + +EventScript_1ACC74:: @ 81ACC74 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_1C46D3, Text_18D02A + msgbox Text_18D061, 6 + end + +SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_18D0D9, Text_18D108 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACCB2 + msgbox Text_18D125, 6 + end + +EventScript_1ACCB2:: @ 81ACCB2 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_1C470A, Text_18D108 + msgbox Text_18D125, 6 + end + +SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_EDNA, 0, Text_18D18F, Text_18D1B5 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACCF0 + msgbox Text_18D1E3, 6 + end + +EventScript_1ACCF0:: @ 81ACCF0 + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_EDNA, 0, Text_1C4739, Text_18D1B5 + msgbox Text_18D1E3, 6 + end + +SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 + trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_18D22F, Text_18D26D + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_if eq, EventScript_1ACD2E + msgbox Text_18D284, 6 + end + +EventScript_1ACD2E:: @ 81ACD2E + trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_1C476A, Text_18D26D + msgbox Text_18D284, 6 + end diff --git a/data/specials.inc b/data/specials.inc index f7ca055ef..ef42f9ae8 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -395,7 +395,7 @@ gSpecials:: @ 815FD60 def_special ValidateReceivedWonderCard def_special sub_810B810 def_special sub_811999C - def_special sp182_move_string + def_special BufferUnionRoomPlayerName def_special sub_811390C def_special Special_GetMartClerkObjectId def_special Special_BattleCardAction diff --git a/data/text/ingame_trade.inc b/data/text/ingame_trade.inc new file mode 100644 index 000000000..e101ace6c --- /dev/null +++ b/data/text/ingame_trade.inc @@ -0,0 +1,60 @@ +gUnknown_81A597B:: @ 81A597B + .string "I'm looking for the POKéMON\n" + .string "{STR_VAR_1}!\p" + .string "Wanna trade one for my\n" + .string "{STR_VAR_2}?$" + +gUnknown_81A59B6:: @ 81A59B6 + .string "Awww!\n" + .string "Oh, well…$" + +gUnknown_81A59C6:: @ 81A59C6 + .string "What?\n" + .string "That's no {STR_VAR_1}!$" + +gUnknown_81A59DA:: @ 81A59DA + .string "Hey, thanks!$" + +gUnknown_81A59E7:: @ 81A59E7 + .string "Isn't my old {STR_VAR_2} great?$" + +gUnknown_81A59FE:: @ 81A59FE + .string "Hello, there! Do you happen to\n" + .string "have a {STR_VAR_1}?\p" + .string "Would you agree to a trade for\n" + .string "my {STR_VAR_2}?$" + +gUnknown_81A5A4E:: @ 81A5A4E + .string "Well, if you don't want to…$" + +gUnknown_81A5A6A:: @ 81A5A6A + .string "Hmmm?\n" + .string "This isn't a {STR_VAR_1}.\p" + .string "Think of me if you get one.$" + +gUnknown_81A5A9D:: @ 81A5A9D + .string "Thanks!$" + +gUnknown_81A5AA5:: @ 81A5AA5 + .string "The {STR_VAR_2} that I traded you,\n" + .string "has it grown stronger?$" + +gUnknown_81A5AD6:: @ 81A5AD6 + .string "Hi!\n" + .string "Do you have a {STR_VAR_1}?\p" + .string "Want to trade it for my\n" + .string "{STR_VAR_2}?$" + +gUnknown_81A5B08:: @ 81A5B08 + .string "That's too bad.$" + +gUnknown_81A5B18:: @ 81A5B18 + .string "…This is no {STR_VAR_1}.\p" + .string "If you get one, trade it with me.$" + +gUnknown_81A5B4A:: @ 81A5B4A + .string "Thanks, you're a pal!$" + +gUnknown_81A5B60:: @ 81A5B60 + .string "How is my old {STR_VAR_2}?\n" + .string "My {STR_VAR_1} is doing great!$" diff --git a/data/text/surf.inc b/data/text/surf.inc new file mode 100644 index 000000000..177a70491 --- /dev/null +++ b/data/text/surf.inc @@ -0,0 +1,10 @@ +Text_1A556E:: @ 81A556E + .string "The water is dyed a deep blue…\n" + .string "Would you like to SURF?$" + +Text_1A55A5:: @ 81A55A5 + .string "{STR_VAR_1} used SURF!$" + +Text_CurrentTooFast:: @ 81A55B3 + .string "The current is much too fast!\n" + .string "SURF can't be used here…$" diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h new file mode 100644 index 000000000..0a94dc03b --- /dev/null +++ b/include/constants/event_objects.h @@ -0,0 +1,7 @@ +#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H +#define GUARD_CONSTANTS_EVENT_OBJECTS_H + +#define OBJ_EVENT_ID_PLAYER 0xFF +#define OBJ_EVENT_ID_CAMERA 0x7F + +#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/include/constants/movement_commands.h b/include/constants/movement_commands.h index 0451e16b7..3e61cbc14 100644 --- a/include/constants/movement_commands.h +++ b/include/constants/movement_commands.h @@ -99,7 +99,7 @@ enum step_5d, step_5e, step_5f, - step_60, + set_invisible, step_61, step_62, step_63, From 33a4b6848647bd18ca1d01e44d15624c195305a9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 21:12:58 -0500 Subject: [PATCH 04/20] Use special obj event ids --- data/maps/CeruleanCity/scripts.inc | 8 +-- data/maps/CinnabarIsland/scripts.inc | 14 +++--- data/maps/CinnabarIsland_Gym/scripts.inc | 24 ++++----- .../scripts.inc | 6 +-- .../FiveIsland_MemorialPillar/scripts.inc | 2 +- .../scripts.inc | 6 +-- .../FiveIsland_RocketWarehouse/scripts.inc | 4 +- data/maps/FourIsland/scripts.inc | 2 +- .../FourIsland_IcefallCave_1F/scripts.inc | 2 +- .../FourIsland_IcefallCave_Back/scripts.inc | 6 +-- .../scripts.inc | 20 ++++---- data/maps/IndigoPlateau_Exterior/scripts.inc | 14 +++--- data/maps/NavelRock_Summit/scripts.inc | 4 +- data/maps/OneIsland/scripts.inc | 6 +-- data/maps/OneIsland_Harbor/scripts.inc | 2 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 26 +++++----- data/maps/PalletTown/scripts.inc | 16 +++--- .../PalletTown_ProfessorOaksLab/scripts.inc | 50 +++++++++---------- data/maps/PewterCity/scripts.inc | 34 ++++++------- data/maps/PewterCity_Museum_1F/scripts.inc | 16 +++--- .../PokemonLeague_ChampionsRoom/scripts.inc | 6 +-- .../maps/PokemonLeague_HallOfFame/scripts.inc | 6 +-- .../maps/PokemonLeague_LancesRoom/scripts.inc | 2 +- data/maps/PokemonTower_2F/scripts.inc | 4 +- data/maps/PokemonTower_6F/scripts.inc | 2 +- .../maps/Route16_NorthEntrance_1F/scripts.inc | 12 ++--- data/maps/Route18_EastEntrance_1F/scripts.inc | 12 ++--- data/maps/Route22/scripts.inc | 4 +- data/maps/Route24/scripts.inc | 4 +- data/maps/Route25_SeaCottage/scripts.inc | 4 +- data/maps/Route5_SouthEntrance/scripts.inc | 10 ++-- data/maps/Route6_NorthEntrance/scripts.inc | 10 ++-- data/maps/Route7_EastEntrance/scripts.inc | 10 ++-- data/maps/Route8_WestEntrance/scripts.inc | 10 ++-- data/maps/SSAnne_2F_Corridor/scripts.inc | 4 +- data/maps/SSAnne_Exterior/scripts.inc | 6 +-- .../scripts.inc | 2 +- data/maps/SeafoamIslands_B3F/scripts.inc | 4 +- data/maps/SeafoamIslands_B4F/scripts.inc | 8 +-- data/maps/SevenIsland_House_Room1/scripts.inc | 10 ++-- data/maps/SevenIsland_House_Room2/scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 2 +- .../scripts.inc | 16 +++--- data/maps/SilphCo_11F/scripts.inc | 2 +- data/maps/SilphCo_7F/scripts.inc | 2 +- .../scripts.inc | 24 ++++----- .../SixIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/ThreeIsland/scripts.inc | 16 +++--- .../TwoIsland_JoyfulGameCorner/scripts.inc | 4 +- data/maps/VermilionCity/scripts.inc | 4 +- data/maps/ViridianCity/scripts.inc | 10 ++-- data/maps/ViridianCity_Mart/scripts.inc | 2 +- data/scripts/hole.inc | 4 +- 54 files changed, 244 insertions(+), 244 deletions(-) diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 539b1b2f5..675a9a558 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -85,13 +85,13 @@ EventScript_166598:: @ 8166598 return EventScript_1665A3:: @ 81665A3 - applymovement 255, Movement_1665C7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1665C7 applymovement 8, Movement_1665D9 waitmovement 0 return EventScript_1665B5:: @ 81665B5 - applymovement 255, Movement_1665CD + applymovement OBJ_EVENT_ID_PLAYER, Movement_1665CD applymovement 8, Movement_1665EA waitmovement 0 return @@ -209,7 +209,7 @@ CeruleanCity_EventScript_166683:: @ 8166683 setvar VAR_0x4001, 0 applymovement 2, Movement_1A75E9 waitmovement 0 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 goto EventScript_1666C3 end @@ -219,7 +219,7 @@ CeruleanCity_EventScript_1666A3:: @ 81666A3 setvar VAR_0x4001, 1 applymovement 2, Movement_1A75ED waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 goto EventScript_1666C3 end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 9891c0a94..ea7fde438 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -132,7 +132,7 @@ EventScript_167048:: @ 8167048 EventScript_167053:: @ 8167053 applymovement 3, Movement_1671A6 waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 return @@ -172,7 +172,7 @@ Movement_1670AB:: @ 81670AB step_end EventScript_1670B3:: @ 81670B3 - applymovement 255, Movement_1670DB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1670DB applymovement 3, Movement_1670DE waitmovement 0 opendoor 14, 11 @@ -226,7 +226,7 @@ EventScript_1670E6:: @ 81670E6 EventScript_167142:: @ 8167142 applymovement 3, Movement_1671AF - applymovement 255, Movement_1671AF + applymovement OBJ_EVENT_ID_PLAYER, Movement_1671AF waitmovement 0 return @@ -243,13 +243,13 @@ EventScript_167166:: @ 8167166 EventScript_167171:: @ 8167171 applymovement 3, Movement_16719D - applymovement 255, Movement_1671BA + applymovement OBJ_EVENT_ID_PLAYER, Movement_1671BA waitmovement 0 return EventScript_167183:: @ 8167183 applymovement 3, Movement_1671B6 - applymovement 255, Movement_1671C4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1671C4 waitmovement 0 return @@ -326,12 +326,12 @@ Movement_1671C4:: @ 81671C4 CinnabarIsland_EventScript_1671CA:: @ 81671CA lockall - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 delay 20 msgbox gUnknown_8180B20 closemessage - applymovement 255, Movement_1671ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1671ED waitmovement 0 releaseall end diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index f46035e48..6264b5f50 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -289,13 +289,13 @@ EventScript_16DC7A:: @ 816DC7A end EventScript_16DCB4:: @ 816DCB4 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 1, Movement_16DCD8 waitmovement 0 return EventScript_16DCC6:: @ 816DCC6 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 1, Movement_16DCDB waitmovement 0 return @@ -368,13 +368,13 @@ EventScript_16DD51:: @ 816DD51 end EventScript_16DD8B:: @ 816DD8B - applymovement 255, Movement_16DDB7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7 applymovement 3, Movement_16DDAF waitmovement 0 return EventScript_16DD9D:: @ 816DD9D - applymovement 255, Movement_16DDB7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7 applymovement 3, Movement_16DDB3 waitmovement 0 return @@ -456,13 +456,13 @@ EventScript_16DE2F:: @ 816DE2F end EventScript_16DE69:: @ 816DE69 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 4, Movement_16DE8D waitmovement 0 return EventScript_16DE7B:: @ 816DE7B - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 4, Movement_16DE90 waitmovement 0 return @@ -535,13 +535,13 @@ EventScript_16DF06:: @ 816DF06 end EventScript_16DF40:: @ 816DF40 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 5, Movement_16DF64 waitmovement 0 return EventScript_16DF52:: @ 816DF52 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 5, Movement_16DF67 waitmovement 0 return @@ -614,13 +614,13 @@ EventScript_16DFDD:: @ 816DFDD end EventScript_16E017:: @ 816E017 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 6, Movement_16E03B waitmovement 0 return EventScript_16E029:: @ 816E029 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 6, Movement_16E03E waitmovement 0 return @@ -693,13 +693,13 @@ EventScript_16E0B4:: @ 816E0B4 end EventScript_16E0EE:: @ 816E0EE - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 7, Movement_16E112 waitmovement 0 return EventScript_16E100:: @ 816E100 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 7, Movement_16E115 waitmovement 0 return diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index dbe7a3d3e..c7f786221 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -55,19 +55,19 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A EventScript_16E96F:: @ 816E96F applymovement 7, Movement_16E9AF - applymovement 255, Movement_16E9B9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9B9 waitmovement 0 return EventScript_16E981:: @ 816E981 applymovement 7, Movement_16E9C3 - applymovement 255, Movement_16E9CF + applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9CF waitmovement 0 return EventScript_16E993:: @ 816E993 applymovement 7, Movement_16E9AF - applymovement 255, Movement_16E9DE + applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9DE waitmovement 0 return diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 45d8694e4..8268e207f 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -64,7 +64,7 @@ EventScript_168A9B:: @ 8168A9B applymovement 1, Movement_1A75EB waitmovement 0 delay 45 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 textcolor 0 msgbox gUnknown_818B171 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index c46cd1b33..d35680360 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -74,14 +74,14 @@ EventScript_171FCD:: @ 8171FCD applymovement 1, Movement_1A75ED applymovement 2, Movement_17204D waitmovement 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 return EventScript_171FE9:: @ 8171FE9 applymovement 2, Movement_172055 waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return @@ -89,7 +89,7 @@ EventScript_171FFE:: @ 8171FFE applymovement 1, Movement_1A75E7 applymovement 2, Movement_172059 waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 62fe32a26..2546df203 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -95,7 +95,7 @@ EventScript_16402F:: @ 816402F end EventScript_164065:: @ 8164065 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 return @@ -143,7 +143,7 @@ EventScript_1640A2:: @ 81640A2 EventScript_16412E:: @ 816412E compare VAR_0x8004, 27 goto_if eq, EventScript_1A77A9 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 return diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index bb2bbf330..4f472100f 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -41,7 +41,7 @@ EventScript_167CEC:: @ 8167CEC waitmovement 0 msgbox gUnknown_8182B37 closemessage - applymovement 255, Movement_167D52 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167D52 applymovement 10, Movement_167D4E waitmovement 0 fadedefaultbgm diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 1a51b5b8c..bc73fb818 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -19,7 +19,7 @@ FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B EventScript_163D65:: @ 8163D65 lockall delay 20 - applymovement 255, Movement_163D7F + applymovement OBJ_EVENT_ID_PLAYER, Movement_163D7F waitmovement 0 playse SE_RU_HYUU delay 60 diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 45d0b163e..3fb3eb91e 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -38,7 +38,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 delay 35 applymovement 4, Movement_163F11 applymovement 3, Movement_163F18 - applymovement 255, Movement_163EDD + applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD waitmovement 0 applymovement 2, Movement_163EE8 waitmovement 0 @@ -66,7 +66,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 msgbox gUnknown_817B399 closemessage applymovement 3, Movement_163F1D - applymovement 255, Movement_163EE2 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2 applymovement 1, Movement_163EF0 applymovement 2, Movement_163EFA applymovement 4, Movement_163F05 @@ -77,7 +77,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 delay 50 applymovement 3, Movement_163F23 waitmovement 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 textcolor 1 msgbox gUnknown_817B457 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index d02818377..0f0a80566 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -11,11 +11,11 @@ FuchsiaCity_SafariZone_Entrance_OnFrame:: @ 816D2AE EventScript_16D2C8:: @ 816D2C8 lockall textcolor 0 - applymovement 255, Movement_16D36A + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D36A waitmovement 0 msgbox gUnknown_8197E85 closemessage - applymovement 255, Movement_16D367 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D367 waitmovement 0 special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 @@ -27,7 +27,7 @@ EventScript_16D2F2:: @ 816D2F2 textcolor 0 msgbox gUnknown_8197E85 closemessage - applymovement 255, Movement_16D362 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362 waitmovement 0 special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 @@ -42,7 +42,7 @@ EventScript_16D312:: @ 816D312 goto_if eq, EventScript_16D345 msgbox gUnknown_8197E48 closemessage - applymovement 255, Movement_16D362 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362 waitmovement 0 special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 @@ -52,7 +52,7 @@ EventScript_16D312:: @ 816D312 EventScript_16D345:: @ 816D345 msgbox gUnknown_8197E7A closemessage - applymovement 255, Movement_16D365 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D365 waitmovement 0 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate @@ -98,7 +98,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385 EventScript_16D391:: @ 816D391 textcolor 0 msgbox gUnknown_8197C6B - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO @@ -137,17 +137,17 @@ EventScript_16D3CA:: @ 816D3CA end EventScript_16D441:: @ 816D441 - applymovement 255, Movement_16D4AF + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AF waitmovement 0 return EventScript_16D44C:: @ 816D44C - applymovement 255, Movement_16D4AC + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AC waitmovement 0 return EventScript_16D457:: @ 816D457 - applymovement 255, Movement_16D4B3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4B3 waitmovement 0 return @@ -170,7 +170,7 @@ EventScript_16D48C:: @ 816D48C EventScript_16D49A:: @ 816D49A closemessage hidemoneybox 0, 0 - applymovement 255, Movement_16D4AA + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AA waitmovement 0 releaseall end diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 68701031d..99f5005c8 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -31,13 +31,13 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264 special SpawnCameraObject addobject 1 applymovement 1, Movement_167346 - applymovement 255, Movement_167337 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167337 waitmovement 0 closedoor 11, 6 waitdooranim @ Rival runs off - applymovement 255, Movement_16731B + applymovement OBJ_EVENT_ID_PLAYER, Movement_16731B applymovement 1, Movement_16733E waitmovement 0 delay 100 @@ -53,23 +53,23 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264 delay 160 @ Oak looks at player, then walks off - applymovement 255, Movement_16731F + applymovement OBJ_EVENT_ID_PLAYER, Movement_16731F applymovement 2, Movement_167348 waitmovement 0 delay 100 - applymovement 255, Movement_16732E + applymovement OBJ_EVENT_ID_PLAYER, Movement_16732E waitmovement 0 delay 155 @ Player turns to face the League - applymovement 255, Movement_16733C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16733C waitmovement 0 delay 90 @ Player runs off - applymovement 255, Movement_167335 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167335 waitmovement 0 - applymovement 255, Movement_167311 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167311 waitmovement 0 @ Reset the map state and roll the credits diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 3d2b7669f..09d6cdc38 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -47,7 +47,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_0x8005, 35 special Special_LoopWingFlapSound applymovement 1, Movement_1650E0 - applymovement 127, Movement_1650CD + applymovement OBJ_EVENT_ID_CAMERA, Movement_1650CD waitmovement 0 delay 50 setweather 0 @@ -60,7 +60,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 special Special_LoopWingFlapSound - applymovement 127, Movement_1650D1 + applymovement OBJ_EVENT_ID_CAMERA, Movement_1650D1 applymovement 1, Movement_1650D7 waitmovement 0 special RemoveCameraObject diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 171e91428..bddc46721 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -14,17 +14,17 @@ OneIsland_OnFrame:: @ 8167493 EventScript_16749D:: @ 816749D lockall textcolor 0 - applymovement 255, Movement_167505 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167505 waitmovement 0 msgbox gUnknown_818161B closemessage applymovement 1, Movement_167507 - applymovement 255, Movement_1674F4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1674F4 waitmovement 0 opendoor 14, 5 waitdooranim applymovement 1, Movement_167514 - applymovement 255, Movement_167501 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167501 waitmovement 0 closedoor 14, 5 waitdooranim diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 5bf27c3e5..232bdd108 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -18,7 +18,7 @@ OneIsland_Harbor_OnFrame:: @ 8171392 EventScript_17139C:: @ 817139C lockall textcolor 0 - applymovement 255, Movement_1713B9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1713B9 waitmovement 0 setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2 warp MAP_ONE_ISLAND, 255, 12, 18 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 25dcbcbe5..717f2c2cd 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -61,11 +61,11 @@ OneIsland_PokemonCenter_1F_OnFrame:: @ 8170CA7 EventScript_170CB1:: @ 8170CB1 lockall textcolor 0 - applymovement 255, Movement_170E7D + applymovement OBJ_EVENT_ID_PLAYER, Movement_170E7D applymovement 2, Movement_170E86 waitmovement 0 msgbox gUnknown_81A0CDE - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 playse SE_PIN applymovement 3, Movement_1A75DB @@ -77,12 +77,12 @@ EventScript_170CB1:: @ 8170CB1 msgbox gUnknown_81A0CF7 msgbox gUnknown_81A0D27 applymovement 2, Movement_1A75ED - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 msgbox gUnknown_81A0D72 applymovement 2, Movement_1A75EB waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 checkflag FLAG_SYS_GAME_CLEAR call_if TRUE, EventScript_170E34 @@ -101,7 +101,7 @@ EventScript_170CB1:: @ 8170CB1 msgbox gUnknown_81A0F40 applymovement 2, Movement_1A75ED waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 msgbox gUnknown_81A0FB1 giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 @@ -476,7 +476,7 @@ EventScript_1711DA:: @ 81711DA call_if eq, EventScript_171305 delay 10 msgbox gUnknown_81A13CB - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 msgbox gUnknown_81A1431 applymovement 2, Movement_1A75ED @@ -489,7 +489,7 @@ EventScript_1711DA:: @ 81711DA applymovement 2, Movement_1A75E7 waitmovement 0 delay 10 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 delay 15 msgbox gUnknown_81A14FB @@ -499,12 +499,12 @@ EventScript_1711DA:: @ 81711DA delay 15 applymovement 3, Movement_1A75E7 waitmovement 0 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 msgbox gUnknown_81A1574 closemessage delay 25 - applymovement 255, Movement_171326 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171326 applymovement 2, Movement_17132D waitmovement 0 playse SE_KAIDAN @@ -518,22 +518,22 @@ EventScript_1711DA:: @ 81711DA end EventScript_1712E4:: @ 81712E4 - applymovement 255, Movement_171310 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171310 waitmovement 0 return EventScript_1712EF:: @ 81712EF - applymovement 255, Movement_171314 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171314 waitmovement 0 return EventScript_1712FA:: @ 81712FA - applymovement 255, Movement_171316 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171316 waitmovement 0 return EventScript_171305:: @ 8171305 - applymovement 255, Movement_17131A + applymovement OBJ_EVENT_ID_PLAYER, Movement_17131A waitmovement 0 return diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 9d2562263..ad3241af2 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -64,13 +64,13 @@ EventScript_1654D8:: @ 81654D8 msgbox gUnknown_817D9AA closemessage playbgm MUS_ANNAI, 0 - applymovement 255, Movement_1655DD + applymovement OBJ_EVENT_ID_PLAYER, Movement_1655DD applymovement 3, Movement_1655CC waitmovement 0 opendoor 16, 13 waitdooranim applymovement 3, Movement_16572E - applymovement 255, Movement_165758 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165758 waitmovement 0 closedoor 16, 13 waitdooranim @@ -192,10 +192,10 @@ EventScript_165605:: @ 8165605 waitmessage delay 85 closemessage - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 playse SE_PIN - applymovement 255, Movement_1A75DB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75DB waitmovement 0 delay 30 addobject 3 @@ -214,7 +214,7 @@ EventScript_165605:: @ 8165605 opendoor 16, 13 waitdooranim applymovement 3, Movement_16572E - applymovement 255, Movement_165758 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165758 waitmovement 0 closedoor 16, 13 waitdooranim @@ -240,13 +240,13 @@ EventScript_1656C3:: @ 81656C3 EventScript_1656CE:: @ 81656CE applymovement 3, Movement_165705 - applymovement 255, Movement_165731 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165731 waitmovement 0 return EventScript_1656E0:: @ 81656E0 applymovement 3, Movement_165719 - applymovement 255, Movement_165744 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165744 waitmovement 0 return @@ -475,7 +475,7 @@ PalletTown_EventScript_16586B:: @ 816586B PalletTown_EventScript_16587B:: @ 816587B lockall applymovement 1, Movement_1A75EB - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 call EventScript_165894 releaseall diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 3d805d319..ebc834607 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -58,7 +58,7 @@ EventScript_169002:: @ 8169002 setobjectxyperm 4, 6, 3 setobjectmovementtype 4, 8 clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement 255, Movement_1692B7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7 waitmovement 0 goto EventScript_169035 end @@ -138,7 +138,7 @@ EventScript_169174:: @ 8169174 setobjectxyperm 8, 5, 10 addobject 8 playbgm MUS_RIVAL1, 0 - applymovement 255, Movement_169B94 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94 applymovement 8, Movement_169B9D waitmovement 0 return @@ -148,7 +148,7 @@ EventScript_169194:: @ 8169194 addobject 8 playbgm MUS_RIVAL1, 0 applymovement 4, Movement_1A75ED - applymovement 255, Movement_169B91 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 applymovement 8, Movement_169B9D waitmovement 0 return @@ -163,12 +163,12 @@ EventScript_1691BB:: @ 81691BB return EventScript_1691DB:: @ 81691DB - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return EventScript_1691E6:: @ 81691E6 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 return @@ -179,14 +179,14 @@ EventScript_1691F1:: @ 81691F1 EventScript_1691FC:: @ 81691FC applymovement 4, Movement_169238 - applymovement 255, Movement_1698C7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7 applymovement 8, Movement_1698C7 waitmovement 4 return EventScript_169215:: @ 8169215 applymovement 4, Movement_169232 - applymovement 255, Movement_1698C3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3 waitmovement 4 return @@ -220,7 +220,7 @@ EventScript_16923E:: @ 816923E setobjectxyperm 4, 6, 3 setobjectmovementtype 4, 8 clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement 255, Movement_1692B7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7 waitmovement 0 applymovement 8, Movement_1A75E9 waitmovement 0 @@ -273,7 +273,7 @@ PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3 waitmovement 0 msgbox gUnknown_818E177 closemessage - applymovement 255, Movement_1692E5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1692E5 waitmovement 0 releaseall end @@ -305,7 +305,7 @@ EventScript_16930B:: @ 816930B playbgm MUS_RIVAL1, 0 applymovement 8, Movement_1A75ED waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 msgbox gUnknown_818DDA4 closemessage @@ -508,19 +508,19 @@ EventScript_1694C2:: @ 81694C2 EventScript_169504:: @ 8169504 applymovement 8, Movement_16953A - applymovement 255, Movement_169553 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169553 waitmovement 8 return EventScript_169516:: @ 8169516 applymovement 8, Movement_16954A - applymovement 255, Movement_169553 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169553 waitmovement 8 return EventScript_169528:: @ 8169528 applymovement 8, Movement_169542 - applymovement 255, Movement_169559 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169559 waitmovement 8 return @@ -757,7 +757,7 @@ EventScript_169850:: @ 8169850 EventScript_16985B:: @ 816985B applymovement 4, Movement_16987C - applymovement 255, Movement_169878 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169878 waitmovement 0 return @@ -789,14 +789,14 @@ EventScript_169882:: @ 8169882 EventScript_16988D:: @ 816988D applymovement 4, Movement_1698D0 - applymovement 255, Movement_1698C7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7 applymovement 8, Movement_1698C7 waitmovement 4 return EventScript_1698A6:: @ 81698A6 applymovement 4, Movement_1698CB - applymovement 255, Movement_1698C3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3 waitmovement 4 return @@ -1025,7 +1025,7 @@ EventScript_169A78:: @ 8169A78 EventScript_169A82:: @ 8169A82 setobjectxyperm 8, 5, 10 addobject 8 - applymovement 255, Movement_169B94 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94 applymovement 8, Movement_169B9D waitmovement 0 return @@ -1034,7 +1034,7 @@ EventScript_169A9E:: @ 8169A9E setobjectxyperm 8, 6, 10 addobject 8 applymovement 4, Movement_1A75ED - applymovement 255, Movement_169B91 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 applymovement 8, Movement_169B9D waitmovement 0 return @@ -1059,7 +1059,7 @@ EventScript_169AF5:: @ 8169AF5 applymovement 4, Movement_1A75E1 waitmovement 0 delay 15 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 applymovement 4, Movement_1A75ED waitmovement 0 return @@ -1068,31 +1068,31 @@ EventScript_169B14:: @ 8169B14 applymovement 4, Movement_1A75E1 waitmovement 0 delay 15 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB applymovement 4, Movement_1A75ED waitmovement 0 return EventScript_169B33:: @ 8169B33 applymovement 8, Movement_1A75E1 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 return EventScript_169B45:: @ 8169B45 applymovement 8, Movement_1A75E9 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 return EventScript_169B57:: @ 8169B57 applymovement 8, Movement_1A75E1 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 return EventScript_169B69:: @ 8169B69 - applymovement 255, Movement_169B91 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 applymovement 8, Movement_169BA4 waitmovement 0 return @@ -1103,7 +1103,7 @@ EventScript_169B7B:: @ 8169B7B return EventScript_169B86:: @ 8169B86 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 1a1fcf4c7..c46ee9fdd 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -26,28 +26,28 @@ PewterCity_EventScript_165B9D:: @ 8165B9D end EventScript_165BD3:: @ 8165BD3 - applymovement 255, Movement_165C3C + applymovement OBJ_EVENT_ID_PLAYER, Movement_165C3C applymovement 5, Movement_165CDE waitmovement 0 - applymovement 255, Movement_165C41 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165C41 applymovement 5, Movement_165CE3 waitmovement 0 return EventScript_165BF6:: @ 8165BF6 - applymovement 255, Movement_165C80 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165C80 applymovement 5, Movement_165D23 waitmovement 0 - applymovement 255, Movement_165C82 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165C82 applymovement 5, Movement_165D25 waitmovement 0 return EventScript_165C19:: @ 8165C19 - applymovement 255, Movement_165CAF + applymovement OBJ_EVENT_ID_PLAYER, Movement_165CAF applymovement 5, Movement_165D53 waitmovement 0 - applymovement 255, Movement_165CB1 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165CB1 applymovement 5, Movement_165D55 waitmovement 0 return @@ -464,7 +464,7 @@ EventScript_165DBE:: @ 8165DBE EventScript_165E0A:: @ 8165E0A applymovement 5, Movement_165F6C waitmovement 0 - applymovement 255, Movement_165E7A + applymovement OBJ_EVENT_ID_PLAYER, Movement_165E7A applymovement 5, Movement_165F7F waitmovement 0 return @@ -472,7 +472,7 @@ EventScript_165E0A:: @ 8165E0A EventScript_165E26:: @ 8165E26 applymovement 5, Movement_165F71 waitmovement 0 - applymovement 255, Movement_165EB9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165EB9 applymovement 5, Movement_165FBF waitmovement 0 return @@ -480,7 +480,7 @@ EventScript_165E26:: @ 8165E26 EventScript_165E42:: @ 8165E42 applymovement 5, Movement_165F74 waitmovement 0 - applymovement 255, Movement_165EF9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165EF9 applymovement 5, Movement_166000 waitmovement 0 return @@ -488,7 +488,7 @@ EventScript_165E42:: @ 8165E42 EventScript_165E5E:: @ 8165E5E applymovement 5, Movement_165F78 waitmovement 0 - applymovement 255, Movement_165F3A + applymovement OBJ_EVENT_ID_PLAYER, Movement_165F3A applymovement 5, Movement_166042 waitmovement 0 return @@ -1059,25 +1059,25 @@ PewterCity_EventScript_16607E:: @ 816607E EventScript_1660EE:: @ 81660EE applymovement 2, Movement_16615C - applymovement 255, Movement_166140 + applymovement OBJ_EVENT_ID_PLAYER, Movement_166140 waitmovement 0 return EventScript_166100:: @ 8166100 applymovement 2, Movement_166193 - applymovement 255, Movement_166177 + applymovement OBJ_EVENT_ID_PLAYER, Movement_166177 waitmovement 0 return EventScript_166112:: @ 8166112 applymovement 2, Movement_1661CA - applymovement 255, Movement_1661AE + applymovement OBJ_EVENT_ID_PLAYER, Movement_1661AE waitmovement 0 return EventScript_166124:: @ 8166124 applymovement 2, Movement_166201 - applymovement 255, Movement_1661E5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1661E5 waitmovement 0 return @@ -1480,7 +1480,7 @@ EventScript_1663D5:: @ 81663D5 EventScript_1663DA:: @ 81663DA closemessage - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return @@ -1488,7 +1488,7 @@ EventScript_1663E6:: @ 81663E6 closemessage applymovement 7, Movement_16643E waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return @@ -1496,7 +1496,7 @@ EventScript_1663FC:: @ 81663FC closemessage applymovement 7, Movement_166441 waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index bdf57e5c0..89bf1c69b 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -39,7 +39,7 @@ EventScript_16A37B:: @ 816A37B PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F lockall setvar VAR_0x4001, 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 goto EventScript_16A3D1 end @@ -47,7 +47,7 @@ PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 lockall setvar VAR_0x4001, 1 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 goto EventScript_16A3D1 end @@ -55,7 +55,7 @@ PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB lockall setvar VAR_0x4001, 2 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 goto EventScript_16A3D1 end @@ -69,7 +69,7 @@ EventScript_16A3D1:: @ 816A3D1 msgbox gUnknown_81904F9 closemessage hidemoneybox 0, 0 - applymovement 255, Movement_16A48E + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A48E waitmovement 0 releaseall end @@ -96,17 +96,17 @@ EventScript_16A402:: @ 816A402 end EventScript_16A455:: @ 816A455 - applymovement 255, Movement_16A490 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A490 waitmovement 0 return EventScript_16A460:: @ 816A460 - applymovement 255, Movement_16A495 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A495 waitmovement 0 return EventScript_16A46B:: @ 816A46B - applymovement 255, Movement_16A499 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A499 waitmovement 0 return @@ -114,7 +114,7 @@ EventScript_16A476:: @ 816A476 msgbox gUnknown_819051C closemessage hidemoneybox 0, 0 - applymovement 255, Movement_16A48E + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A48E waitmovement 0 releaseall end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 47ec9cc6c..6f4d33218 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -56,7 +56,7 @@ EventScript_162B76:: @ 8162B76 lockall textcolor 0 setflag FLAG_TEMP_2 - applymovement 255, Movement_162D07 + applymovement OBJ_EVENT_ID_PLAYER, Movement_162D07 waitmovement 0 delay 20 checkflag FLAG_SYS_GAME_CLEAR @@ -82,7 +82,7 @@ EventScript_162B76:: @ 8162B76 addobject 2 msgbox gUnknown_8178FC6 closemessage - applymovement 255, Movement_162D1F + applymovement OBJ_EVENT_ID_PLAYER, Movement_162D1F applymovement 1, Movement_162D41 applymovement 2, Movement_162D2A waitmovement 0 @@ -102,7 +102,7 @@ EventScript_162B76:: @ 8162B76 closemessage delay 13 applymovement 2, Movement_162D37 - applymovement 255, Movement_162D12 + applymovement OBJ_EVENT_ID_PLAYER, Movement_162D12 waitmovement 0 setvar VAR_0x4001, 1 warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index c3556df44..7c6a0e363 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -18,16 +18,16 @@ PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 EventScript_162D70:: @ 8162D70 lockall textcolor 0 - applymovement 255, Movement_162DCD + applymovement OBJ_EVENT_ID_PLAYER, Movement_162DCD waitmovement 0 applymovement 1, Movement_1A75E7 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 delay 18 msgbox gUnknown_817922F closemessage applymovement 1, Movement_1A75E9 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 delay 20 dofieldeffect 62 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 8e0a9a186..49ed67da9 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -39,7 +39,7 @@ PokemonLeague_LancesRoom_OnFrame:: @ 816297D EventScript_162987:: @ 8162987 lockall - applymovement 255, Movement_1629F1 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1629F1 waitmovement 0 setflag FLAG_TEMP_2 call EventScript_1629A8 diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 908948740..d115cc7b0 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -53,13 +53,13 @@ EventScript_1632A7:: @ 81632A7 EventScript_163339:: @ 8163339 applymovement 1, Movement_1A75EB - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 return EventScript_16334B:: @ 816334B applymovement 1, Movement_1A75ED - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 65127f0ab..ed39ce452 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -14,7 +14,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 special sub_8112364 compare VAR_RESULT, 0 goto_if eq, EventScript_1634F5 - applymovement 255, Movement_163512 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163512 waitmovement 0 releaseall end diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index 6d13a9b93..ee14ee9c4 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -50,7 +50,7 @@ EventScript_170220:: @ 8170220 textcolor 0 msgbox gUnknown_819F9CC closemessage - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 delay 20 compare VAR_0x8008, 1 @@ -63,28 +63,28 @@ EventScript_170220:: @ 8170220 call_if eq, EventScript_17029A msgbox gUnknown_819F95F closemessage - applymovement 255, Movement_1702B3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702B3 waitmovement 0 releaseall end EventScript_170279:: @ 8170279 - applymovement 255, Movement_1702A5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A5 waitmovement 0 return EventScript_170284:: @ 8170284 - applymovement 255, Movement_1702A7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A7 waitmovement 0 return EventScript_17028F:: @ 817028F - applymovement 255, Movement_1702AA + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AA waitmovement 0 return EventScript_17029A:: @ 817029A - applymovement 255, Movement_1702AE + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AE waitmovement 0 return diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 961cf9ce1..4a9e76f3c 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -50,7 +50,7 @@ EventScript_1703D6:: @ 81703D6 textcolor 0 msgbox gUnknown_819FD60 closemessage - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 delay 20 compare VAR_0x8008, 1 @@ -63,28 +63,28 @@ EventScript_1703D6:: @ 81703D6 call_if eq, EventScript_170450 msgbox gUnknown_819FD0C closemessage - applymovement 255, Movement_170469 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170469 waitmovement 0 releaseall end EventScript_17042F:: @ 817042F - applymovement 255, Movement_17045B + applymovement OBJ_EVENT_ID_PLAYER, Movement_17045B waitmovement 0 return EventScript_17043A:: @ 817043A - applymovement 255, Movement_17045D + applymovement OBJ_EVENT_ID_PLAYER, Movement_17045D waitmovement 0 return EventScript_170445:: @ 8170445 - applymovement 255, Movement_170460 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170460 waitmovement 0 return EventScript_170450:: @ 8170450 - applymovement 255, Movement_170464 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170464 waitmovement 0 return diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index e68c25b17..3453c7f24 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -68,7 +68,7 @@ EventScript_168350:: @ 8168350 EventScript_16835B:: @ 816835B applymovement 1, Movement_1683D9 - applymovement 255, Movement_1683E3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3 waitmovement 0 return @@ -230,7 +230,7 @@ EventScript_16849C:: @ 816849C EventScript_1684A7:: @ 81684A7 applymovement 1, Movement_1683D9 - applymovement 255, Movement_1683E3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3 waitmovement 0 return diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 30e5a753e..2d41467ac 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -42,7 +42,7 @@ EventScript_168678:: @ 8168678 call_if eq, EventScript_1686FD compare VAR_0x4001, 1 call_if eq, EventScript_168708 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 @@ -78,7 +78,7 @@ EventScript_168708:: @ 8168708 EventScript_168713:: @ 8168713 msgbox gUnknown_8188CC2 closemessage - applymovement 255, Movement_168743 + applymovement OBJ_EVENT_ID_PLAYER, Movement_168743 waitmovement 0 compare VAR_0x4001, 0 call_if eq, EventScript_168733 diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 72837c224..0b559b463 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -172,7 +172,7 @@ EventScript_1706FA:: @ 81706FA clearflag FLAG_TEMP_2 setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE special SpawnCameraObject - applymovement 127, Movement_1707BE + applymovement OBJ_EVENT_ID_CAMERA, Movement_1707BE waitmovement 0 delay 35 playse SE_PIN @@ -207,7 +207,7 @@ EventScript_1706FA:: @ 81706FA applymovement 1, Movement_170888 waitmovement 0 waitfanfare - applymovement 127, Movement_1707C3 + applymovement OBJ_EVENT_ID_CAMERA, Movement_1707C3 waitmovement 0 playse SE_C_MAKU_D closedoor 3, 3 diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 5340a57ec..11077850d 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -25,13 +25,13 @@ Route5_SouthEntrance_EventScript_16F922:: @ 816F922 EventScript_16F92E:: @ 816F92E textcolor 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 checkflag FLAG_GOT_TEA goto_if TRUE, EventScript_16F958 msgbox gUnknown_819E04B closemessage - applymovement 255, Movement_16F9C4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4 waitmovement 0 releaseall end @@ -56,17 +56,17 @@ EventScript_16F963:: @ 816F963 end EventScript_16F99C:: @ 816F99C - applymovement 255, Movement_16F9C2 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C2 waitmovement 0 return EventScript_16F9A7:: @ 816F9A7 - applymovement 255, Movement_16F9BD + applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BD waitmovement 0 return EventScript_16F9B2:: @ 816F9B2 - applymovement 255, Movement_16F9BF + applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BF waitmovement 0 return diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index e039b9a09..ebc1ec6ff 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -25,13 +25,13 @@ Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 EventScript_16F9F4:: @ 816F9F4 textcolor 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 checkflag FLAG_GOT_TEA goto_if TRUE, EventScript_16FA1E msgbox gUnknown_819E181 closemessage - applymovement 255, Movement_16FA8A + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A waitmovement 0 releaseall end @@ -56,17 +56,17 @@ EventScript_16FA29:: @ 816FA29 end EventScript_16FA62:: @ 816FA62 - applymovement 255, Movement_16FA83 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83 waitmovement 0 return EventScript_16FA6D:: @ 816FA6D - applymovement 255, Movement_16FA86 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86 waitmovement 0 return EventScript_16FA78:: @ 816FA78 - applymovement 255, Movement_16FA88 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88 waitmovement 0 return diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 613a84bf2..662b0f503 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -25,13 +25,13 @@ Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF EventScript_16FABB:: @ 816FABB textcolor 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 checkflag FLAG_GOT_TEA goto_if TRUE, EventScript_16FAE5 msgbox gUnknown_819E2B7 closemessage - applymovement 255, Movement_16FB51 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51 waitmovement 0 releaseall end @@ -56,17 +56,17 @@ EventScript_16FAF0:: @ 816FAF0 end EventScript_16FB29:: @ 816FB29 - applymovement 255, Movement_16FB4F + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4F waitmovement 0 return EventScript_16FB34:: @ 816FB34 - applymovement 255, Movement_16FB4A + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4A waitmovement 0 return EventScript_16FB3F:: @ 816FB3F - applymovement 255, Movement_16FB4C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4C waitmovement 0 return diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index f657d318f..52f18565a 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -25,13 +25,13 @@ Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 EventScript_16FB81:: @ 816FB81 textcolor 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 checkflag FLAG_GOT_TEA goto_if TRUE, EventScript_16FBAB msgbox gUnknown_819E3ED closemessage - applymovement 255, Movement_16FC2D + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D waitmovement 0 releaseall end @@ -66,17 +66,17 @@ EventScript_16FBCC:: @ 816FBCC end EventScript_16FC05:: @ 816FC05 - applymovement 255, Movement_16FC2B + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B waitmovement 0 return EventScript_16FC10:: @ 816FC10 - applymovement 255, Movement_16FC26 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26 waitmovement 0 return EventScript_16FC1B:: @ 816FC1B - applymovement 255, Movement_16FC28 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28 waitmovement 0 return diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 3d67e7dd0..a6ebf1f5c 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -72,12 +72,12 @@ EventScript_1609AD:: @ 81609AD EventScript_1609B8:: @ 81609B8 applymovement 1, Movement_160A2E - applymovement 255, Movement_160A24 + applymovement OBJ_EVENT_ID_PLAYER, Movement_160A24 waitmovement 0 return EventScript_1609CA:: @ 81609CA - applymovement 255, Movement_160A1E + applymovement OBJ_EVENT_ID_PLAYER, Movement_160A1E applymovement 1, Movement_160A34 waitmovement 0 return diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index ffa1ed8fd..e2dd3418a 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -23,7 +23,7 @@ SSAnne_Exterior_160859:: @ 8160859 special Special_SSAnneDepartureCutscene waitstate removeobject 1 - applymovement 255, Movement_1608B7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1608B7 waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 2 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 @@ -33,12 +33,12 @@ SSAnne_Exterior_160859:: @ 8160859 end EventScript_1608A1:: @ 81608A1 - applymovement 255, Movement_1608C1 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1608C1 waitmovement 0 return EventScript_1608AC:: @ 81608AC - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 return diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 500d6f49f..75a7b0a96 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -21,7 +21,7 @@ EventScript_16F0D4:: @ 816F0D4 closemessage applymovement 1, Movement_16F124 waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 msgbox gUnknown_819C235 setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 342e3499b..778d65e84 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -57,12 +57,12 @@ EventScript_162FF0:: @ 8162FF0 return EventScript_162FF6:: @ 8162FF6 - applymovement 255, Movement_163013 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163013 waitmovement 0 return EventScript_163001:: @ 8163001 - applymovement 255, Movement_163021 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163021 waitmovement 0 return diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 2d9d6fd71..ad99c17d6 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -80,7 +80,7 @@ SeafoamIslands_B4F_OnFrame:: @ 81630F9 EventScript_16310B:: @ 816310B lockall - applymovement 255, Movement_16311D + applymovement OBJ_EVENT_ID_PLAYER, Movement_16311D waitmovement 0 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0 releaseall @@ -116,12 +116,12 @@ EventScript_163169:: @ 8163169 return EventScript_16316F:: @ 816316F - applymovement 255, Movement_16318C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16318C waitmovement 0 return EventScript_16317A:: @ 816317A - applymovement 255, Movement_163195 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163195 waitmovement 0 return @@ -153,7 +153,7 @@ Movement_163195:: @ 8163195 SeafoamIslands_B4F_EventScript_16319D:: @ 816319D lockall - applymovement 255, Movement_1631AA + applymovement OBJ_EVENT_ID_PLAYER, Movement_1631AA waitmovement 0 releaseall end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index e31934afa..a992dbaa5 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -32,12 +32,12 @@ SevenIsland_House_Room1_OnFrame:: @ 81708CF EventScript_1708E9:: @ 1708E9 lockall textcolor 1 - applymovement 255, Movement_170953 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170953 waitmovement 0 applymovement 1, Movement_170955 waitmovement 0 moveobjectoffscreen 1 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 call_if eq, EventScript_170938 @@ -134,19 +134,19 @@ EventScript_170A1E:: @ 8170A1E EventScript_170A2D:: @ 8170A2D applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement 255, Movement_170A63 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170A63 waitmovement 0 return EventScript_170A3F:: @ 8170A3F applymovement VAR_LAST_TALKED, Movement_170A72 - applymovement 255, Movement_170A67 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170A67 waitmovement 0 return EventScript_170A51:: @ 8170A51 applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement 255, Movement_170A6B + applymovement OBJ_EVENT_ID_PLAYER, Movement_170A6B waitmovement 0 return diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index bf8bb3030..d964a40d0 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -13,7 +13,7 @@ SevenIsland_House_Room2_OnFrame:: @ 8170A8D EventScript_170A97:: @ 8170A97 lockall - applymovement 255, Movement_170B22 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170B22 waitmovement 0 special PrintEReaderTrainerGreeting msgbox gStringVar4 @@ -30,7 +30,7 @@ EventScript_170A97:: @ 8170A97 call_if eq, EventScript_170B17 closemessage special sp000_heal_pokemon - applymovement 255, Movement_170B28 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 waitmovement 0 special LoadPlayerParty setvar VAR_0x4001, 1 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 1703a174c..be25411b2 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -24,7 +24,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 call_if ne, EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 - applymovement 255, Movement_172231 + applymovement OBJ_EVENT_ID_PLAYER, Movement_172231 waitmovement 0 fadedefaultbgm delay 30 @@ -35,7 +35,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 end EventScript_172206:: @ 8172206 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 return diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index 96d1e6be7..a919ffd44 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -46,7 +46,7 @@ EventScript_164B90:: @ 8164B90 setvar VAR_ELEVATOR_FLOOR, 3 special Special_CloseElevatorCurrentFloorWindow delay 25 - applymovement 255, Movement_164BE5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164BE5 waitmovement 0 warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 waitstate diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 1baeb89c2..07745b021 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -15,8 +15,8 @@ SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 compare VAR_RESULT, 0 goto_if eq, EventScript_164886 setvar VAR_0x4000, 0 - setobjectxy 255, 9, 7 - applymovement 255, Movement_164AD4 + setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 EventScript_164886:: @ 8164886 end @@ -50,7 +50,7 @@ SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6 EventScript_1648C8:: @ 81648C8 lockall - applymovement 255, Movement_1648EA + applymovement OBJ_EVENT_ID_PLAYER, Movement_1648EA waitmovement 0 setmetatile 17, 10, 692, 1 special DrawWholeMapView @@ -77,7 +77,7 @@ EventScript_1648ED:: @ 81648ED EventScript_164920:: @ 8164920 lock faceplayer - applymovement 255, Movement_164AD4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 textcolor 1 msgbox gUnknown_817C937 goto EventScript_16494B @@ -85,13 +85,13 @@ EventScript_164920:: @ 8164920 EventScript_164938:: @ 8164938 lock faceplayer - applymovement 255, Movement_164AD4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 textcolor 1 msgbox gUnknown_817C9C0 EventScript_16494B:: @ 816494B closemessage - applymovement 255, Movement_164AD6 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 waitmovement 0 setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 release @@ -153,7 +153,7 @@ Items_1649B8:: @ 81649B8 SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE lockall - applymovement 255, Movement_164AD4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 textcolor 1 msgbox gUnknown_817C794 setvar VAR_0x8004, 17 @@ -206,7 +206,7 @@ EventScript_164AA0:: @ 8164AA0 EventScript_164ABF:: @ 8164ABF msgbox gUnknown_817C91D closemessage - applymovement 255, Movement_164AD6 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 waitmovement 0 releaseall end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 9b8504ac5..2fb8dc01d 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -93,7 +93,7 @@ EventScript_161EA0:: @ 8161EA0 EventScript_161F00:: @ 8161F00 applymovement 3, Movement_161F1D - applymovement 255, Movement_161F27 + applymovement OBJ_EVENT_ID_PLAYER, Movement_161F27 waitmovement 0 return diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index cf2d80422..72aa159dc 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -42,7 +42,7 @@ EventScript_1619D4:: @ 81619D4 playbgm MUS_RIVAL1, 0 applymovement 1, Movement_1A75DB waitmovement 0 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED applymovement 1, Movement_1A75DD waitmovement 0 msgbox gUnknown_8176710 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index afb5f0251..6642b4d85 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -76,22 +76,22 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 end EventScript_1642F9:: @ 81642F9 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 return EventScript_164304:: @ 8164304 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 return EventScript_16430F:: @ 816430F - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 return EventScript_16431A:: @ 816431A - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 return @@ -118,51 +118,51 @@ EventScript_164346:: @ 8164346 EventScript_164351:: @ 8164351 applymovement 2, Movement_1643F5 waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return EventScript_164366:: @ 8164366 applymovement 2, Movement_1643F5 waitmovement 0 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 return EventScript_16437B:: @ 816437B applymovement 2, Movement_1643F7 waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 return EventScript_164390:: @ 8164390 applymovement 2, Movement_1643F7 waitmovement 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 return EventScript_1643A5:: @ 81643A5 - applymovement 255, Movement_16441C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C applymovement 2, Movement_1643F9 waitmovement 0 return EventScript_1643B7:: @ 81643B7 - applymovement 255, Movement_16441C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C applymovement 2, Movement_164401 waitmovement 0 return EventScript_1643C9:: @ 81643C9 - applymovement 255, Movement_16441C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C applymovement 2, Movement_164409 waitmovement 0 return EventScript_1643DB:: @ 81643DB - applymovement 255, Movement_16441C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C applymovement 2, Movement_164409 waitmovement 0 return diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 910608d45..211fa2805 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -33,7 +33,7 @@ EventScript_171D97:: @ 8171D97 waitmovement 0 msgbox gUnknown_81A3F30 closemessage - applymovement 255, Movement_171E02 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171E02 applymovement 2, Movement_171DFE waitmovement 0 fadedefaultbgm diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index a63d1350e..401283235 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -101,22 +101,22 @@ EventScript_16786F:: @ 816786F return EventScript_167931:: @ 8167931 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 return EventScript_16793C:: @ 816793C - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED waitmovement 0 return EventScript_167947:: @ 8167947 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 return EventScript_167952:: @ 8167952 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 return @@ -300,20 +300,20 @@ EventScript_167BD8:: @ 8167BD8 EventScript_167BEA:: @ 8167BEA applymovement 4, Movement_1A75ED applymovement 3, Movement_167C64 - applymovement 255, Movement_167C68 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 waitmovement 0 return EventScript_167C03:: @ 8167C03 applymovement 4, Movement_1A75ED - applymovement 255, Movement_167C68 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 applymovement 3, Movement_167C6C waitmovement 0 return EventScript_167C1C:: @ 8167C1C applymovement 4, Movement_1A75ED - applymovement 255, Movement_167C68 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 applymovement 3, Movement_167C71 waitmovement 0 return @@ -321,7 +321,7 @@ EventScript_167C1C:: @ 8167C1C EventScript_167C35:: @ 8167C35 msgbox gUnknown_8182453 closemessage - applymovement 255, Movement_167C55 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167C55 waitmovement 0 applymovement 5, Movement_167C59 waitmovement 0 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index ff76d9419..e6906c062 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -62,13 +62,13 @@ EventScript_17145F:: @ 817145F waitmovement 0 applymovement 1, Movement_171527 waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 msgbox gUnknown_81A2465 closemessage playse SE_DOOR waitse - applymovement 255, Movement_17152C + applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C waitmovement 0 playbgm MUS_SHOUNEN, 0 addobject 2 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index fb9b59b9f..9b7e2fb63 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -9,7 +9,7 @@ VermilionCity_OnFrame:: @ 81668E7 EventScript_1668F1:: @ 81668F1 lockall - applymovement 255, Movement_166903 + applymovement OBJ_EVENT_ID_PLAYER, Movement_166903 waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 3 releaseall @@ -207,7 +207,7 @@ VermilionCity_EventScript_166B98:: @ 8166B98 EventScript_166BA0:: @ 8166BA0 textcolor 0 applymovement 6, Movement_1A75E7 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 compare VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if eq, EventScript_166BED diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 1f87c2146..31744f8b3 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -49,12 +49,12 @@ EventScript_165931:: @ 8165931 ViridianCity_EventScript_16596D:: @ 816596D lockall textcolor 3 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 waitmovement 0 delay 20 msgbox gUnknown_817E2F5 closemessage - applymovement 255, Movement_165992 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165992 waitmovement 0 releaseall end @@ -208,7 +208,7 @@ ViridianCity_EventScript_165AF6:: @ 8165AF6 textcolor 0 msgbox gUnknown_817DD03 closemessage - applymovement 255, Movement_165B0E + applymovement OBJ_EVENT_ID_PLAYER, Movement_165B0E waitmovement 0 releaseall end @@ -222,7 +222,7 @@ ViridianCity_EventScript_165B10:: @ 8165B10 textcolor 0 applymovement 4, Movement_1A75E7 waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB waitmovement 0 call EventScript_165B4C release @@ -233,7 +233,7 @@ ViridianCity_EventScript_165B2E:: @ 8165B2E textcolor 0 applymovement 4, Movement_1A75EB waitmovement 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 waitmovement 0 call EventScript_165B4C release diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 69ad2ef2b..0a54173ad 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -25,7 +25,7 @@ EventScript_16A205:: @ 816A205 msgbox gUnknown_819021A closemessage applymovement 1, Movement_16A262 - applymovement 255, Movement_16A25C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A25C waitmovement 0 msgbox gUnknown_819023A setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 diff --git a/data/scripts/hole.inc b/data/scripts/hole.inc index 3b7c671e9..5637ccbde 100644 --- a/data/scripts/hole.inc +++ b/data/scripts/hole.inc @@ -7,7 +7,7 @@ EventScript_1C1338:: @ 81C1338 EventScript_1C1348:: @ 81C1348 lockall delay 20 - applymovement 255, Movement_1C137A + applymovement OBJ_EVENT_ID_PLAYER, Movement_1C137A waitmovement 0 playse SE_RU_HYUU delay 60 @@ -18,7 +18,7 @@ EventScript_1C1348:: @ 81C1348 EventScript_1C1361:: @ 81C1361 lockall delay 20 - applymovement 255, Movement_1C137A + applymovement OBJ_EVENT_ID_PLAYER, Movement_1C137A waitmovement 0 playse SE_RU_HYUU delay 60 From 16dc234d9964e41443b965dc774a0ff60d3338fa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 23:44:55 -0500 Subject: [PATCH 05/20] Some stdscript sync, start syncing cable_club.inc --- asm/macros/event.inc | 25 +- data/event_scripts.s | 3208 +---------------- .../scripts.inc | 4 +- .../CeladonCity_DepartmentStore_Roof/text.inc | 2 +- .../scripts.inc | 2 +- .../CeladonCity_PokemonCenter_2F/map.json | 2 +- .../CeladonCity_PokemonCenter_2F/scripts.inc | 8 +- .../CeruleanCity_PokemonCenter_2F/map.json | 2 +- .../CeruleanCity_PokemonCenter_2F/scripts.inc | 8 +- .../CinnabarIsland_PokemonCenter_2F/map.json | 2 +- .../scripts.inc | 8 +- .../maps/FiveIsland_PokemonCenter_2F/map.json | 2 +- .../FiveIsland_PokemonCenter_2F/scripts.inc | 8 +- .../FiveIsland_ResortGorgeous/scripts.inc | 2 +- .../maps/FourIsland_PokemonCenter_2F/map.json | 2 +- .../FourIsland_PokemonCenter_2F/scripts.inc | 8 +- .../FuchsiaCity_PokemonCenter_2F/map.json | 2 +- .../FuchsiaCity_PokemonCenter_2F/scripts.inc | 8 +- .../IndigoPlateau_PokemonCenter_2F/map.json | 2 +- .../scripts.inc | 8 +- .../LavenderTown_PokemonCenter_2F/map.json | 2 +- .../LavenderTown_PokemonCenter_2F/scripts.inc | 8 +- data/maps/OneIsland_Harbor/scripts.inc | 2 +- data/maps/OneIsland_PokemonCenter_2F/map.json | 2 +- .../OneIsland_PokemonCenter_2F/scripts.inc | 8 +- .../PalletTown_PlayersHouse_2F/scripts.inc | 2 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 2 +- .../maps/PewterCity_PokemonCenter_2F/map.json | 2 +- .../PewterCity_PokemonCenter_2F/scripts.inc | 8 +- .../PokemonLeague_AgathasRoom/scripts.inc | 2 +- .../maps/PokemonLeague_BrunosRoom/scripts.inc | 2 +- .../PokemonLeague_ChampionsRoom/scripts.inc | 2 +- .../maps/PokemonLeague_HallOfFame/scripts.inc | 2 +- .../maps/PokemonLeague_LancesRoom/scripts.inc | 2 +- .../PokemonLeague_LoreleisRoom/scripts.inc | 2 +- data/maps/Route10_PokemonCenter_2F/map.json | 2 +- .../maps/Route10_PokemonCenter_2F/scripts.inc | 8 +- data/maps/Route4_PokemonCenter_2F/map.json | 2 +- data/maps/Route4_PokemonCenter_2F/scripts.inc | 8 +- .../SaffronCity_PokemonCenter_2F/map.json | 2 +- .../SaffronCity_PokemonCenter_2F/scripts.inc | 8 +- data/maps/SeafoamIslands_B4F/scripts.inc | 2 +- .../SevenIsland_PokemonCenter_2F/map.json | 2 +- .../SevenIsland_PokemonCenter_2F/scripts.inc | 8 +- data/maps/SixIsland_PokemonCenter_2F/map.json | 2 +- .../SixIsland_PokemonCenter_2F/scripts.inc | 8 +- .../ThreeIsland_PokemonCenter_2F/map.json | 2 +- .../ThreeIsland_PokemonCenter_2F/scripts.inc | 8 +- .../TwoIsland_JoyfulGameCorner/scripts.inc | 8 +- data/maps/TwoIsland_PokemonCenter_2F/map.json | 2 +- .../TwoIsland_PokemonCenter_2F/scripts.inc | 8 +- .../VermilionCity_PokemonCenter_2F/map.json | 2 +- .../scripts.inc | 8 +- .../ViridianCity_PokemonCenter_2F/map.json | 2 +- .../ViridianCity_PokemonCenter_2F/scripts.inc | 8 +- data/scripts/cable_club.inc | 1910 ++++++++++ data/scripts/item_ball_scripts.inc | 336 +- data/scripts/move_tutors.inc | 66 +- data/scripts/repel.inc | 2 +- data/scripts/trainer_battle.inc | 2 +- data/scripts/trainers.inc | 936 ++--- data/text/trainers.inc | 1006 ++++++ include/constants/cable_club.h | 15 + include/constants/vars.h | 2 +- 64 files changed, 3835 insertions(+), 3901 deletions(-) create mode 100644 data/scripts/cable_club.inc create mode 100644 data/text/trainers.inc create mode 100644 include/constants/cable_club.h diff --git a/asm/macros/event.inc b/asm/macros/event.inc index b6526f96f..c440e7079 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1432,15 +1432,36 @@ .endm @ Message box types + MSGBOX_NPC = 2 + MSGBOX_SIGN = 3 + MSGBOX_DEFAULT = 4 MSGBOX_YESNO = 5 + MSGBOX_AUTOCLOSE = 6 YES = 1 NO = 0 - .macro giveitem item, amount=1, function=0 + @ Other callstd function names + STD_OBTAIN_ITEM = 0 + STD_FIND_ITEM = 1 + STD_PUT_ITEM_AWAY = 8 + + .macro giveitem item, amount=1 setorcopyvar 0x8000, \item setorcopyvar 0x8001, \amount - callstd \function + callstd STD_OBTAIN_ITEM + .endm + + .macro finditem item, amount=1 + setorcopyvar 0x8000, \item + setorcopyvar 0x8001, \amount + callstd STD_FIND_ITEM + .endm + + .macro putitemaway item, amount=1 + setorcopyvar 0x8000, \item + setorcopyvar 0x8001, \amount + callstd STD_PUT_ITEM_AWAY .endm .macro giveitemfanfaremsg msg, item, amount=1, fanfare=MUS_FANFA1 diff --git a/data/event_scripts.s b/data/event_scripts.s index bf6f41e77..21049f296 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -21,6 +21,7 @@ #include "constants/menu.h" #include "constants/battle_setup.h" #include "constants/map_scripts.h" +#include "constants/cable_club.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -58,15 +59,15 @@ gSpecialVars:: @ 815FD0C .align 2 gStdScripts:: @ 8160450 - .4byte gStdScript_0 - .4byte gStdScript_1 + .4byte Std_ObtainItem + .4byte Std_FindItem .4byte Std_MsgboxNPC .4byte Std_MsgboxSign .4byte Std_MsgboxDefault .4byte Std_MsgboxYesNo - .4byte gStdScript_Message_WaitButton_AndRelease + .4byte Std_MsgboxAutoclose .4byte Std_ObtainDecoration - .4byte gStdScript_8 + .4byte Std_PutItemAway .4byte gStdScript_ItemMessageAndFanfare gStdScriptsEnd:: @@ -821,7 +822,7 @@ gStdScript_ItemMessageAndFanfare:: @ 81A4E66 waitfanfare compare VAR_0x8002, MUS_FANFA1 call_if eq, EventScript_1A4EAA - giveitem VAR_0x8000, VAR_0x8001, 8 + putitemaway VAR_0x8000, VAR_0x8001 call EventScript_1A6675 return @@ -903,34 +904,34 @@ Text_ObtainedTheX:: @ 81A51F6 Text_BagIsFull:: @ 81A5207 .string "The BAG is full…$" -gUnknown_81A5218:: @ 81A5218 +Text_PutItemAway:: @ 81A5218 .string "{PLAYER} put the {STR_VAR_2}\n" .string "in the {STR_VAR_3}.$" -Text_1A5231:: @ 81A5231 +Text_FoundOneItem:: @ 81A5231 .string "{PLAYER} found one {STR_VAR_2}!$" -gUnknown_81A5242:: @ 81A5242 +Text_TooBadBagFull:: @ 81A5242 .string "Too bad!\n" .string "The BAG is full…$" -Text_1A525C:: @ 81A525C +Text_FoundXCoins:: @ 81A525C .string "{PLAYER} found\n" .string "{STR_VAR_1} {STR_VAR_2}!$" -Text_1A526C:: @ 81A526C +Text_PutCoinsAwayInCoinCase:: @ 81A526C .string "{PLAYER} put the COINS away in\n" .string "the COIN CASE.$" -Text_1A5294:: @ 81A5294 +Text_CoinCaseIsFull:: @ 81A5294 .string "Too bad!\n" .string "The COIN CASE is full…$" -Text_1A52B4:: @ 81A52B4 +Text_NothingToPutThemIn:: @ 81A52B4 .string "Too bad!\n" .string "There's nothing to put them in…$" -Text_1A52DD:: @ 81A52DD +Text_FoundXItems:: @ 81A52DD .string "{PLAYER} found\n" .string "{STR_VAR_1} {STR_VAR_2}(s)!$" @@ -1008,12 +1009,12 @@ Text_BigHoleInTheWall:: @ 81A5606 .string "かべに\n" .string "おおきな　あなが　あいている！$" -Text_1A561A:: @ 81A561A +Text_WirelessClubUndergoingAdjustments:: @ 81A561A .string "I'm terribly sorry.\n" .string "The POKéMON WIRELESS CLUB is\l" .string "undergoing adjustments now.$" -Text_1A5667:: @ 81A5667 +Text_AppearsToBeUndergoingAdjustments:: @ 81A5667 .string "It appears to be undergoing\n" .string "adjustments…$" @@ -1031,7 +1032,7 @@ Text_1A56D2:: @ 81A56D2 .string "ましたに　どうぐが　うまってる！\n" .string "‥‥‥$" -Text_1A5700:: @ 81A5700 +Text_DugUpItemFromGround:: @ 81A5700 .string "{PLAYER} dug up one {STR_VAR_2}\n" .string "from deep in the ground.$" @@ -1380,7 +1381,7 @@ EventScript_1A6675:: @ 81A6675 copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS return -gStdScript_0:: @ 81A667B +Std_ObtainItem:: @ 81A667B copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID textcolor 3 additem VAR_0x8000, VAR_0x8001 @@ -1442,7 +1443,7 @@ EventScript_1A6749:: @ 81A6749 message Text_ObtainedTheX waitfanfare waitmessage - msgbox gUnknown_81A5218 + msgbox Text_PutItemAway setvar VAR_RESULT, 1 return @@ -1485,7 +1486,7 @@ EventScript_1A67AD:: @ 81A67AD setvar VAR_RESULT, 0 return -gStdScript_1:: @ 81A67B3 +Std_FindItem:: @ 81A67B3 lock faceplayer waitse @@ -1514,7 +1515,7 @@ EventScript_1A67EE:: @ 81A67EE call_if eq, EventScript_1A6827 waitfanfare waitmessage - msgbox gUnknown_81A5218 + msgbox Text_PutItemAway return EventScript_1A6821:: @ 81A6821 @@ -1522,12 +1523,12 @@ EventScript_1A6821:: @ 81A6821 return EventScript_1A6827:: @ 81A6827 - message Text_1A5231 + message Text_FoundOneItem return EventScript_1A682D:: @ 81A682D msgbox Text_ObtainedTheX - msgbox gUnknown_81A5242 + msgbox Text_TooBadBagFull setvar VAR_RESULT, 0 return @@ -1559,28 +1560,28 @@ EventScript_ItemInPocketMessage:: call_if ne, EventScript_FoundMultipleItemsMessage waitfanfare waitmessage - msgbox gUnknown_81A5218 + msgbox Text_PutItemAway special Special_SetHiddenItemFlag releaseall end EventScript_FoundSingleItemMessage:: - message Text_1A5231 + message Text_FoundOneItem return EventScript_FoundCoinsMessage:: getnumberstring 0, VAR_0x8006 - message Text_1A525C + message Text_FoundXCoins return EventScript_FoundMultipleItemsMessage:: getnumberstring 0, VAR_0x8006 - message Text_1A52DD + message Text_FoundXItems return EventScript_BagIsFullMessage:: - msgbox Text_1A5231 - msgbox gUnknown_81A5242 + msgbox Text_FoundOneItem + msgbox Text_TooBadBagFull setvar VAR_RESULT, 0 releaseall end @@ -1598,7 +1599,7 @@ EventScript_PickUpHiddenCoins:: call EventScript_FoundCoinsMessage waitfanfare waitmessage - msgbox Text_1A526C + msgbox Text_PutCoinsAwayInCoinCase special Special_SetHiddenItemFlag releaseall end @@ -1606,8 +1607,8 @@ EventScript_PickUpHiddenCoins:: EventScript_HiddenCoinsButTheCoinCaseIsFull:: getnumberstring 0, VAR_0x8006 getstdstring 1, 0x17 - msgbox Text_1A525C - msgbox Text_1A5294 + msgbox Text_FoundXCoins + msgbox Text_CoinCaseIsFull setvar VAR_RESULT, 0 releaseall end @@ -1615,8 +1616,8 @@ EventScript_HiddenCoinsButTheCoinCaseIsFull:: EventScript_HiddenCoinsButNoCoinCase:: getnumberstring 0, VAR_0x8006 getstdstring 1, 0x17 - msgbox Text_1A525C - msgbox Text_1A52B4 + msgbox Text_FoundXCoins + msgbox Text_NothingToPutThemIn setvar VAR_RESULT, 0 releaseall end @@ -1716,8 +1717,8 @@ EventScript_1A6A7A:: @ 81A6A7A goto_if FALSE, EventScript_1A6A46 playse SE_PC_LOGIN msgbox Text_1A5BC6 - msgbox Text_1A5C03, 5 - compare VAR_RESULT, 0 + msgbox Text_1A5C03, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1A6AB2 setflag FLAG_OAKS_RATING_IS_VIA_PC call EventScript_1A73E0 @@ -1741,12 +1742,12 @@ EventScript_1A6AC0:: @ 81A6AC0 EventScript_1A6BF9:: @ 81A6BF9 textcolor 3 - msgbox gUnknown_81A5242 + msgbox Text_TooBadBagFull release end EventScript_1A6C05:: @ 81A6C05 - msgbox gUnknown_81A5242 + msgbox Text_TooBadBagFull return EventScript_1A6C0E:: @ 81A6C0E @@ -1773,7 +1774,7 @@ EventScript_FadeOut_Heal_FadeIn:: @ 81A6C26 gUnknown_81A6C32:: @ 81A6C32 lockall - msgbox Text_1C0DF1 + msgbox Text_ATownMap special sub_8110AB4 compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 @@ -2193,122 +2194,122 @@ Movement_1A7603:: @ 81A7603 step_end gUnknown_81A7606:: @ 81A7606 - msgbox gUnknown_81C0DB0, 3 + msgbox gUnknown_81C0DB0, MSGBOX_SIGN end gUnknown_81A760F:: @ 81A760F - msgbox gUnknown_81C0DFD, 3 + msgbox gUnknown_81C0DFD, MSGBOX_SIGN end gUnknown_81A7618:: @ 81A7618 - msgbox gUnknown_81C0F99, 3 + msgbox gUnknown_81C0F99, MSGBOX_SIGN end gUnknown_81A7621:: @ 81A7621 - msgbox gUnknown_81C12A7, 3 + msgbox gUnknown_81C12A7, MSGBOX_SIGN end gUnknown_81A762A:: @ 81A762A - msgbox gUnknown_81C10C1, 3 + msgbox gUnknown_81C10C1, MSGBOX_SIGN end gUnknown_81A7633:: @ 81A7633 - msgbox gUnknown_81C1273, 3 + msgbox gUnknown_81C1273, MSGBOX_SIGN end gUnknown_81A763C:: @ 81A763C - msgbox gUnknown_81C0FD8, 3 + msgbox gUnknown_81C0FD8, MSGBOX_SIGN end gUnknown_81A7645:: @ 81A7645 - msgbox gUnknown_81C12D6, 3 + msgbox gUnknown_81C12D6, MSGBOX_SIGN end gUnknown_81A764E:: @ 81A764E - msgbox gUnknown_81C1300, 3 + msgbox gUnknown_81C1300, MSGBOX_SIGN end gUnknown_81A7657:: @ 81A7657 - msgbox gUnknown_81C0E19, 3 + msgbox Text_DishesPlatesNeatlyLinedUp, MSGBOX_SIGN end gUnknown_81A7660:: @ 81A7660 - msgbox gUnknown_81C0E40, 3 + msgbox gUnknown_81C0E40, MSGBOX_SIGN end gUnknown_81A7669:: @ 81A7669 - msgbox gUnknown_81C0E73, 3 + msgbox gUnknown_81C0E73, MSGBOX_SIGN end gUnknown_81A7672:: @ 81A7672 - msgbox gUnknown_81C0EAC, 3 + msgbox gUnknown_81C0EAC, MSGBOX_SIGN end gUnknown_81A767B:: @ 81A767B - msgbox gUnknown_81C101B, 3 + msgbox gUnknown_81C101B, MSGBOX_SIGN end gUnknown_81A7684:: @ 81A7684 - msgbox gUnknown_81C1060, 3 + msgbox gUnknown_81C1060, MSGBOX_SIGN end gUnknown_81A768D:: @ 81A768D - msgbox gUnknown_81C109C, 3 + msgbox gUnknown_81C109C, MSGBOX_SIGN end gUnknown_81A7696:: @ 81A7696 - msgbox gUnknown_81C10FC, 3 + msgbox gUnknown_81C10FC, MSGBOX_SIGN end gUnknown_81A769F:: @ 81A769F - msgbox gUnknown_81C1134, 3 + msgbox gUnknown_81C1134, MSGBOX_SIGN end gUnknown_81A76A8:: @ 81A76A8 - msgbox gUnknown_81C116E, 3 + msgbox gUnknown_81C116E, MSGBOX_SIGN end gUnknown_81A76B1:: @ 81A76B1 - msgbox gUnknown_81C1194, 3 + msgbox gUnknown_81C1194, MSGBOX_SIGN end gUnknown_81A76BA:: @ 81A76BA - msgbox gUnknown_81C11BA, 3 + msgbox gUnknown_81C11BA, MSGBOX_SIGN end gUnknown_81A76C3:: @ 81A76C3 - msgbox gUnknown_81C11DC, 3 + msgbox gUnknown_81C11DC, MSGBOX_SIGN end gUnknown_81A76CC:: @ 81A76CC - msgbox gUnknown_81C1217, 3 + msgbox gUnknown_81C1217, MSGBOX_SIGN end gUnknown_81A76D5:: @ 81A76D5 - msgbox gUnknown_81C124B, 3 + msgbox gUnknown_81C124B, MSGBOX_SIGN end gUnknown_81A76DE:: @ 81A76DE - msgbox gUnknown_81C0ECB, 3 + msgbox gUnknown_81C0ECB, MSGBOX_SIGN end gUnknown_81A76E7:: @ 81A76E7 - msgbox gUnknown_81C0EF7, 3 + msgbox gUnknown_81C0EF7, MSGBOX_SIGN end gUnknown_81A76F0:: @ 81A76F0 - msgbox gUnknown_81C0F19, 3 + msgbox gUnknown_81C0F19, MSGBOX_SIGN end gUnknown_81A76F9:: @ 81A76F9 - msgbox gUnknown_81C0F59, 3 + msgbox gUnknown_81C0F59, MSGBOX_SIGN end gUnknown_81A7702:: @ 81A7702 lockall textcolor 3 - msgbox Text_1A622C, 5 - compare VAR_RESULT, 0 + msgbox Text_1A622C, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1A778A setvar VAR_0x8004, 14 call EventScript_1A6AC0 @@ -2354,7 +2355,7 @@ EventScript_1A778C:: @ 81A778C end gUnknown_81A77A0:: @ 81A77A0 - msgbox Text_1A5375, 3 + msgbox Text_1A5375, MSGBOX_SIGN end EventScript_1A77A9:: @ 81A77A9 @@ -2642,8 +2643,8 @@ EventScript_1A7AE0:: @ 81A7AE0 end EventScript_1A7AE2:: @ 81A7AE2 - msgbox Text_177460, 5 - compare VAR_RESULT, 0 + msgbox Text_177460, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1A7B70 msgbox Text_17747B checkflag FLAG_POKEMON_MANSION_SWITCH_STATE @@ -3639,18 +3640,18 @@ EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 end EventScript_DigUpItemPutInPocket:: - message Text_1A5700 + message Text_DugUpItemFromGround waitfanfare waitmessage delay 60 - msgbox gUnknown_81A5218 + msgbox Text_PutItemAway special Special_SetHiddenItemFlag releaseall end EventScript_DigUpItemBagIsFull:: - msgbox Text_1A5700 - msgbox gUnknown_81A5242 + msgbox Text_DugUpItemFromGround + msgbox Text_TooBadBagFull setvar VAR_RESULT, 0 releaseall end @@ -3727,20 +3728,20 @@ EventScript_1A8E4D:: @ 81A8E4D waitstate end -gStdScript_8:: @ 81A8E58 +Std_PutItemAway:: @ 81A8E58 bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 call EventScript_1A8E6F - msgbox gUnknown_81A5218 + msgbox Text_PutItemAway return EventScript_1A8E6F:: @ 81A8E6F switch VAR_RESULT - case 1, EventScript_1A8EAC - case 2, EventScript_1A8EB1 - case 3, EventScript_1A8EB6 - case 4, EventScript_1A8EBB - case 5, EventScript_1A8EC0 + case POCKET_ITEMS, EventScript_1A8EAC + case POCKET_KEY_ITEMS, EventScript_1A8EB1 + case POCKET_POKE_BALLS, EventScript_1A8EB6 + case POCKET_TM_CASE, EventScript_1A8EBB + case POCKET_BERRY_POUCH, EventScript_1A8EC0 end EventScript_1A8EAC:: @ 81A8EAC @@ -4147,8 +4148,8 @@ Text_1ACD45:: @ 81ACD45 CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 lockall showmoneybox 0, 0, 0 - msgbox gUnknown_81B1D7D, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81B1D7D, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1B2926 checkmoney 50, 0 compare VAR_RESULT, 0 @@ -4562,2019 +4563,7 @@ EventScript_1B2DF6:: @ 81B2DF6 end .include "data/text/help_system.inc" - -CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -FourIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -OneIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -PewterCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -Route10_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -Route4_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -SixIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 -ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 - call EventScript_1BB1BA - end - -EventScript_1BB1BA:: @ 81BB1BA - specialvar VAR_RESULT, ValidateReceivedWonderCard - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB1CE - clearflag FLAG_HIDE_MG_DELIVERYMEN - return - -EventScript_1BB1CE:: @ 81BB1CE - setflag FLAG_HIDE_MG_DELIVERYMEN - return - -CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -FiveIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -OneIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -PewterCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -SevenIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -VermilionCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -FourIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -SixIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -TwoIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -Route10_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -Route10_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -Route4_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -SaffronCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -CeladonCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -LavenderTown_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 -ViridianCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - special sub_8112364 - execram - -EventScript_1BB1E4:: @ 81BB1E4 - msgbox Text_1A6393, 2 - end - -CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -FourIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -OneIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -PewterCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -Route10_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -Route4_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -SixIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED -ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED - map_script_2 VAR_0x406F, 1, EventScript_1BB227 - map_script_2 VAR_0x406F, 2, EventScript_1BB227 - map_script_2 VAR_0x406F, 5, EventScript_1BB227 - map_script_2 VAR_0x406F, 3, EventScript_1BB227 - map_script_2 VAR_0x406F, 6, EventScript_1BB227 - map_script_2 VAR_0x406F, 7, EventScript_1BB227 - map_script_2 VAR_0x406F, 8, EventScript_1BB227 - .2byte 0 - -EventScript_1BB227:: @ 81BB227 - compare VAR_0x8007, 0 - goto_if eq, EventScript_1BB236 - turnobject VAR_0x8007, 3 -EventScript_1BB236: - end - -CeladonCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -CeruleanCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -FiveIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -FourIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -LavenderTown_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -OneIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -PewterCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -Route10_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -Route4_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -SaffronCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -SevenIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -SixIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -ThreeIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -TwoIsland_JoyfulGameCorner_MapScript4_1BB237:: @ 81BB237 -TwoIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -VermilionCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 -ViridianCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 - compare VAR_0x406F, 1 - goto_if eq, EventScript_1BB285 - compare VAR_0x406F, 2 - goto_if eq, EventScript_1BB285 - compare VAR_0x406F, 5 - goto_if eq, EventScript_1BB285 - compare VAR_0x406F, 3 - goto_if eq, EventScript_1BB28B - compare VAR_0x406F, 6 - goto_if eq, EventScript_1BB291 - compare VAR_0x406F, 7 - goto_if eq, EventScript_1BB297 - compare VAR_0x406F, 8 - goto_if eq, EventScript_1BB29D - end - -EventScript_1BB285:: @ 81BB285 - call EventScript_1BC034 - end - -EventScript_1BB28B:: @ 81BB28B - call EventScript_1BC034 - end - -EventScript_1BB291:: @ 81BB291 - call EventScript_1BC020 - end - -EventScript_1BB297:: @ 81BB297 - call EventScript_1BC034 - end - -EventScript_1BB29D:: @ 81BB29D - call EventScript_1BC048 - end - -CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -FourIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -OneIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -PewterCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -Route10_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -Route4_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -SixIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 -ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 - map_script_2 VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1, EventScript_1BB415 - map_script_2 VAR_0x406F, 1, EventScript_1BB2E5 - map_script_2 VAR_0x406F, 2, EventScript_1BB2E5 - map_script_2 VAR_0x406F, 5, EventScript_1BB2E5 - map_script_2 VAR_0x406F, 3, EventScript_1BB34F - map_script_2 VAR_0x406F, 6, EventScript_1BB39C - map_script_2 VAR_0x406F, 7, EventScript_1BB2E5 - map_script_2 VAR_0x406F, 8, EventScript_1BB2FD - .2byte 0 - -EventScript_1BB2E5:: @ 81BB2E5 - lockall - call EventScript_1BB315 - call EventScript_1BC03E - special DrawWholeMapView - playse SE_TK_KASYA - erasebox 0, 0, 29, 19 - releaseall - end - -EventScript_1BB2FD:: @ 81BB2FD - lockall - call EventScript_1BB315 - call EventScript_1BC052 - special DrawWholeMapView - playse SE_TK_KASYA - erasebox 0, 0, 29, 19 - releaseall - end - -EventScript_1BB315:: @ 81BB315 - special CloseLink - special HelpSystem_Enable - special sub_811390C - setvar VAR_0x406F, 0 - textcolor 1 - compare VAR_0x8007, 0 - goto_if eq, EventScript_1BB40A - applymovement VAR_0x8007, Movement_1BB88F - waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 - waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88B - waitmovement 0 - return - -EventScript_1BB34F:: @ 81BB34F - lockall - call EventScript_1BB367 - call EventScript_1BC03E - special DrawWholeMapView - playse SE_TK_KASYA - erasebox 0, 0, 29, 19 - releaseall - end - -EventScript_1BB367:: @ 81BB367 - special CloseLink - special HelpSystem_Enable - special sub_811390C - setvar VAR_0x406F, 0 - textcolor 1 - compare VAR_0x8007, 0 - goto_if eq, EventScript_1BB40A - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 - waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88F - waitmovement 0 - call EventScript_1BB3E6 - return - -EventScript_1BB39C:: @ 81BB39C - lockall - call EventScript_1BB3B4 - call EventScript_1BC02A - special DrawWholeMapView - playse SE_TK_KASYA - erasebox 0, 0, 29, 19 - releaseall - end - -EventScript_1BB3B4:: @ 81BB3B4 - special HelpSystem_Enable - special sub_811390C - setvar VAR_0x406F, 0 - textcolor 1 - compare VAR_0x8007, 0 - goto_if eq, EventScript_1BB40A - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 - waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88F - waitmovement 0 - call EventScript_1BB3E6 - return - -EventScript_1BB3E6:: @ 81BB3E6 - message Text_1BC918 - waitmessage - playse SE_PIN - message Text_1BC943 - waitmessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 - waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88B - waitmovement 0 - return - -EventScript_1BB40A:: @ 81BB40A - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 - waitmovement 0 - return - -EventScript_1BB415:: @ 81BB415 - lockall - textcolor 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 - waitmovement 0 - msgbox gUnknown_81BD898 - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB447 - waitmovement 0 - delay 30 - msgbox gUnknown_81BD966 - setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 2 - releaseall - end - -Movement_1BB447:: @ 81BB447 - step_11 - step_11 - step_end - -EventScript_1BB44A:: @ 81BB44A - message gUnknown_81BC311 - waitmessage - delay 15 - goto EventScript_1BB467 - end - -EventScript_1BB459:: @ 81BB459 - msgbox gUnknown_81BC35E - goto EventScript_1BB467 - end - -EventScript_1BB467:: @ 81BB467 - setvar VAR_0x8004, 0 - multichoice 0, 0, MULTICHOICE_TRADE_CENTER_COLOSSEUM, FALSE - switch VAR_RESULT - case 0, EventScript_1BB6AB - case 1, EventScript_1BB4A3 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F - end - -EventScript_1BB4A3:: @ 81BB4A3 - copyvar VAR_0x8007, VAR_LAST_TALKED - goto EventScript_1BB4AE - -EventScript_1BB4AD:: @ 81BB4AD - end - -EventScript_1BB4AE:: @ 81BB4AE - message Text_1BD338 - waitmessage - multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE - switch VAR_RESULT - case 0, EventScript_1BB50F - case 1, EventScript_1BB51A - case 2, EventScript_1BB541 - case 3, EventScript_1BB501 - case 4, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F - end - -EventScript_1BB501:: @ 81BB501 - msgbox gUnknown_81BD390 - goto EventScript_1BB4AE - -EventScript_1BB50E:: @ 81BB50E - end - -EventScript_1BB50F:: @ 81BB50F - setvar VAR_0x8004, 1 - goto EventScript_1BB54C - -EventScript_1BB519:: @ 81BB519 - end - -EventScript_1BB51A:: @ 81BB51A - special CheckForAlivePartyMons - compare VAR_RESULT, 0 - goto_if ne, EventScript_1BB533 - setvar VAR_0x8004, 2 - goto EventScript_1BB54C - -EventScript_1BB532:: @ 81BB532 - end - -EventScript_1BB533:: @ 81BB533 - msgbox gUnknown_81BC409 - goto EventScript_1BB4AE - -EventScript_1BB540:: @ 81BB540 - end - -EventScript_1BB541:: @ 81BB541 - setvar VAR_0x8004, 5 - goto EventScript_1BB54C - -EventScript_1BB54B:: @ 81BB54B - end - -EventScript_1BB54C:: @ 81BB54C - call EventScript_1A4EAF - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F - message gUnknown_81BC4AC - waitmessage - special HelpSystem_Disable - textcolor 3 - special sub_8081064 - waitstate - call EventScript_1A6675 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB5B3 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1BB80F - compare VAR_RESULT, 3 - goto_if eq, EventScript_1BB81F - compare VAR_RESULT, 4 - goto_if eq, EventScript_1BB63C - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BB82F - compare VAR_RESULT, 6 - goto_if eq, EventScript_1BB7FF - end - -EventScript_1BB5B3:: @ 81BB5B3 - special sp000_heal_pokemon - special SavePlayerParty - special LoadPlayerBag - copyvar VAR_0x406F, VAR_0x8004 - messageautoscroll Text_1BC590 - waitmessage - call EventScript_1BC034 - special DrawWholeMapView - playse SE_TK_KASYA - delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F - waitmovement 0 - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 - waitmovement 0 - opendoor 9, 1 - waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C - waitmovement 0 - hideobject 255, MAP_UNKNOWN_MAP_00_00 - closedoor 9, 1 - waitdooranim - release - compare VAR_0x8004, 5 - goto_if eq, EventScript_1BB62C - special SetCableClubWarp - warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 - special DoCableClubWarp - waitstate - end - -EventScript_1BB621:: @ 81BB621 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB894 - waitmovement 0 - return - -EventScript_1BB62C:: @ 81BB62C - special SetCableClubWarp - warp MAP_UNKNOWN_MAP_00_03, 255, 5, 8 - special DoCableClubWarp - waitstate - end - -EventScript_1BB63C:: @ 81BB63C - switch VAR_0x8004 - case 1, EventScript_1BB68A - case 2, EventScript_1BB679 - case 5, EventScript_1BB668 - goto EventScript_1BB857 - -EventScript_1BB667:: @ 81BB667 - end - -EventScript_1BB668:: @ 81BB668 - special CloseLink - msgbox gUnknown_81BC736 - goto EventScript_1BB69B - -EventScript_1BB678:: @ 81BB678 - end - -EventScript_1BB679:: @ 81BB679 - special CloseLink - msgbox gUnknown_81BC700 - goto EventScript_1BB69B - -EventScript_1BB689:: @ 81BB689 - end - -EventScript_1BB68A:: @ 81BB68A - special CloseLink - msgbox gUnknown_81BC6CA - goto EventScript_1BB69B - -EventScript_1BB69A:: @ 81BB69A - end - -EventScript_1BB69B:: @ 81BB69B - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BC76B - release - end - -EventScript_1BB6AB:: @ 81BB6AB - copyvar VAR_0x8007, VAR_LAST_TALKED - call EventScript_1BB79C - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F - call EventScript_1A4EAF - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F - message gUnknown_81BC4AC - waitmessage - special HelpSystem_Disable - textcolor 3 - special sub_80810CC - waitstate - call EventScript_1A6675 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB73D - compare VAR_RESULT, 2 - goto_if eq, EventScript_1BB80F - compare VAR_RESULT, 3 - goto_if eq, EventScript_1BB81F - compare VAR_RESULT, 4 - goto_if eq, EventScript_1BB857 - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BB82F - compare VAR_RESULT, 6 - goto_if eq, EventScript_1BB7FF - compare VAR_RESULT, 7 - goto_if eq, EventScript_1BB7DF - compare VAR_RESULT, 9 - goto_if eq, EventScript_1BB7EF - end - -EventScript_1BB73D:: @ 81BB73D - setvar VAR_0x8004, 3 - copyvar VAR_0x406F, VAR_0x8004 - messageautoscroll Text_1BC590 - waitmessage - call EventScript_1BC034 - special DrawWholeMapView - playse SE_TK_KASYA - delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F - waitmovement 0 - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 - waitmovement 0 - opendoor 9, 1 - waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C - waitmovement 0 - hideobject 255, MAP_UNKNOWN_MAP_00_00 - closedoor 9, 1 - waitdooranim - release - special SetCableClubWarp - setwarp MAP_UNKNOWN_MAP_00_01, 255, 5, 8 - special DoCableClubWarp - waitstate - end - -EventScript_1BB79C:: @ 81BB79C - specialvar VAR_RESULT, CalculatePlayerPartyCount - compare VAR_RESULT, 2 - goto_if lt, EventScript_1BB7C2 - specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB7D0 - setvar VAR_RESULT, 1 - return - -EventScript_1BB7C2:: @ 81BB7C2 - msgbox gUnknown_81BC442 - setvar VAR_RESULT, 0 - return - -EventScript_1BB7D0:: @ 81BB7D0 - msgbox gUnknown_81BC47C - setvar VAR_RESULT, 0 - return - -EventScript_1BB7DE:: @ 81BB7DE - end - -EventScript_1BB7DF:: @ 81BB7DF - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BC95C - release - end - -EventScript_1BB7EF:: @ 81BB7EF - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BC9C0 - release - end - -EventScript_1BB7FF:: @ 81BB7FF - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BC615 - release - end - -EventScript_1BB80F:: @ 81BB80F - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BC5C0 - release - end - -EventScript_1BB81F:: @ 81BB81F - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BC64E - release - end - -EventScript_1BB82F:: @ 81BB82F - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BC68A - release - end - -EventScript_1BB83F:: @ 81BB83F - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BCFD1 - release - end - -EventScript_1BB84F:: @ 81BB84F - special SetCableClubWarp - special DoCableClubWarp - waitstate - end - -EventScript_1BB857:: @ 81BB857 - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BC6A1 - release - end - -EventScript_1BB867:: @ 81BB867 - special CloseLink - special HelpSystem_Enable - msgbox gUnknown_81BC9E0 - release - end - -EventScript_1BB877:: @ 81BB877 - msgbox Text_1A561A - release - end - -EventScript_1BB881:: @ 81BB881 - msgbox Text_1A5667 - releaseall - end - -Movement_1BB88B:: @ 81BB88B - step_00 - step_end - -Movement_1BB88D:: @ 81BB88D - step_03 - step_end - -Movement_1BB88F:: @ 81BB88F - step_02 - step_end - -Movement_1BB891:: @ 81BB891 - step_10 - step_10 - step_end - -Movement_1BB894:: @ 81BB894 - step_13 - step_11 - step_11 - step_end - -Movement_1BB898:: @ 81BB898 - step_12 - step_11 - step_11 - step_end - -Movement_1BB89C:: @ 81BB89C - step_11 - step_end - -Movement_1BB89E:: @ 81BB89E - step_02 - step_end - -Movement_1BB8A0:: @ 81BB8A0 - step_03 - step_end - -Movement_1BB8A2:: @ 81BB8A2 - step_12 - step_11 - step_11 - step_11 - step_end - -gUnknown_81BB8A7:: @ 81BB8A7 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lockall - fadescreen 1 - setvar VAR_0x8004, 0 - special Special_BattleRecords - waitstate - releaseall - end - -gUnknown_81BB8C3:: @ 81BB8C3 -UnknownMap_00_00_EventScript_1BB8C3:: @ 81BB8C3 - setvar VAR_0x8005, 0 - textcolor 3 - special sub_80819C8 - waitstate - end - -gUnknown_81BB8CF:: @ 81BB8CF -UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF - setvar VAR_0x8005, 1 - textcolor 3 - special sub_80819C8 - waitstate - end - -gUnknown_81BB8DB:: @ 81BB8DB -UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB - fadescreen 1 - special sub_80A0334 - waitstate - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB94F - setvar VAR_0x8005, 0 - textcolor 3 - special sub_80819C8 - waitstate - end - -gUnknown_81BB8F8:: @ 81BB8F8 -UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 - fadescreen 1 - special sub_80A0334 - waitstate - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB94F - setvar VAR_0x8005, 1 - textcolor 3 - special sub_80819C8 - waitstate - end - -gUnknown_81BB915:: @ 81BB915 -UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 - fadescreen 1 - special sub_80A0334 - waitstate - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB94F - setvar VAR_0x8005, 2 - textcolor 3 - special sub_80819C8 - waitstate - end - -gUnknown_81BB932:: @ 81BB932 -UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 - fadescreen 1 - special sub_80A0334 - waitstate - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB94F - setvar VAR_0x8005, 3 - textcolor 3 - special sub_80819C8 - waitstate - end - -EventScript_1BB94F:: @ 81BB94F - end - -gUnknown_81BB950:: @ 81BB950 -UnknownMap_00_01_EventScript_1BB950:: @ 81BB950 - setvar VAR_0x8005, 0 - textcolor 3 - special sub_8081978 - waitstate - end - -gUnknown_81BB95C:: @ 81BB95C -UnknownMap_00_01_EventScript_1BB95C:: @ 81BB95C - setvar VAR_0x8005, 1 - textcolor 3 - special sub_8081978 - waitstate - end - -EventScript_1BB968:: @ 81BB968 - setvar VAR_0x8005, 2 - textcolor 3 - special sub_8081978 - waitstate - end - -EventScript_1BB974:: @ 81BB974 - setvar VAR_0x8005, 3 - textcolor 3 - special sub_8081978 - waitstate - end - -gUnknown_81BB980:: @ 81BB980 -UnknownMap_00_02_EventScript_1BB980:: @ 81BB980 - end - -gUnknown_81BB981:: @ 81BB981 - textcolor 3 - msgbox gUnknown_81BC84B - fadescreen 1 - special sp02A_crash_sound - waitstate - end - -gUnknown_81BB992:: @ 81BB992 - textcolor 3 - msgbox gUnknown_81BC874 - fadescreen 1 - special sp02A_crash_sound - waitstate - end - -gUnknown_81BB9A3:: @ 81BB9A3 - textcolor 3 - msgbox gUnknown_81BC827 - closemessage - end - -UnknownMap_00_00_EventScript_1BB9AF:: @ 81BB9AF - textcolor 3 - special sub_8069740 - msgbox gUnknown_81BC8AD - special sub_8069768 - closemessage - end - -UnknownMap_00_01_EventScript_1BB9C1:: @ 81BB9C1 - textcolor 3 - special sub_8069740 - msgbox gUnknown_81BC8DA - special sub_8069768 - closemessage - end - -UnknownMap_00_02_EventScript_1BB9D3:: @ 81BB9D3 - end - -gUnknown_81BB9D4:: @ 81BB9D4 - textcolor 3 - msgbox gUnknown_81BC7A1, 5 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB9F0 - erasebox 0, 0, 29, 19 - releaseall - end - -EventScript_1BB9F0:: @ 81BB9F0 - textcolor 3 - messageautoscroll Text_1BC7E2 - waitmessage - special sub_8081770 - end - -gUnknown_81BB9FC:: @ 81BB9FC - special sub_8081744 - special sub_807E704 - waitstate - end - -EventScript_1BBA04:: @ 81BBA04 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1BB877 - specialvar VAR_RESULT, Special_BadEggInParty - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB867 - copyvar VAR_0x8007, VAR_LAST_TALKED - specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BBB60 - message Text_1BD65B - waitmessage - goto EventScript_1BBA51 - -EventScript_1BBA50:: @ 81BBA50 - end - -EventScript_1BBA51:: @ 81BBA51 - multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE - switch VAR_RESULT - case 0, EventScript_1BBA94 - case 1, EventScript_1BB82F - case 2, EventScript_1BBA88 - case SCR_MENU_CANCEL, EventScript_1BB82F - end - -EventScript_1BBA88:: @ 81BBA88 - message Text_1BD706 - waitmessage - goto EventScript_1BBA51 - -EventScript_1BBA93:: @ 81BBA93 - end - -EventScript_1BBA94:: @ 81BBA94 - call EventScript_1BBB1E - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F - call EventScript_1A4EAF - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F - msgbox gUnknown_81BD86A - closemessage - special sp000_heal_pokemon - setvar VAR_0x8004, 6 - copyvar VAR_0x406F, VAR_0x8004 - special HelpSystem_Disable - call EventScript_1BC020 - special DrawWholeMapView - playse SE_TK_KASYA - delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F - waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 - waitmovement 0 - opendoor 5, 1 - waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C - waitmovement 0 - hideobject 255, MAP_UNKNOWN_MAP_00_00 - closedoor 5, 1 - waitdooranim - special sub_811B15C - special SetCableClubWarp - warpteleport2 MAP_UNKNOWN_MAP_00_04, 255, 7, 11 - waitstate - special UnionRoomSpecial - waitstate - end - -EventScript_1BBB1E:: @ 81BBB1E - specialvar VAR_RESULT, CountPartyNonEggMons - compare VAR_RESULT, 2 - goto_if lt, EventScript_1BBB44 - specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBB52 - setvar VAR_RESULT, 1 - return - -EventScript_1BBB44:: @ 81BBB44 - msgbox gUnknown_81BCBC3 - goto EventScript_1A77B0 - -EventScript_1BBB51:: @ 81BBB51 - end - -EventScript_1BBB52:: @ 81BBB52 - msgbox gUnknown_81BCC00 - goto EventScript_1A77B0 - -EventScript_1BBB5F:: @ 81BBB5F - end - -EventScript_1BBB60:: @ 81BBB60 - msgbox gUnknown_81BCC3A - release - return - -EventScript_1BBB6A:: @ 81BBB6A - lock - faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1BB877 - msgbox gUnknown_81BDB85, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BBB92 - msgbox gUnknown_81BDBF8 - release - return - -EventScript_1BBB92:: @ 81BBB92 - msgbox gUnknown_81BDEDF - release - return - -EventScript_1BBB9C:: @ 81BBB9C - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1BB877 - specialvar VAR_RESULT, Special_BadEggInParty - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB867 - specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB44A - message Text_1BD28D - waitmessage - delay 15 - goto EventScript_1BBBE7 - -EventScript_1BBBE6:: @ 81BBBE6 - end - -EventScript_1BBBE7:: @ 81BBBE7 - checkflag FLAG_GOT_POWDER_JAR - goto_if FALSE, EventScript_1BBC32 - multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE - switch VAR_RESULT - case 0, EventScript_1BBC69 - case 1, EventScript_1BBC97 - case 2, EventScript_1BBD35 - case 3, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F - end - -EventScript_1BBC32:: @ 81BBC32 - multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_2, FALSE - switch VAR_RESULT - case 0, EventScript_1BBC69 - case 1, EventScript_1BBC97 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F - end - -EventScript_1BBC69:: @ 81BBC69 - msgbox gUnknown_81BD317, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F - call EventScript_1BB79C - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F - setvar VAR_0x8004, 3 - goto EventScript_1BBD6F - -EventScript_1BBC96:: @ 81BBC96 - end - -EventScript_1BBC97:: @ 81BBC97 - message Text_1BD338 - waitmessage - multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE - switch VAR_RESULT - case 0, EventScript_1BBCEA - case 1, EventScript_1BBCF5 - case 2, EventScript_1BBD1C - case 3, EventScript_1BBD27 - case 4, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F - end - -EventScript_1BBCEA:: @ 81BBCEA - setvar VAR_0x8004, 0 - goto EventScript_1BBD6F - -EventScript_1BBCF4:: @ 81BBCF4 - end - -EventScript_1BBCF5:: @ 81BBCF5 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 - goto_if ne, EventScript_1BBD0E - setvar VAR_0x8004, 1 - goto EventScript_1BBD6F - -EventScript_1BBD0D:: @ 81BBD0D - end - -EventScript_1BBD0E:: @ 81BBD0E - msgbox gUnknown_81BC409 - goto EventScript_1BBC97 - -EventScript_1BBD1B:: @ 81BBD1B - end - -EventScript_1BBD1C:: @ 81BBD1C - setvar VAR_0x8004, 2 - goto EventScript_1BBD6F - -EventScript_1BBD26:: @ 81BBD26 - end - -EventScript_1BBD27:: @ 81BBD27 - msgbox gUnknown_81BD390 - goto EventScript_1BBC97 - -EventScript_1BBD34:: @ 81BBD34 - end - -EventScript_1BBD35:: @ 81BBD35 - msgbox gUnknown_81BD362, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F - special CheckHasAtLeastOneBerry - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BBD61 - setvar VAR_0x8004, 5 - goto EventScript_1BBD6F - -EventScript_1BBD60:: @ 81BBD60 - end - -EventScript_1BBD61:: @ 81BBD61 - msgbox gUnknown_81BCB81 - goto EventScript_1BBBE7 - -EventScript_1BBD6E:: @ 81BBD6E - end - -EventScript_1BBD6F:: @ 81BBD6F - call EventScript_1A4EAF - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F - switch VAR_0x8004 - case 3, EventScript_1BBDBC - case 0, EventScript_1BBDBC - case 1, EventScript_1BBDBC - case 2, EventScript_1BBE50 - case 5, EventScript_1BBEE4 - end - -EventScript_1BBDBC:: @ 81BBDBC - textcolor 3 - message Text_1BD51B - waitmessage - call EventScript_1A6675 - multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE - switch VAR_RESULT - case 0, EventScript_1BBE28 - case 1, EventScript_1BBE00 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F - end - -EventScript_1BBE00:: @ 81BBE00 - call EventScript_1BBF78 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBDBC - compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBE00 - release - return - -EventScript_1BBE28:: @ 81BBE28 - call EventScript_1BBF80 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBDBC - compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBE28 - release - return - -EventScript_1BBE50:: @ 81BBE50 - textcolor 3 - message Text_1BD582 - waitmessage - call EventScript_1A6675 - multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE - switch VAR_RESULT - case 0, EventScript_1BBEBC - case 1, EventScript_1BBE94 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F - end - -EventScript_1BBE94:: @ 81BBE94 - call EventScript_1BBF78 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBE50 - compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBE94 - release - return - -EventScript_1BBEBC:: @ 81BBEBC - call EventScript_1BBF80 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBE50 - compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBEBC - release - return - -EventScript_1BBEE4:: @ 81BBEE4 - textcolor 3 - message Text_1BD5F1 - waitmessage - call EventScript_1A6675 - multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE - switch VAR_RESULT - case 0, EventScript_1BBF50 - case 1, EventScript_1BBF28 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F - end - -EventScript_1BBF28:: @ 81BBF28 - call EventScript_1BBF78 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBEE4 - compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBF28 - release - return - -EventScript_1BBF50:: @ 81BBF50 - call EventScript_1BBF80 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBEE4 - compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBF50 - release - return - -EventScript_1BBF78:: @ 81BBF78 - special HelpSystem_Disable - special sub_8115A24 - waitstate - return - -EventScript_1BBF80:: @ 81BBF80 - special HelpSystem_Disable - special BerryBlenderLinkJoinGroup - waitstate - return - -EventScript_1BBF88:: @ 81BBF88 - messageautoscroll Text_1BC59E - waitmessage - delay 60 - closemessage - copyvar VAR_0x8007, VAR_LAST_TALKED - call EventScript_1BC034 - special DrawWholeMapView - playse SE_TK_KASYA - delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F - waitmovement 0 - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 - waitmovement 0 - opendoor 9, 1 - waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C - waitmovement 0 - hideobject 255, MAP_UNKNOWN_MAP_00_00 - closedoor 9, 1 - waitdooranim - release - waitstate - end - -gUnknown_81BBFD8:: @ 81BBFD8 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lockall - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1BB881 - specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BC016 - special HelpSystem_Disable - fadescreen 1 - special sub_814F1D4 - waitstate - msgbox gUnknown_81BCA43 - special HelpSystem_Enable - releaseall - end - -EventScript_1BC016:: @ 81BC016 - msgbox gUnknown_81BCA13 - releaseall - end - -EventScript_1BC020:: @ 81BC020 - setmetatile 5, 3, 709, 0 - return - -EventScript_1BC02A:: @ 81BC02A - setmetatile 5, 3, 761, 1 - return - -EventScript_1BC034:: @ 81BC034 - setmetatile 9, 3, 709, 0 - return - -EventScript_1BC03E:: @ 81BC03E - setmetatile 9, 3, 761, 1 - return - -EventScript_1BC048:: @ 81BC048 - setmetatile 5, 3, 737, 0 - return - -EventScript_1BC052:: @ 81BC052 - setmetatile 5, 3, 759, 1 - return - -CeladonCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -FiveIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -FourIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -LavenderTown_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -OneIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -PewterCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -Route10_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -Route4_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -SaffronCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -SevenIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -SixIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -TwoIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -VermilionCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C - special sub_811999C - end - -EventScript_1BC060:: @ 81BC060 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - message Text_1BCCFF - waitmessage - multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE - switch VAR_RESULT - case 0, EventScript_1BC0B0 - case 1, EventScript_1BC0BA - case 2, EventScript_1BC0C4 - case SCR_MENU_CANCEL, EventScript_1BC0C4 - end - -EventScript_1BC0B0:: @ 81BC0B0 - msgbox gUnknown_81BCD4D - release - end - -EventScript_1BC0BA:: @ 81BC0BA - msgbox gUnknown_81BCE73 - release - end - -EventScript_1BC0C4:: @ 81BC0C4 - msgbox gUnknown_81BCF2E - release - end - -EventScript_1BC0CE:: @ 81BC0CE - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - message Text_1BCF69 - waitmessage - specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BC29C - delay 60 - special HelpSystem_Disable - message Text_1BD02D - waitmessage - multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE - switch VAR_RESULT - case 0, EventScript_1BC13A - case 1, EventScript_1BC184 - case 2, EventScript_1BB83F - case SCR_MENU_CANCEL, EventScript_1BB83F - end - -EventScript_1BC13A:: @ 81BC13A - setvar VAR_0x8005, 0 - special sub_8149A18 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BC2A6 - msgbox gUnknown_81BD059 - setvar VAR_0x8005, 0 - special ChooseMonForWirelessMinigame - waitstate - compare VAR_0x8004, 6 - goto_if ge, EventScript_1BB83F - call EventScript_1A4EAF - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB83F - setvar VAR_0x8004, 4 - goto EventScript_1BC1CE - -EventScript_1BC183:: @ 81BC183 - end - -EventScript_1BC184:: @ 81BC184 - setvar VAR_0x8005, 1 - special sub_81537C0 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BC2A6 - msgbox gUnknown_81BD059 - setvar VAR_0x8005, 1 - special ChooseMonForWirelessMinigame - waitstate - compare VAR_0x8004, 6 - goto_if ge, EventScript_1BB83F - call EventScript_1A4EAF - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB83F - setvar VAR_0x8004, 6 - goto EventScript_1BC1CE - -EventScript_1BC1CD:: @ 81BC1CD - end - -EventScript_1BC1CE:: @ 81BC1CE - textcolor 3 - message Text_1BD5F1 - waitmessage - call EventScript_1A6675 - multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE - switch VAR_RESULT - case 0, EventScript_1BC23A - case 1, EventScript_1BC212 - case 2, EventScript_1BB83F - case SCR_MENU_CANCEL, EventScript_1BB83F - end - -EventScript_1BC212:: @ 81BC212 - call EventScript_1BBF78 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BC262 - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BC1CE - compare VAR_RESULT, 8 - goto_if eq, EventScript_1BC212 - release - return - -EventScript_1BC23A:: @ 81BC23A - call EventScript_1BBF80 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1BC262 - compare VAR_RESULT, 5 - goto_if eq, EventScript_1BC1CE - compare VAR_RESULT, 8 - goto_if eq, EventScript_1BC23A - release - return - -EventScript_1BC262:: @ 81BC262 - messageautoscroll Text_1BD080 - waitmessage - delay 120 - closemessage - copyvar VAR_0x8007, VAR_LAST_TALKED - call EventScript_1BC048 - special DrawWholeMapView - playse SE_TK_KASYA - delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F - waitmovement 0 - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A2 - waitmovement 0 - hideobject 255, MAP_UNKNOWN_MAP_00_00 - release - waitstate - end - -EventScript_1BC29C:: @ 81BC29C - msgbox gUnknown_81BCFE8 - release - end - -EventScript_1BC2A6:: @ 81BC2A6 - msgbox gUnknown_81BD0CF, 5 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB83F - compare VAR_0x8005, 0 - call_if eq, EventScript_1BC2D5 - compare VAR_0x8005, 1 - call_if eq, EventScript_1BC2DE - goto EventScript_1BB83F - -EventScript_1BC2D4:: @ 81BC2D4 - end - -EventScript_1BC2D5:: @ 81BC2D5 - msgbox gUnknown_81BD14B - return - -EventScript_1BC2DE:: @ 81BC2DE - msgbox gUnknown_81BD213 - return - -TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lockall - special sub_814B504 - waitstate - releaseall - end - -TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lockall - special sub_8153810 - waitstate - releaseall - end - -gUnknown_81BC311:: @ 81BC311 - .string "Welcome to the POKéMON CABLE\n" - .string "CLUB.\p" - .string "Which of our services do you wish\n" - .string "to use?$" - -gUnknown_81BC35E:: @ 81BC35E - .string "Which of our services do you wish\n" - .string "to use?$" - -Text_1BC388:: @ 81BC388 - .string "Trade POKéMON with another player\n" - .string "using a GBA Game Link cable.$" - -Text_1BC3C7:: @ 81BC3C7 - .string "You may battle another TRAINER\n" - .string "using a GBA Game Link cable.$" - -Text_1BC403:: @ 81BC403 - .string "おわります$" - -gUnknown_81BC409:: @ 81BC409 - .string "For a DOUBLE BATTLE, you must\n" - .string "have at least two POKéMON.$" - -gUnknown_81BC442:: @ 81BC442 - .string "For trading, you must have at\n" - .string "least two POKéMON with you.$" - -gUnknown_81BC47C:: @ 81BC47C - .string "A POKéMON holding the {STR_VAR_1}\n" - .string "BERRY can't be traded.$" - -gUnknown_81BC4AC:: @ 81BC4AC - .string "Please wait.\n" - .string "… … B Button: Cancel$" - -gUnknown_81BC4CE:: @ 81BC4CE - .string "When all players are ready…\n" - .string "A Button: Confirm\l" - .string "B Button: Cancel$" - -gUnknown_81BC50D:: @ 81BC50D - .string "Start link with {STR_VAR_1} players.\n" - .string "A Button: Confirm\l" - .string "B Button: Cancel$" - -gUnknown_81BC54C:: @ 81BC54C - .string "Awaiting linkup…\n" - .string "… … B Button: Cancel$" - -Text_1BC572:: @ 81BC572 - .string "はじめる　まえに　レポートを\n" - .string "かきますが　よろしいですか？$" - -Text_1BC590:: @ 81BC590 - .string "Please enter.$" - -Text_1BC59E:: @ 81BC59E - .string "I'll direct you to your room now.$" - -gUnknown_81BC5C0:: @ 81BC5C0 - .string "Someone is not ready to link.\p" - .string "Please come back after everyone\n" - .string "has made preparations.$" - -gUnknown_81BC615:: @ 81BC615 - .string "Sorry, we have a link error…\n" - .string "Please reset and try again.$" - -gUnknown_81BC64E:: @ 81BC64E - .string "The link partners appear to have\n" - .string "made different selections.$" - -gUnknown_81BC68A:: @ 81BC68A - .string "Please do visit again.$" - -gUnknown_81BC6A1:: @ 81BC6A1 - .string "The number of participants is\n" - .string "incorrect.$" - -gUnknown_81BC6CA:: @ 81BC6CA - .string "The SINGLE BATTLE Mode can't be\n" - .string "played by {STR_VAR_1} players.$" - -gUnknown_81BC700:: @ 81BC700 - .string "The DOUBLE BATTLE Mode can't be\n" - .string "played by {STR_VAR_1} players.$" - -gUnknown_81BC736:: @ 81BC736 - .string "There must be four players to play\n" - .string "this Battle Mode.$" - -gUnknown_81BC76B:: @ 81BC76B - .string "Please confirm the number of\n" - .string "players and start again.$" - -gUnknown_81BC7A1:: @ 81BC7A1 - .string "The link will be terminated if you\n" - .string "leave the room. Is that okay?$" - -Text_1BC7E2:: @ 81BC7E2 - .string "Terminating link…\n" - .string "You will be escorted out of\l" - .string "the room. Please wait.$" - -gUnknown_81BC827:: @ 81BC827 - .string "This TRAINER is too busy to\n" - .string "notice…$" - -gUnknown_81BC84B:: @ 81BC84B - .string "Score! Got to look at {STR_VAR_1}'s\n" - .string "TRAINER CARD!$" - -gUnknown_81BC874:: @ 81BC874 - .string "Score! Got to look at {STR_VAR_1}'s\n" - .string "TRAINER CARD!\p" - .string "It's a {STR_VAR_2} card!$" - -gUnknown_81BC8AD:: @ 81BC8AD - .string "Please take your seat and start\n" - .string "your battle.$" - -gUnknown_81BC8DA:: @ 81BC8DA - .string "Please take your seat and start\n" - .string "your trade.$" - -Text_1BC906:: @ 81BC906 - .string "ごりよう　ありがとう　ございました$" - -Text_1BC918:: @ 81BC918 - .string "The TRAINER CARD data will\n" - .string "be overwritten.$" - -Text_1BC943:: @ 81BC943 - .string "I hope to see you again!$" - -gUnknown_81BC95C:: @ 81BC95C - .string "I'm awfully sorry.\p" - .string "We're not set up to conduct trades\n" - .string "with TRAINERS far away in another\l" - .string "region yet…$" - -gUnknown_81BC9C0:: @ 81BC9C0 - .string "The other TRAINER is not ready.$" - -gUnknown_81BC9E0:: @ 81BC9E0 - .string "You have at least one POKéMON\n" - .string "that can't be taken.$" - -gUnknown_81BCA13:: @ 81BCA13 - .string "The Wireless Adapter is not\n" - .string "connected properly.$" - -gUnknown_81BCA43:: @ 81BCA43 - .string "Participants are asked to step up\n" - .string "to the reception counter.$" - -Text_1BCA7F:: @ 81BCA7F - .string "こんにちは！$" - -Text_1BCA86:: @ 81BCA86 - .string "しょうしょう　おまちください$" - -Text_1BCA95:: @ 81BCA95 - .string "You may trade your POKéMON here\n" - .string "with another TRAINER.$" - -Text_1BCACB:: @ 81BCACB - .string "You may battle with your friends\n" - .string "here.$" - -Text_1BCAF2:: @ 81BCAF2 - .string "Two to five TRAINERS can make\n" - .string "BERRY POWDER together.$" - -Text_1BCB27:: @ 81BCB27 - .string "ワイヤレス　クラブでの\n" - .string "あそびかたを　せつめいします$" - -Text_1BCB42:: @ 81BCB42 - .string "Cancels the selected MENU item.$" - -Text_1BCB62:: @ 81BCB62 - .string "どちらの　しょうぶに　しますか？$" - -Text_1BCB73:: @ 81BCB73 - .string "ひとつ　まえに　もどります$" - -gUnknown_81BCB81:: @ 81BCB81 - .string "To use the BERRY CRUSH service,\n" - .string "you must have at least one BERRY.$" - -gUnknown_81BCBC3:: @ 81BCBC3 - .string "To enter the UNION ROOM, you must\n" - .string "have at least two POKéMON.$" - -gUnknown_81BCC00:: @ 81BCC00 - .string "No POKéMON holding the {STR_VAR_1}\n" - .string "BERRY may enter the UNION ROOM.$" - -gUnknown_81BCC3A:: @ 81BCC3A - .string "This is the POKéMON WIRELESS CLUB\n" - .string "UNION ROOM.\p" - .string "Unfortunately, your Wireless\n" - .string "Adapter is not connected properly.\p" - .string "Please do come again.$" - -Text_1BCCBE:: @ 81BCCBE - .string "あ‥‥\n" - .string "おきゃくさま！$" - -Text_PlayerIsPlayingRightNowGoForIt:: @ 81BCCCA - .string "It appears as if {STR_VAR_1} is playing\n" - .string "right now.\l" - .string "Go for it!$" - -Text_1BCCFF:: @ 81BCCFF - .string "I can explain game rules to you,\n" - .string "if you'd like.\p" - .string "Which game should I describe?$" - -gUnknown_81BCD4D:: @ 81BCD4D - .string "“POKéMON JUMP”\p" - .string "Make your POKéMON skip the\n" - .string "VINE WHIP rope with the A Button.\p" - .string "Only mini POKéMON around 28 inches\n" - .string "or less may participate.\p" - .string "POKéMON that only swim, burrow, or\n" - .string "fly are not good at jumping.\p" - .string "As a result, those POKéMON may not\n" - .string "participate.\p" - .string "Good things happen if everyone\n" - .string "jumps in time.$" - -gUnknown_81BCE73:: @ 81BCE73 - .string "“DODRIO BERRY-PICKING”\p" - .string "Command DODRIO's three heads to\n" - .string "catch falling BERRIES.\p" - .string "Press right, up, or left on the\n" - .string "{PLUS} Control Pad to move the heads.\p" - .string "To play this game, you must have\n" - .string "a DODRIO.$" - -gUnknown_81BCF2E:: @ 81BCF2E - .string "If you want to play a game,\n" - .string "please tell the man beside me.$" - -Text_1BCF69:: @ 81BCF69 - .string "Hi, welcome!\n" - .string "You can play games over the\l" - .string "Wireless Communication System.\p" - .string "Can you wait just a little bit?$" - -gUnknown_81BCFD1:: @ 81BCFD1 - .string "All right, come again!$" - -gUnknown_81BCFE8:: @ 81BCFE8 - .string "The Wireless Adapter isn't\n" - .string "connected.\p" - .string "Come back when it's hooked up!$" - -Text_1BD02D:: @ 81BD02D - .string "All right, which game did you want\n" - .string "to play?$" - -gUnknown_81BD059:: @ 81BD059 - .string "Which POKéMON would you like to\n" - .string "enter?$" - -Text_1BD080:: @ 81BD080 - .string "Okay, you're all good to go.\n" - .string "Don't let the others beat you!$" - -Text_1BD0BC:: @ 81BD0BC - .string "きょうは　けえるのか？\n" - .string "またこいよ！$" - -gUnknown_81BD0CF:: @ 81BD0CF - .string "It doesn't look like you have any\n" - .string "POKéMON that you can enter…\p" - .string "Would you like me to explain what\n" - .string "kinds of POKéMON can enter?$" - -gUnknown_81BD14B:: @ 81BD14B - .string "“POKéMON JUMP” is open to POKéMON\n" - .string "around 28 inches or less.\p" - .string "What you can't enter are those\n" - .string "POKéMON that can't jump.\p" - .string "You know, like POKéMON that only\n" - .string "swim, burrow, or fly.\p" - .string "That's all you need to know.$" - -gUnknown_81BD213:: @ 81BD213 - .string "“DODRIO BERRY-PICKING”…\n" - .string "Well, the name says it all.\p" - .string "You have to have a DODRIO to play\n" - .string "this game.$" - -Text_1BD274:: @ 81BD274 - .string "もういちど　はじめから\n" - .string "やりなおして　みて　くれ$" - -Text_1BD28D:: @ 81BD28D - .string "Welcome to the POKéMON WIRELESS\n" - .string "CLUB DIRECT CORNER.\p" - .string "You may interact directly with\n" - .string "your friends here.\p" - .string "Which room would you like to\n" - .string "enter?$" - -gUnknown_81BD317:: @ 81BD317 - .string "Would you like to trade POKéMON?$" - -Text_1BD338:: @ 81BD338 - .string "Which Battle Mode would you like\n" - .string "to play?$" - -gUnknown_81BD362:: @ 81BD362 - .string "Would you like to use the\n" - .string "BERRY CRUSH System?$" - -gUnknown_81BD390:: @ 81BD390 - .string "There are three Battle Modes.\p" - .string "SINGLE BATTLE is for two TRAINERS\n" - .string "with one or more POKéMON each.\p" - .string "Each TRAINER can have one POKéMON\n" - .string "in battle at a time.\p" - .string "DOUBLE BATTLE is for two TRAINERS\n" - .string "with two or more POKéMON each.\p" - .string "Each TRAINER will send out two\n" - .string "POKéMON in battle at a time.\p" - .string "MULTI BATTLE is for four TRAINERS\n" - .string "with one or more POKéMON each.\p" - .string "Each TRAINER can have one POKéMON\n" - .string "in battle at a time.$" - -Text_1BD51B:: @ 81BD51B - .string "Please decide which of you two\n" - .string "will become the LEADER.\p" - .string "The other player must then choose\n" - .string "“JOIN GROUP.”$" - -Text_1BD582:: @ 81BD582 - .string "Please decide which of you four\n" - .string "will become the GROUP LEADER.\p" - .string "The other players must then choose\n" - .string "“JOIN GROUP.”$" - -Text_1BD5F1:: @ 81BD5F1 - .string "Please decide which of you will\n" - .string "become the GROUP LEADER.\p" - .string "The other players must then choose\n" - .string "“JOIN GROUP.”$" - -Text_1BD65B:: @ 81BD65B - .string "Welcome to the POKéMON WIRELESS\n" - .string "CLUB UNION ROOM.\p" - .string "You may interact directly with\n" - .string "other TRAINERS here, some of\l" - .string "whom you may not even know.\p" - .string "Would you like to enter the ROOM?$" - -Text_1BD706:: @ 81BD706 - .string "The TRAINERS in the UNION ROOM\n" - .string "will be those players around you\l" - .string "who have also entered the ROOM.\p" - .string "You may do all sorts of things\n" - .string "here, such as exchanging greetings.\p" - .string "You may enter two POKéMON up to\n" - .string "Lv. 30 for a one-on-one battle.\p" - .string "You may take part in a chat with\n" - .string "two to five people.\p" - .string "Or, you may register a POKéMON for\n" - .string "trade.\p" - .string "Would you like to enter the ROOM?$" - -gUnknown_81BD86A:: @ 81BD86A - .string "I hope you enjoy your time in\n" - .string "the UNION ROOM.$" - -gUnknown_81BD898:: @ 81BD898 - .string "Hello!\n" - .string "My name is TEALA.\p" - .string "This must be your first time\n" - .string "up here.\p" - .string "I'll show you how the Wireless\n" - .string "Communication System works.\p" - .string "First, I need to show you this\n" - .string "floor of our POKéMON CENTER.\p" - .string "Right this way, please.$" - -gUnknown_81BD966:: @ 81BD966 - .string "On the top floor, there are two\n" - .string "rooms.\p" - .string "First, the room on the left.\n" - .string "It's the UNION ROOM.\p" - .string "You may link up with TRAINERS\n" - .string "around you who have also entered\l" - .string "the UNION ROOM.\p" - .string "With them, you may do things like\n" - .string "chat, battle, and trade.\p" - .string "Second, the room on the right is\n" - .string "the DIRECT CORNER.\p" - .string "You may trade or battle POKéMON\n" - .string "with your friends in this room.\p" - .string "If the Wireless Adapter isn't\n" - .string "connected, you may still link up\l" - .string "using a GBA Game Link cable.\p" - .string "If that is the case, you must go\n" - .string "to the DIRECT CORNER.\p" - .string "I hope you enjoy the Wireless \n" - .string "Communication System.$" - -gUnknown_81BDB85:: @ 81BDB85 - .string "Hello, {PLAYER}!\p" - .string "It's me, TEALA, the POKéMON\n" - .string "CENTER 2F attendant.\p" - .string "Is there something you needed to\n" - .string "ask me about linking?$" - -gUnknown_81BDBF8:: @ 81BDBF8 - .string "Let me explain how the POKéMON\n" - .string "WIRELESS CLUB works.\p" - .string "On this, the top floor, there are\n" - .string "two rooms.\p" - .string "First, the room on the left.\n" - .string "It's the UNION ROOM.\p" - .string "You may link up with TRAINERS\n" - .string "around you who have also entered\l" - .string "the UNION ROOM.\p" - .string "With them, you may do things like\n" - .string "chat, battle, and trade.\p" - .string "Second, the room on the right is\n" - .string "the DIRECT CORNER.\p" - .string "You may trade or battle POKéMON\n" - .string "with your friends in this room.\p" - .string "Sometimes, you may not be able to\n" - .string "find your friends in the UNION ROOM\l" - .string "or the DIRECT CORNER.\p" - .string "In that case, please move closer\n" - .string "to your friends.\p" - .string "If the Wireless Adapter isn't\n" - .string "connected, you may still link up\l" - .string "using a GBA Game Link cable.\p" - .string "If that is the case, you must go\n" - .string "to the DIRECT CORNER.\p" - .string "I hope you enjoy the Wireless \n" - .string "Communication System.$" - -gUnknown_81BDEDF:: @ 81BDEDF - .string "I hope you enjoy the Wireless\n" - .string "Communication System.$" - + .include "data/scripts/cable_club.inc" .include "data/scripts/field_moves.inc" .include "data/scripts/item_ball_scripts.inc" .include "data/scripts/mystery_event_club.inc" @@ -6599,8 +4588,8 @@ EventScript_1BFB98:: @ 81BFB98 EventScript_SafariRetire:: @ 81BFBAA lockall - msgbox Text_1BFBE9, 5 - compare VAR_RESULT, 1 + msgbox Text_1BFBE9, MSGBOX_YESNO + compare VAR_RESULT, YES goto_if eq, EventScript_1BFBC0 releaseall end @@ -7103,14 +5092,14 @@ Text_1C0DD4:: @ 81C0DD4 .string "ほんだなに　ならんでいるのは\n" .string "ポケモンの　ほん　ばかりだ$" -Text_1C0DF1:: @ 81C0DF1 +Text_ATownMap:: @ 81C0DF1 .string "A TOWN MAP.$" gUnknown_81C0DFD:: @ 81C0DFD .string "Wow!\n" .string "Tons of POKéMON stuff!$" -gUnknown_81C0E19:: @ 81C0E19 +Text_DishesPlatesNeatlyLinedUp:: @ 81C0E19 .string "Dishes and plates are neatly\n" .string "lined up.$" @@ -7217,1014 +5206,7 @@ gUnknown_81C1300:: @ 81C1300 .string "It looks like it's having fun.$" .include "data/scripts/hole.inc" - -gUnknown_81C137C:: @ 81C137C - .string "The battery isn't charged enough.\p" - .string "No. of steps required to fully\n" - .string "charge the battery: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" - -gUnknown_81C13D6:: @ 81C13D6 - .string "There are no TRAINERS within range\n" - .string "who can battle…\p" - .string "The VS SEEKER was turned off.{PAUSE_UNTIL_PRESS}$" - -gUnknown_81C1429:: @ 81C1429 - .string "The other TRAINERS don't appear\n" - .string "to be ready for battle.\p" - .string "Let's wait till later.{PAUSE_UNTIL_PRESS}$" - -Text_1C147A:: @ 81C147A - .string "Hey!\n" - .string "I saw you in VIRIDIAN FOREST!$" - -Text_1C149D:: @ 81C149D - .string "Hi! I like shorts!\n" - .string "They're comfy and easy to wear!\p" - .string "You should be wearing shorts, too!$" - -Text_1C14F3:: @ 81C14F3 - .string "Excuse me!\n" - .string "You keep looking at me, don't you?$" - -Text_1C1521:: @ 81C1521 - .string "You're a TRAINER, aren't you?\n" - .string "Let's get with it right away!$" - -Text_1C155D:: @ 81C155D - .string "That look you give me…\n" - .string "It intrigues me so!$" - -Text_1C1588:: @ 81C1588 - .string "Hey! What's wrong with you?\n" - .string "You're still not wearing shorts!$" - -Text_1C15C5:: @ 81C15C5 - .string "I'll battle you with the POKéMON\n" - .string "I started raising.$" - -Text_1C15F9:: @ 81C15F9 - .string "Eek!\n" - .string "Did you push me?$" - -Text_1C160F:: @ 81C160F - .string "I always catch mushroom POKéMON\n" - .string "on MT. MOON.$" - -Text_1C163C:: @ 81C163C - .string "Oh! You're that nosy kid who\n" - .string "eavesdropped on us!$" - -Text_1C166D:: @ 81C166D - .string "Excuse me! Didn't I tell you that\n" - .string "this is a private conversation?\p" - .string "You shouldn't be listening in,\n" - .string "you uncouth person!$" - -Text_1C16E2:: @ 81C16E2 - .string "I'm trying to find something good\n" - .string "that's not a BUG POKéMON, but…$" - -Text_1C1723:: @ 81C1723 - .string "Huh?\n" - .string "You want to go with me again?$" - -Text_1C1746:: @ 81C1746 - .string "Me?\n" - .string "Well, okay. I'll play this once.$" - -Text_1C176B:: @ 81C176B - .string "Hey, long time!\n" - .string "Have you gotten better?$" - -Text_1C1793:: @ 81C1793 - .string "You are good at POKéMON, but how\n" - .string "is your chemistry grade?$" - -Text_1C17CD:: @ 81C17CD - .string "All right!\n" - .string "Let's play another game!$" - -Text_1C17F1:: @ 81C17F1 - .string "You need strategy to win at\n" - .string "battling.\p" - .string "Are you following my advice?$" - -Text_1C1834:: @ 81C1834 - .string "I've collected many NIDORAN.\n" - .string "I don't want them to evolve, but…$" - -Text_1C1873:: @ 81C1873 - .string "School is fun, but I still think\n" - .string "POKéMON are fun, too.$" - -Text_1C18AA:: @ 81C18AA - .string "MEOWTH and PERSIAN are so cute,\n" - .string "meow, meow, meow!$" - -Text_1C18DC:: @ 81C18DC - .string "We may look silly standing here\n" - .string "like this, but I can still battle.$" - -Text_1C191F:: @ 81C191F - .string "I'm a rambling, gaming dude!\n" - .string "I'm on a winning streak!$" - -Text_1C1955:: @ 81C1955 - .string "What's a cute, round, and fluffy\n" - .string "POKéMON?\p" - .string "You already know, don't you?$" - -Text_1C199C:: @ 81C199C - .string "My bike's still acting up, man.$" - -Text_1C19BC:: @ 81C19BC - .string "Okay, kid!\n" - .string "Don't expect mercy this time!$" - -Text_1C19E5:: @ 81C19E5 - .string "ELI: Our twin power became even\n" - .string "better!$" - -Text_1C1A0D:: @ 81C1A0D - .string "ANNE: Our twin power powered up!$" - -Text_1C1A2E:: @ 81C1A2E - .string "We're to battle again?\n" - .string "This time, you're mine!$" - -Text_1C1A5D:: @ 81C1A5D - .string "I haven't forgotten you were with\n" - .string "those good-looking POKéMON.$" - -Text_1C1A9B:: @ 81C1A9B - .string "I'm taking ROCK TUNNEL to go to\n" - .string "LAVENDER…\p" - .string "But I keep getting stopped by\n" - .string "everyone along the way…$" - -Text_1C1AFB:: @ 81C1AFB - .string "Don't you dare patronize me today!\n" - .string "We're playing for keeps!$" - -Text_1C1B37:: @ 81C1B37 - .string "Bwahaha!\n" - .string "Great! I was bored again, eh!$" - -Text_1C1B5E:: @ 81C1B5E - .string "Hahaha!\n" - .string "A little toughie, as always!$" - -Text_1C1B83:: @ 81C1B83 - .string "I got up early every day to train\n" - .string "my POKéMON from cocoons!$" - -Text_1C1BBE:: @ 81C1BBE - .string "Hahahaha!\n" - .string "I'll win this time!$" - -Text_1C1BDC:: @ 81C1BDC - .string "Go win, my super BUG POKéMON!$" - -Text_1C1BFA:: @ 81C1BFA - .string "Wow, you came here again?\n" - .string "Maybe you're a POKéMANIAC, too?\l" - .string "Want to see my collection?$" - -Text_1C1C4F:: @ 81C1C4F - .string "Ha-hahah-ah-ha!\n" - .string "I can't stop sneezing!$" - -Text_1C1C76:: @ 81C1C76 - .string "Hi, kid!\n" - .string "Did I show you my POKéMON?$" - -Text_1C1C9A:: @ 81C1C9A - .string "I went out to a POKéMON GYM again.\p" - .string "…But I lost as usual.$" - -Text_1C1CD3:: @ 81C1CD3 - .string "Ah!\n" - .string "This mountain air is delicious!\l" - .string "It's so good, I can't leave!$" - -Text_1C1D14:: @ 81C1D14 - .string "My head is starting to spin.\n" - .string "I've been hiking for too long…$" - -Text_1C1D50:: @ 81C1D50 - .string "Win, lose, or draw!\n" - .string "Now for our rematch!$" - -Text_1C1D79:: @ 81C1D79 - .string "Competing is the ultimate thrill.\n" - .string "I still can't get enough!$" - -Text_1C1DB5:: @ 81C1DB5 - .string "You know, right?\n" - .string "Let's go, but don't cheat!$" - -Text_1C1DE1:: @ 81C1DE1 - .string "Hi, there!\p" - .string "But be careful!\n" - .string "I'm still laying down some cables!$" - -Text_1C1E1F:: @ 81C1E1F - .string "I became a TRAINER a while ago.\n" - .string "But, I think I can win.$" - -Text_1C1E57:: @ 81C1E57 - .string "Fwahaha!\n" - .string "I have never lost!\p" - .string "…And if I did, I've forgotten all\n" - .string "about it!$" - -Text_1C1E9F:: @ 81C1E9F - .string "I have never won before…\p" - .string "Perhaps I am destined to remain\n" - .string "that way…$" - -Text_1C1EE2:: @ 81C1EE2 - .string "I'm the best in my class.\n" - .string "I train every morning and night!$" - -Text_1C1F1D:: @ 81C1F1D - .string "Keep your eyes out for live wires!$" - -Text_1C1F40:: @ 81C1F40 - .string "I raised my POKéMON carefully.\n" - .string "They should be ready by now.\l" - .string "This time, they should win, too.$" - -Text_1C1F9D:: @ 81C1F9D - .string "Yeah!\n" - .string "I got a bite, here!\l" - .string "Th-this might be the real thing!$" - -Text_1C1FD8:: @ 81C1FD8 - .string "You're finally here.\n" - .string "Fishing is a waiting game.$" - -Text_1C2008:: @ 81C2008 - .string "Still can't find a MOON STONE…\n" - .string "Have you found one?$" - -Text_1C203B:: @ 81C203B - .string "Electricity has always been my\n" - .string "specialty.\p" - .string "I don't know a thing about POKéMON\n" - .string "of the sea, though.$" - -Text_1C209C:: @ 81C209C - .string "The FISHING FOOL vs. POKéMON KID!\n" - .string "Another round, fight!$" - -Text_1C20D4:: @ 81C20D4 - .string "I love fishing, don't get me wrong.\n" - .string "But, I wish I had more work…\l" - .string "…It's hard to give up fishing!$" - -Text_1C2134:: @ 81C2134 - .string "What's catching?\p" - .string "You'll never know unless you beat\n" - .string "me!$" - -Text_1C216B:: @ 81C216B - .string "JES: I'll win here today and\n" - .string "propose to my GIA.$" - -Text_1C219B:: @ 81C219B - .string "GIA: Hey, JES…\n" - .string "I've been waiting a long time now.\p" - .string "If we win today, I'll marry you!$" - -Text_1C21EE:: @ 81C21EE - .string "My bird POKéMON remember you!$" - -Text_1C220C:: @ 81C220C - .string "I want to be the best TRAINER \n" - .string "while I'm a kid!$" - -Text_1C223C:: @ 81C223C - .string "Wow!\n" - .string "You got more cool BADGES!$" - -Text_1C225B:: @ 81C225B - .string "My cutely grown POKéMON wish to\n" - .string "become reacquainted with you.$" - -Text_1C2299:: @ 81C2299 - .string "I cleaned out my savings and\n" - .string "bought more CARBOS.$" - -Text_1C22CA:: @ 81C22CA - .string "I'm not going to lose this time.\n" - .string "The wind's blowing my way!$" - -Text_1C2306:: @ 81C2306 - .string "Oh, you're back?\p" - .string "Sure, I'll play again with you,\n" - .string "sweetie.$" - -Text_1C2340:: @ 81C2340 - .string "Can't you forget that you battled\n" - .string "with me?$" - -Text_1C236B:: @ 81C236B - .string "What're you starin' at?$" - -Text_1C2383:: @ 81C2383 - .string "I always go with bird POKéMON.\n" - .string "I've dedicated myself to them.$" - -Text_1C23C1:: @ 81C23C1 - .string "I used TMs to teach good moves\n" - .string "to my POKéMON.$" - -Text_1C23EF:: @ 81C23EF - .string "My bird POKéMON should be ready\n" - .string "for battle this time.$" - -Text_1C2425:: @ 81C2425 - .string "Are you using TMs on POKéMON?\n" - .string "Just holding them is useless.$" - -Text_1C2461:: @ 81C2461 - .string "Have you taught your bird POKéMON\n" - .string "how to FLY?\p" - .string "You'll be able to soar with it into\n" - .string "the sky! Give it a try.$" - -Text_1C24CB:: @ 81C24CB - .string "The legend of the winged mirages…\n" - .string "You've heard it, right?$" - -Text_1C2505:: @ 81C2505 - .string "I'm really not into it, but okay.\n" - .string "Let's go!$" - -Text_1C2531:: @ 81C2531 - .string "Hey!\n" - .string "I remember you!\p" - .string "C'mon, c'mon.\n" - .string "Let's go, let's go, let's go!$" - -Text_1C2572:: @ 81C2572 - .string "You're here again, huh?\n" - .string "Shut up and battle.$" - -Text_1C259E:: @ 81C259E - .string "We've been riding here because of\n" - .string "the wide-open spaces.$" - -Text_1C25D6:: @ 81C25D6 - .string "POKéMON battle, right?\n" - .string "Cool! Rumble!$" - -Text_1C25FB:: @ 81C25FB - .string "KIRI: JAN, I hope we win today.$" - -Text_1C261B:: @ 81C261B - .string "JAN: KIRI, here we go!\n" - .string "Let's win for sure this time!$" - -Text_1C2650:: @ 81C2650 - .string "I'm going to keep battling with the\n" - .string "POKéMON I got in trades.$" - -Text_1C268D:: @ 81C268D - .string "You look gentle, so I think I can\n" - .string "beat you.\p" - .string "I'll give it one more go!$" - -Text_1C26D3:: @ 81C26D3 - .string "When I whistle, bird POKéMON\n" - .string "gather around.\p" - .string "They're amazingly cute!$" - -Text_1C2717:: @ 81C2717 - .string "Hmm? My birds are shivering!\n" - .string "Wait, aren't you that TRAINER…$" - -Text_1C2753:: @ 81C2753 - .string "Oh, you're a little cutie!\n" - .string "So like a darling POKéMON!\l" - .string "I remember you now!$" - -Text_1C279D:: @ 81C279D - .string "I raise POKéMON for protection\n" - .string "because I live alone.\p" - .string "That hasn't changed.$" - -Text_1C27E7:: @ 81C27E7 - .string "Hey, kid! C'mon!\n" - .string "I got these off some loser!$" - -Text_1C2814:: @ 81C2814 - .string "Fork over all your cash when you\n" - .string "lose to me, kid!$" - -Text_1C2846:: @ 81C2846 - .string "What's cool and happening?\n" - .string "Trading POKéMON, of course.$" - -Text_1C287D:: @ 81C287D - .string "Want to play with my POKéMON\n" - .string "again?$" - -Text_1C28A1:: @ 81C28A1 - .string "MYA: Hi, we keep meeting,\n" - .string "don't we?\p" - .string "Help me train my little brother\n" - .string "again?$" - -Text_1C28EC:: @ 81C28EC - .string "RON: My sister's gotten more\n" - .string "powerful…$" - -Text_1C2913:: @ 81C2913 - .string "What do you want?$" - -Text_1C2925:: @ 81C2925 - .string "Nice BIKE!\n" - .string "Hand it over quick!$" - -Text_1C2944:: @ 81C2944 - .string "Come out and play, little mouse.\n" - .string "I'll treat you right!$" - -Text_1C297B:: @ 81C297B - .string "Hey, wait a second!\n" - .string "Don't call me and then run away!$" - -Text_1C29B0:: @ 81C29B0 - .string "I'm feeling hungry and mean!\n" - .string "I really need a punching bag!$" - -Text_1C29EB:: @ 81C29EB - .string "Hey, there!\n" - .string "We'll have ourselves a good time!$" - -Text_1C2A19:: @ 81C2A19 - .string "JED: Are you here to see our\n" - .string "love, which knows no bounds?$" - -Text_1C2A53:: @ 81C2A53 - .string "LEA: Sometimes, the intensity of\n" - .string "our love scares me.$" - -Text_1C2A88:: @ 81C2A88 - .string "I told you, there's no getting rich\n" - .string "quick in battling kids.$" - -Text_1C2AC4:: @ 81C2AC4 - .string "I'm mighty proud of my bod, kiddo.\n" - .string "Come on!$" - -Text_1C2AF0:: @ 81C2AF0 - .string "You out for a stroll?$" - -Text_1C2B06:: @ 81C2B06 - .string "We're BIKERS!\n" - .string "We rule the roads, man!$" - -Text_1C2B2C:: @ 81C2B2C - .string "VOLTORB's going to seriously\n" - .string "electrify you today!$" - -Text_1C2B5E:: @ 81C2B5E - .string "I leveled up my POKéMON, but it\n" - .string "absolutely won't evolve. Why?$" - -Text_1C2B9C:: @ 81C2B9C - .string "Gaah! I really need to exercise\n" - .string "and seriously trim some flab!$" - -Text_1C2BDA:: @ 81C2BDA - .string "Be a rebel!$" - -Text_1C2BE6:: @ 81C2BE6 - .string "Yep, that's a nice BIKE!\n" - .string "How's it handle?$" - -Text_1C2C10:: @ 81C2C10 - .string "Get lost, kid!\n" - .string "I'm bushed!$" - -Text_1C2C2B:: @ 81C2C2B - .string "I've been checking every grassy\n" - .string "area for new POKéMON.\p" - .string "But it's not always easy…$" - -Text_1C2C7B:: @ 81C2C7B - .string "Koorukukukoo!\n" - .string "Is my birdcall getting better?$" - -Text_1C2CA8:: @ 81C2CA8 - .string "I warned you before, this is my\n" - .string "turf!\p" - .string "I don't want you coming around.$" - -Text_1C2CEE:: @ 81C2CEE - .string "I'm almost warmed up to go\n" - .string "out for a swim.$" - -Text_1C2D19:: @ 81C2D19 - .string "Wait! Slow down!\n" - .string "What if you have a heart attack?$" - -Text_1C2D4B:: @ 81C2D4B - .string "I love swimming!\n" - .string "I guess you're the surfing type.$" - -Text_1C2D7D:: @ 81C2D7D - .string "What's beyond the horizon?\n" - .string "Have you seen?$" - -Text_1C2DA7:: @ 81C2DA7 - .string "I tried diving for POKéMON again,\n" - .string "but it was a no-go like before.$" - -Text_1C2DE9:: @ 81C2DE9 - .string "I look at the sea to forget all\n" - .string "the bad things that happened.\p" - .string "…Like losing to you the last time!$" - -Text_1C2E4A:: @ 81C2E4A - .string "You always get to ride your\n" - .string "POKéMON…\p" - .string "It looks so relaxing.\n" - .string "Can I have it if I win?$" - -Text_1C2E9D:: @ 81C2E9D - .string "Swimming's great!\n" - .string "Sunburns aren't!$" - -Text_1C2EC0:: @ 81C2EC0 - .string "These waters are treacherous!\n" - .string "You shouldn't come back here!$" - -Text_1C2EFC:: @ 81C2EFC - .string "I swam here with my friends…\n" - .string "I'm tired…\l" - .string "Must we really battle again?$" - -Text_1C2F41:: @ 81C2F41 - .string "LIA: You know my brother just\n" - .string "became a TRAINER, right?\p" - .string "I want to make him better, so I\n" - .string "need your help again.$" - -Text_1C2FAE:: @ 81C2FAE - .string "LUC: My big sis taught me all\n" - .string "about POKéMON.\p" - .string "I wonder if I'm better?$" - -Text_1C2FF3:: @ 81C2FF3 - .string "The water is shallow here.\n" - .string "There are many people swimming.$" - -Text_1C302E:: @ 81C302E - .string "Are you jealous that I'm\n" - .string "vacationing on SEAFOAM?$" - -Text_1C305F:: @ 81C305F - .string "I love floating with the fishes\n" - .string "here among the waves.$" - -Text_1C3095:: @ 81C3095 - .string "Were you on vacation, too?$" - -Text_1C30B0:: @ 81C30B0 - .string "Check out my physique!\p" - .string "It's even more buff than ever\n" - .string "before!$" - -Text_1C30ED:: @ 81C30ED - .string "Why are you riding a POKéMON?\n" - .string "Haven't you learned to swim yet?$" - -Text_1C312C:: @ 81C312C - .string "I rode my bird POKéMON here.$" - -Text_1C3149:: @ 81C3149 - .string "My boyfriend gave me big pearls.\n" - .string "And, they've grown bigger!$" - -Text_1C3185:: @ 81C3185 - .string "I swam here from CINNABAR ISLAND.\n" - .string "It wasn't easy, like I said.$" - -Text_1C31C4:: @ 81C31C4 - .string "CINNABAR, in the west, has a LAB\n" - .string "for POKéMON.\p" - .string "My daddy works there.$" - -Text_1C3208:: @ 81C3208 - .string "You want to know if the fish are\n" - .string "biting?$" - -Text_1C3231:: @ 81C3231 - .string "I got a big haul again!\n" - .string "Wanna go for it once more?$" - -Text_1C3264:: @ 81C3264 - .string "The sea cleanses my body and soul!$" - -Text_1C3287:: @ 81C3287 - .string "きょうも　およぎに\n" - .string "きちまったぜ$" - -Text_1C3298:: @ 81C3298 - .string "I caught my POKéMON at sea.\n" - .string "And that's where I train them.$" - -Text_1C32D3:: @ 81C32D3 - .string "Right now, I'm in another triathlon\n" - .string "meet!$" - -Text_1C32FD:: @ 81C32FD - .string "Ahh!\n" - .string "Feel the sun and the wind!$" - -Text_1C331D:: @ 81C331D - .string "Hey, cut it out already.\n" - .string "You always scare away the fish!$" - -Text_1C3356:: @ 81C3356 - .string "Keep me company till I get a hit.$" - -Text_1C3378:: @ 81C3378 - .string "LIL: Huh? A battle again?\n" - .string "IAN, can't you do it alone?$" - -Text_1C33AE:: @ 81C33AE - .string "IAN: My sis is still a slob.\n" - .string "Help me get her into shape!$" - -Text_1C33E7:: @ 81C33E7 - .string "I won't lose while I'm here!$" - -Text_1C3404:: @ 81C3404 - .string "Dad took me to a great party on\n" - .string "the S.S. ANNE at VERMILION CITY.$" - -Text_1C3445:: @ 81C3445 - .string "I'm a cool guy.\n" - .string "I've got a girlfriend!\p" - .string "I'll show her how cool I am for\n" - .string "sure this time!$" - -Text_1C349C:: @ 81C349C - .string "Hi!\n" - .string "My boyfriend is cool!\l" - .string "My conditioning's good today!$" - -Text_1C34D4:: @ 81C34D4 - .string "I had this feeling…\n" - .string "I knew I had to battle you again!$" - -Text_1C350A:: @ 81C350A - .string "My friend has many cute POKéMON.\n" - .string "I'm so jealous!$" - -Text_1C353B:: @ 81C353B - .string "I just trained up on MT. MOON,\n" - .string "but I've still got gas in the tank!$" - -Text_1C357E:: @ 81C357E - .string "A POKéMANIAC lives on the cape.\n" - .string "Have you seen his collection?$" - -Text_1C35BC:: @ 81C35BC - .string "You're going to see BILL again?\n" - .string "First, we battle!$" - -Text_1C35EE:: @ 81C35EE - .string "I saw your feat from the grass!$" - -Text_1C360E:: @ 81C360E - .string "Okay!\n" - .string "I'll stomp you!$" - -Text_1C3624:: @ 81C3624 - .string "You always look so busy…\n" - .string "Aren't you getting tired?$" - -Text_1C3657:: @ 81C3657 - .string "You really must love coming to\n" - .string "NUGGET BRIDGE.$" - -Text_1C3685:: @ 81C3685 - .string "The time we battled…\p" - .string "Even though I was the second in\n" - .string "line, I was the best, wasn't I?$" - -Text_1C36DA:: @ 81C36DA - .string "People call this the NUGGET\n" - .string "BRIDGE!\p" - .string "You've already beaten us, so you're\n" - .string "not allowed to take the challenge…\p" - .string "…But, you're welcome to battle with\n" - .string "us again.$" - -Text_1C3773:: @ 81C3773 - .string "Lying back, rocked by the waves…\n" - .string "I don't notice time slipping by…$" - -Text_1C37B5:: @ 81C37B5 - .string "The weather's gorgeous!\n" - .string "I'll try not to spoil it.$" - -Text_1C37E7:: @ 81C37E7 - .string "My sunburn is starting to hurt…$" - -Text_1C3807:: @ 81C3807 - .string "The fire bird's mountain casts\n" - .string "a huge shadow…$" - -Text_1C3835:: @ 81C3835 - .string "I have this strong feeling that\n" - .string "I can win this time!$" - -Text_1C386A:: @ 81C386A - .string "Wait! Wait a second!\n" - .string "I'm sure I've hooked a big one!$" - -Text_1C389F:: @ 81C389F - .string "You'll help me out with my\n" - .string "training again?$" - -Text_1C38CA:: @ 81C38CA - .string "We haven't missed a single day of\n" - .string "training yet!$" - -Text_1C38FA:: @ 81C38FA - .string "Every morning, before breakfast,\n" - .string "I swim around this island…\l" - .string "Three times!$" - -Text_1C3943:: @ 81C3943 - .string "Dress appropriately for battle!\n" - .string "Lose that frivolous outfit, I said!$" - -Text_1C3987:: @ 81C3987 - .string "You know, everything tastes great\n" - .string "when you're out in the wild.$" - -Text_1C39C6:: @ 81C39C6 - .string "I ate too much again, so will you\n" - .string "battle us for some exercise?$" - -Text_1C3A05:: @ 81C3A05 - .string "KIA: My big brother and I make\n" - .string "an awesome combination!\p" - .string "We won't lose this time!$" - -Text_1C3A55:: @ 81C3A55 - .string "MIK: Together with KIA, we're\n" - .string "afraid of nothing!\p" - .string "We'll prove it to you this time!$" - -Text_1C3AA7:: @ 81C3AA7 - .string "Are we to battle again?$" - -Text_1C3ABF:: @ 81C3ABF - .string "From where have you come, and\n" - .string "where are you bound?$" - -Text_1C3AF2:: @ 81C3AF2 - .string "I want to swim without my float\n" - .string "ring soon.$" - -Text_1C3B1D:: @ 81C3B1D - .string "Yay, yay!\n" - .string "POKéMON!$" - -Text_1C3B30:: @ 81C3B30 - .string "Oh, no, didn't I tell you already?\n" - .string "Please, stay away from me!$" - -Text_1C3B6E:: @ 81C3B6E - .string "JOY: We've gotten stronger!\n" - .string "Lots and lots!$" - -Text_1C3B99:: @ 81C3B99 - .string "MEG: You can't beat us today!$" - -Text_1C3BB7:: @ 81C3BB7 - .string "Oh, hello!\p" - .string "Are you raising your POKéMON in a\n" - .string "good environment?$" - -Text_1C3BF6:: @ 81C3BF6 - .string "With these hands, I will create\n" - .string "my victory today.$" - -Text_1C3C28:: @ 81C3C28 - .string "Must I repeat myself?\n" - .string "I'm trying to paint.\l" - .string "Please keep out of my sight!$" - -Text_1C3C70:: @ 81C3C70 - .string "I haven't made any progress…\n" - .string "I still can't get the right angle…$" - -Text_1C3CB0:: @ 81C3CB0 - .string "Oh, you will give me another\n" - .string "opportunity to match wits with you?$" - -Text_1C3CF1:: @ 81C3CF1 - .string "They're almost finished making the\n" - .string "pool for my POKéMON.\p" - .string "You must drop in for a visit.$" - -Text_1C3D47:: @ 81C3D47 - .string "I'm a good runner.\n" - .string "I've gotten even faster!$" - -Text_1C3D73:: @ 81C3D73 - .string "I say, friend!\n" - .string "Let us enjoy our time together!$" - -Text_1C3DA2:: @ 81C3DA2 - .string "I'm the eldest of the BIRD\n" - .string "BROTHERS. Remember me?\p" - .string "That's right, I'm the one who loves\n" - .string "birds for their beaks!$" - -Text_1C3E0F:: @ 81C3E0F - .string "I'm the middle kid of the BIRD\n" - .string "BROTHERS.\p" - .string "I'm the one that loves wings.\n" - .string "Let's battle again!$" - -Text_1C3E6A:: @ 81C3E6A - .string "I'm the youngest of the BIRD\n" - .string "BROTHERS.\p" - .string "I love birds for their down.\n" - .string "I didn't think I'd see you again!$" - -Text_1C3ED0:: @ 81C3ED0 - .string "I'm still having no luck at all.\n" - .string "A battle'd be a change of pace!$" - -Text_1C3F11:: @ 81C3F11 - .string "Gasp… Gasp…\p" - .string "I swam here from SIX ISLAND's port\n" - .string "in one go again.$" - -Text_1C3F51:: @ 81C3F51 - .string "You always come along while I'm\n" - .string "swimming.$" - -Text_1C3F7B:: @ 81C3F7B - .string "AVA: Let's have another\n" - .string "two-on-two marine battle today!$" - -Text_1C3FB3:: @ 81C3FB3 - .string "GEB: My big sister and I are way\n" - .string "tougher than before!$" - -Text_1C3FE9:: @ 81C3FE9 - .string "…Huh?\p" - .string "I envision my house, but TELEPORT\n" - .string "always brings me here!$" - -Text_1C4028:: @ 81C4028 - .string "Oh, hello.\n" - .string "A pleasant breeze is blowing again.$" - -Text_1C4057:: @ 81C4057 - .string "Hehehe, I'm practicing in secret\n" - .string "again.$" - -Text_1C407F:: @ 81C407F - .string "What, you're sick of seeing\n" - .string "SWIMMERS like me?\p" - .string "Aww, don't be hatin'!\n" - .string "Battle with me again.$" - -Text_1C40D9:: @ 81C40D9 - .string "Sigh…\n" - .string "My boyfriend's busy again…$" - -Text_1C40FA:: @ 81C40FA - .string "Come on, tell me, where are the\n" - .string "mountains around these parts?$" - -Text_1C4138:: @ 81C4138 - .string "MIU: Hello, POKéMON!\n" - .string "It's time to play again!$" - -Text_1C4166:: @ 81C4166 - .string "MIA: Hello, POKéMON!\n" - .string "It's time to battle again!$" - -Text_1C4196:: @ 81C4196 - .string "There appear to be many secrets\n" - .string "still unsolved in this world.$" - -Text_1C41D4:: @ 81C41D4 - .string "Hi, didn't we meet before?\n" - .string "What compelled you to come back?$" - -Text_1C4210:: @ 81C4210 - .string "It's been said that there are\n" - .string "mysterious stones on this island.\p" - .string "Have you discovered anything since\n" - .string "we last met?$" - -Text_1C4280:: @ 81C4280 - .string "A rematch with you, so high up!$" - -Text_1C42A0:: @ 81C42A0 - .string "I'm pretty familiar with the land\n" - .string "around these parts.$" - -Text_1C42D6:: @ 81C42D6 - .string "I sensed your approach.$" - -Text_1C42EE:: @ 81C42EE - .string "Somewhere on this island, peculiar\n" - .string "POKéMON are sleeping.$" - -Text_1C4327:: @ 81C4327 - .string "Kyahaha!\p" - .string "Coming back won't change a thing.\n" - .string "I'll flick you away effortlessly!$" - -Text_1C4374:: @ 81C4374 - .string "Howdy! You're a member of my\n" - .string "fan club, isn't that right?$" - -Text_1C43AD:: @ 81C43AD - .string "This island is too spread out…\n" - .string "Patrolling the place is a drag…$" - -Text_1C43EC:: @ 81C43EC - .string "I don't forgive people who abuse\n" - .string "POKéMON!$" - -Text_1C4416:: @ 81C4416 - .string "EVE: I'll team up with JON and\n" - .string "battle together again.$" - -Text_1C444C:: @ 81C444C - .string "JON: When I'm with EVE, it feels\n" - .string "like we could never lose, not ever.$" - -Text_1C4491:: @ 81C4491 - .string "Let's have another battle.\n" - .string "My conditioning's in top form!$" - -Text_1C44CB:: @ 81C44CB - .string "It doesn't matter if you happen to\n" - .string "have the strongest POKéMON…\p" - .string "It doesn't mean a thing if you don't\n" - .string "know how to use them properly!$" - -Text_1C454E:: @ 81C454E - .string "I work to protect the environment.\n" - .string "In turn, nature protects me!$" - -Text_1C458E:: @ 81C458E - .string "Every time we meet, you have those\n" - .string "snazzy shoes on.$" - -Text_1C45C2:: @ 81C45C2 - .string "You must have gotten tougher.\n" - .string "Let me battle you, please!$" - -Text_1C45FB:: @ 81C45FB - .string "I was given the best possible\n" - .string "education to become this strong.\p" - .string "I won't lose this time.\n" - .string "Absolutely not!$" - -Text_1C4662:: @ 81C4662 - .string "LEX: My darling NYA, together\n" - .string "we will win for certain!$" - -Text_1C4699:: @ 81C4699 - .string "NYA: I won't drag down my mentor\n" - .string "LEX! We're going to win!$" - -Text_1C46D3:: @ 81C46D3 - .string "Have you discovered anything about\n" - .string "this stone chamber?$" - -Text_1C470A:: @ 81C470A - .string "A mystic POKéMON is said to sleep\n" - .string "inside here.$" - -Text_1C4739:: @ 81C4739 - .string "My teacher is showing me how to\n" - .string "paint some more.$" - -Text_1C476A:: @ 81C476A - .string "Today, in addition to our lesson,\n" - .string "we came to see the chamber again.$" - + .include "data/text/trainers.inc" .include "data/scripts/move_tutors.inc" SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54 @@ -8550,7 +5532,7 @@ EventScript_1C5410: waitfanfare waitmessage getstdstring 2, 24 - msgbox gUnknown_81A5218 + msgbox Text_PutItemAway call EventScript_1A6675 goto EventScript_1C544F @@ -8679,15 +5661,15 @@ Movement_1C5550:: @ 81C5550 step_end EventScript_1C5550:: @ 81C5552 - msgbox Text_1C556D, 2 + msgbox Text_1C556D, MSGBOX_NPC end EventScript_1C555B:: @ 81C555B - msgbox Text_1C558D, 3 + msgbox Text_1C558D, MSGBOX_SIGN end EventScript_1C5564:: @ 81C5564 - msgbox Text_1C55A4, 3 + msgbox Text_1C55A4, MSGBOX_SIGN end Text_1C556D:: @ 81C556D diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 68dd32b65..63feedabb 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -155,10 +155,10 @@ EventScript_16BF7C:: @ 816BF7C additem VAR_0x8009, 1 textcolor 3 playfanfare MUS_FANFA1 - message Text_195DAD + message Text_ReceivedItemFromLittleGirl waitmessage waitfanfare - giveitem VAR_0x8009, 1, 8 + putitemaway VAR_0x8009 call EventScript_1A6675 compare VAR_0x8008, ITEM_FRESH_WATER call_if eq, EventScript_16BFDE diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc index a03cfedaf..65b9a3162 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc @@ -12,7 +12,7 @@ gUnknown_8195D75:: @ 8195D75 .string "Thank you!\n" .string "You can have this from me!$" -Text_195DAD:: @ 8195DAD +Text_ReceivedItemFromLittleGirl:: @ 8195DAD .string "{PLAYER} received a {STR_VAR_2}\n" .string "from the little girl.$" diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 4a037e9eb..225685d6a 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -340,7 +340,7 @@ EventScript_16CF3F:: @ 816CF3F EventScript_16CF79:: @ 816CF79 textcolor 3 - msgbox gUnknown_81A5242 + msgbox Text_TooBadBagFull hidecoinsbox 0, 0 release end diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index c0cac69eb..931b2c4e5 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc index cbe78efca..b4fefdc98 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F - map_script MAP_SCRIPT_ON_FRAME_TABLE, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index e15dbda8e..70a15e76e 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc index 74d3fe451..7c8a7f024 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 - map_script MAP_SCRIPT_ON_FRAME_TABLE, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 4bb297599..9eafc6d0a 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 6ca90c913..2f0476988 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 - map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index dc97dcdc3..11fb855fb 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc index 57590e30b..d518317ed 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B - map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index bca5ec39d..85b89604d 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF .2byte 0 EventScript_1687F9:: @ 81687F9 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 332a0efa7..53d8c630e 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc index 9ae9b89ae..c3742867c 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D - map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, FourIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 6e82de7a9..025f090c7 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc index c9cd2019c..993a88457 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 - map_script MAP_SCRIPT_ON_FRAME_TABLE, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 81a413874..ac00b284b 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc index 15a721f76..a6fc31686 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F - map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 1880c2425..cc72593c7 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc index 7e7bc4431..45f05a491 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 232bdd108..744445bc5 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -8,7 +8,7 @@ OneIsland_Harbor_OnWarp:: @ 8171383 .2byte 0 EventScript_17138D:: @ 817138D - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end OneIsland_Harbor_OnFrame:: @ 8171392 diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 96d913b13..8a847a81c 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc index 8e03adc77..0d553f8e4 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 - map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 55f18360a..c51fdcd61 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -17,7 +17,7 @@ PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE .2byte 0 EventScript_168CC8:: @ 8168CC8 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index ebc834607..a94ad9a90 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -40,7 +40,7 @@ PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1 .2byte 0 EventScript_168FEB:: @ 8168FEB - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index f223ec1fc..d07a3ba3f 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc index 9e4447709..9d3148d6c 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 - map_script MAP_SCRIPT_ON_FRAME_TABLE, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, PewterCity_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 8753b899c..721396149 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -30,7 +30,7 @@ PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 .2byte 0 EventScript_16285B:: @ 816285B - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 98de24a6c..2d110a257 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -30,7 +30,7 @@ PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 .2byte 0 EventScript_1626D0:: @ 81626D0 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 6f4d33218..f2e81e955 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -45,7 +45,7 @@ PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D .2byte 0 EventScript_162B67:: @ 8162B67 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 7c6a0e363..00ccd17f6 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -8,7 +8,7 @@ PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 .2byte 0 EventScript_162D61:: @ 8162D61 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 49ed67da9..252c7082d 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -30,7 +30,7 @@ PokemonLeague_LancesRoom_OnWarp:: @ 816296E .2byte 0 EventScript_162978:: @ 8162978 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end PokemonLeague_LancesRoom_OnFrame:: @ 816297D diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index cbf014bc8..3475b0f97 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -35,7 +35,7 @@ PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 .2byte 0 EventScript_1625C0:: @ 81625C0 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5 diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index e815a98be..548ff6007 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc index e49ddeccb..e0262a627 100644 --- a/data/maps/Route10_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route10_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route10_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, Route10_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 2501fc3f4..2f53bfcef 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index b1f69ff32..e70f53403 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route4_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route4_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, Route4_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index fd1021732..457ef551e 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc index a5e05bca1..12b688a7d 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index ad99c17d6..f91329333 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -69,7 +69,7 @@ SeafoamIslands_B4F_OnWarp:: @ 81630E7 .2byte 0 EventScript_1630F1:: @ 81630F1 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 special Special_ForcePlayerToStartSurfing end diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index bcd215d25..dd727d017 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc index a026e7c92..654725ffb 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 2c1c53efb..1cb356b1f 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc index 982b9b29c..a86377b29 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, SixIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index af562f042..5fc3dfcca 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc index b51a32374..7589c7946 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 - map_script MAP_SCRIPT_ON_FRAME_TABLE, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index e6906c062..8f717d71c 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -2,7 +2,7 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_JoyfulGameCorner_OnFrame - map_script MAP_SCRIPT_ON_LOAD, TwoIsland_JoyfulGameCorner_MapScript4_1BB237 + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad .byte 0 TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5 @@ -19,17 +19,17 @@ EventScript_1713EF:: @ 81713EF TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404 map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416 - map_script_2 VAR_0x406F, 8, EventScript_1BB227 + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant .2byte 0 EventScript_171416:: @ 8171416 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435 - map_script_2 VAR_0x406F, 8, EventScript_1BB2FD + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 EventScript_171435:: @ 8171435 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index a9c4b0c27..aa762183c 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 84766419e..99da551b4 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE - map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 9edc3d8bf..30504e96c 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc index 9ef32bb07..45278dc0f 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 - map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index cf764b446..0c3a4361a 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc index 4cf92b800..165ce15fc 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 - map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc new file mode 100644 index 000000000..e3b5c4806 --- /dev/null +++ b/data/scripts/cable_club.inc @@ -0,0 +1,1910 @@ +CableClub_OnTransition:: @ 81BB1B4 + call CableClub_EventScript_HideOrShowMysteryGiftMan + end + +CableClub_EventScript_HideOrShowMysteryGiftMan:: @ 81BB1BA + specialvar VAR_RESULT, ValidateReceivedWonderCard + compare VAR_RESULT, FALSE + goto_if eq, EventScript_HideMysteryGiftMan + clearflag FLAG_HIDE_MG_DELIVERYMEN + return + +EventScript_HideMysteryGiftMan:: @ 81BB1CE + setflag FLAG_HIDE_MG_DELIVERYMEN + return + +CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + special sub_8112364 + execram + +@ Unused +EventScript_1BB1E4:: @ 81BB1E4 + msgbox Text_1A6393, MSGBOX_NPC + end + +CableClub_OnWarp:: @ 81BB1ED + map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER, EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_UNION_ROOM, EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH, EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant + .2byte 0 + +EventScript_CheckTurnAttendant:: @ 81BB227 + compare VAR_0x8007, 0 + goto_if eq, EventScript_CheckTurnAttendantEnd + turnobject VAR_0x8007, 3 +EventScript_CheckTurnAttendantEnd: + end + +CableClub_OnLoad:: @ 81BB237 + compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE + goto_if eq, EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE + goto_if eq, EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE + goto_if eq, EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER + goto_if eq, EventScript_OnLoadFromTradeCenter + compare VAR_CABLE_CLUB_STATE, USING_UNION_ROOM + goto_if eq, EventScript_OnLoadFromUnionRoom + compare VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH + goto_if eq, EventScript_OnLoadFromBerryCrush + compare VAR_CABLE_CLUB_STATE, USING_MINIGAME + goto_if eq, EventScript_OnLoadFromGameCorner + end + +EventScript_OnLoadFromColosseum:: @ 81BB285 + call CableClub_EventScript_OpenDirectCornerBarrier + end + +EventScript_OnLoadFromTradeCenter:: @ 81BB28B + call CableClub_EventScript_OpenDirectCornerBarrier + end + +EventScript_OnLoadFromUnionRoom:: @ 81BB291 + call CableClub_EventScript_OpenUnionRoomBarrier + end + +EventScript_OnLoadFromBerryCrush:: @ 81BB297 + call CableClub_EventScript_OpenDirectCornerBarrier + end + +EventScript_OnLoadFromGameCorner:: @ 81BB29D + call CableClub_EventScript_OpenGameCornerBarrier + end + +CableClub_OnFrame:: @ 81BB2A3 + map_script_2 VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1, CableClub_EventScript_Tutorial + map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER, CableClub_EventScript_ExitTradeCenter + map_script_2 VAR_CABLE_CLUB_STATE, USING_UNION_ROOM, CableClub_EventScript_ExitUnionRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom + .2byte 0 + +CableClub_EventScript_ExitLinkRoom:: @ 81BB2E5 + lockall + call CableClub_EventScript_CloseLinkAndExitLinkRoom + call CableClub_EventScript_CloseDirectCornerBarrier + special DrawWholeMapView + playse SE_TK_KASYA + erasebox 0, 0, 29, 19 + releaseall + end + +CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD + lockall + call CableClub_EventScript_CloseLinkAndExitLinkRoom + call CableClub_EventScript_CloseGameCornerBarrier + special DrawWholeMapView + playse SE_TK_KASYA + erasebox 0, 0, 29, 19 + releaseall + end + +CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 + special CloseLink + special HelpSystem_Enable + special sub_811390C + setvar VAR_CABLE_CLUB_STATE, 0 + textcolor 1 + compare VAR_0x8007, 0 + goto_if eq, CableClub_EventScript_PlayerExitLinkRoom + applymovement VAR_0x8007, Movement_1BB88F + waitmovement 0 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 + waitmovement 0 + applymovement VAR_0x8007, Movement_1BB88B + waitmovement 0 + return + +CableClub_EventScript_ExitTradeCenter:: @ 81BB34F + lockall + call EventScript_1BB367 + call CableClub_EventScript_CloseDirectCornerBarrier + special DrawWholeMapView + playse SE_TK_KASYA + erasebox 0, 0, 29, 19 + releaseall + end + +EventScript_1BB367:: @ 81BB367 + special CloseLink + special HelpSystem_Enable + special sub_811390C + setvar VAR_CABLE_CLUB_STATE, 0 + textcolor 1 + compare VAR_0x8007, 0 + goto_if eq, CableClub_EventScript_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 + waitmovement 0 + applymovement VAR_0x8007, Movement_1BB88F + waitmovement 0 + call EventScript_1BB3E6 + return + +CableClub_EventScript_ExitUnionRoom:: @ 81BB39C + lockall + call EventScript_1BB3B4 + call CableClub_EventScript_CloseUnionRoomBarrier + special DrawWholeMapView + playse SE_TK_KASYA + erasebox 0, 0, 29, 19 + releaseall + end + +EventScript_1BB3B4:: @ 81BB3B4 + special HelpSystem_Enable + special sub_811390C + setvar VAR_CABLE_CLUB_STATE, 0 + textcolor 1 + compare VAR_0x8007, 0 + goto_if eq, CableClub_EventScript_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 + waitmovement 0 + applymovement VAR_0x8007, Movement_1BB88F + waitmovement 0 + call EventScript_1BB3E6 + return + +EventScript_1BB3E6:: @ 81BB3E6 + message Text_1BC918 + waitmessage + playse SE_PIN + message Text_1BC943 + waitmessage + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 + waitmovement 0 + applymovement VAR_0x8007, Movement_1BB88B + waitmovement 0 + return + +CableClub_EventScript_PlayerExitLinkRoom:: @ 81BB40A + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 + waitmovement 0 + return + +CableClub_EventScript_Tutorial:: @ 81BB415 + lockall + textcolor 1 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + waitmovement 0 + msgbox gUnknown_81BD898 + closemessage + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB447 + waitmovement 0 + delay 30 + msgbox gUnknown_81BD966 + setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 2 + releaseall + end + +Movement_1BB447:: @ 81BB447 + step_11 + step_11 + step_end + +EventScript_1BB44A:: @ 81BB44A + message gUnknown_81BC311 + waitmessage + delay 15 + goto EventScript_1BB467 + end + +EventScript_1BB459:: @ 81BB459 + msgbox gUnknown_81BC35E + goto EventScript_1BB467 + end + +EventScript_1BB467:: @ 81BB467 + setvar VAR_0x8004, 0 + multichoice 0, 0, MULTICHOICE_TRADE_CENTER_COLOSSEUM, FALSE + switch VAR_RESULT + case 0, EventScript_1BB6AB + case 1, EventScript_1BB4A3 + case 2, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F + end + +EventScript_1BB4A3:: @ 81BB4A3 + copyvar VAR_0x8007, VAR_LAST_TALKED + goto EventScript_1BB4AE + +EventScript_1BB4AD:: @ 81BB4AD + end + +EventScript_1BB4AE:: @ 81BB4AE + message Text_1BD338 + waitmessage + multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE + switch VAR_RESULT + case 0, EventScript_1BB50F + case 1, EventScript_1BB51A + case 2, EventScript_1BB541 + case 3, EventScript_1BB501 + case 4, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F + end + +EventScript_1BB501:: @ 81BB501 + msgbox gUnknown_81BD390 + goto EventScript_1BB4AE + end + +EventScript_1BB50F:: @ 81BB50F + setvar VAR_0x8004, 1 + goto EventScript_1BB54C + end + +EventScript_1BB51A:: @ 81BB51A + special CheckForAlivePartyMons + compare VAR_RESULT, 0 + goto_if ne, EventScript_1BB533 + setvar VAR_0x8004, 2 + goto EventScript_1BB54C + end + +EventScript_1BB533:: @ 81BB533 + msgbox gUnknown_81BC409 + goto EventScript_1BB4AE + end + +EventScript_1BB541:: @ 81BB541 + setvar VAR_0x8004, 5 + goto EventScript_1BB54C + end + +EventScript_1BB54C:: @ 81BB54C + call EventScript_1A4EAF + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB82F + message gUnknown_81BC4AC + waitmessage + special HelpSystem_Disable + textcolor 3 + special sub_8081064 + waitstate + call EventScript_1A6675 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BB5B3 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1BB80F + compare VAR_RESULT, 3 + goto_if eq, EventScript_1BB81F + compare VAR_RESULT, 4 + goto_if eq, EventScript_1BB63C + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BB82F + compare VAR_RESULT, 6 + goto_if eq, EventScript_1BB7FF + end + +EventScript_1BB5B3:: @ 81BB5B3 + special sp000_heal_pokemon + special SavePlayerParty + special LoadPlayerBag + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 + messageautoscroll Text_1BC590 + waitmessage + call CableClub_EventScript_OpenDirectCornerBarrier + special DrawWholeMapView + playse SE_TK_KASYA + delay 60 + applymovement VAR_LAST_TALKED, Movement_1BB88F + waitmovement 0 + closemessage + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + waitmovement 0 + opendoor 9, 1 + waitdooranim + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + waitmovement 0 + hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + closedoor 9, 1 + waitdooranim + release + compare VAR_0x8004, 5 + goto_if eq, EventScript_1BB62C + special SetCableClubWarp + warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 + special DoCableClubWarp + waitstate + end + +EventScript_1BB621:: @ 81BB621 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB894 + waitmovement 0 + return + +EventScript_1BB62C:: @ 81BB62C + special SetCableClubWarp + warp MAP_UNKNOWN_MAP_00_03, 255, 5, 8 + special DoCableClubWarp + waitstate + end + +EventScript_1BB63C:: @ 81BB63C + switch VAR_0x8004 + case 1, EventScript_1BB68A + case 2, EventScript_1BB679 + case 5, EventScript_1BB668 + goto EventScript_1BB857 + +EventScript_1BB667:: @ 81BB667 + end + +EventScript_1BB668:: @ 81BB668 + special CloseLink + msgbox gUnknown_81BC736 + goto EventScript_1BB69B + +EventScript_1BB678:: @ 81BB678 + end + +EventScript_1BB679:: @ 81BB679 + special CloseLink + msgbox gUnknown_81BC700 + goto EventScript_1BB69B + +EventScript_1BB689:: @ 81BB689 + end + +EventScript_1BB68A:: @ 81BB68A + special CloseLink + msgbox gUnknown_81BC6CA + goto EventScript_1BB69B + +EventScript_1BB69A:: @ 81BB69A + end + +EventScript_1BB69B:: @ 81BB69B + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BC76B + release + end + +EventScript_1BB6AB:: @ 81BB6AB + copyvar VAR_0x8007, VAR_LAST_TALKED + call EventScript_1BB79C + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB82F + call EventScript_1A4EAF + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB82F + message gUnknown_81BC4AC + waitmessage + special HelpSystem_Disable + textcolor 3 + special sub_80810CC + waitstate + call EventScript_1A6675 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BB73D + compare VAR_RESULT, 2 + goto_if eq, EventScript_1BB80F + compare VAR_RESULT, 3 + goto_if eq, EventScript_1BB81F + compare VAR_RESULT, 4 + goto_if eq, EventScript_1BB857 + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BB82F + compare VAR_RESULT, 6 + goto_if eq, EventScript_1BB7FF + compare VAR_RESULT, 7 + goto_if eq, EventScript_1BB7DF + compare VAR_RESULT, 9 + goto_if eq, EventScript_1BB7EF + end + +EventScript_1BB73D:: @ 81BB73D + setvar VAR_0x8004, 3 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 + messageautoscroll Text_1BC590 + waitmessage + call CableClub_EventScript_OpenDirectCornerBarrier + special DrawWholeMapView + playse SE_TK_KASYA + delay 60 + applymovement VAR_LAST_TALKED, Movement_1BB88F + waitmovement 0 + closemessage + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + waitmovement 0 + opendoor 9, 1 + waitdooranim + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + waitmovement 0 + hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + closedoor 9, 1 + waitdooranim + release + special SetCableClubWarp + setwarp MAP_UNKNOWN_MAP_00_01, 255, 5, 8 + special DoCableClubWarp + waitstate + end + +EventScript_1BB79C:: @ 81BB79C + specialvar VAR_RESULT, CalculatePlayerPartyCount + compare VAR_RESULT, 2 + goto_if lt, EventScript_1BB7C2 + specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BB7D0 + setvar VAR_RESULT, 1 + return + +EventScript_1BB7C2:: @ 81BB7C2 + msgbox gUnknown_81BC442 + setvar VAR_RESULT, 0 + return + +EventScript_1BB7D0:: @ 81BB7D0 + msgbox gUnknown_81BC47C + setvar VAR_RESULT, 0 + return + +EventScript_1BB7DE:: @ 81BB7DE + end + +EventScript_1BB7DF:: @ 81BB7DF + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BC95C + release + end + +EventScript_1BB7EF:: @ 81BB7EF + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BC9C0 + release + end + +EventScript_1BB7FF:: @ 81BB7FF + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BC615 + release + end + +EventScript_1BB80F:: @ 81BB80F + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BC5C0 + release + end + +EventScript_1BB81F:: @ 81BB81F + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BC64E + release + end + +EventScript_1BB82F:: @ 81BB82F + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BC68A + release + end + +EventScript_1BB83F:: @ 81BB83F + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BCFD1 + release + end + +EventScript_1BB84F:: @ 81BB84F + special SetCableClubWarp + special DoCableClubWarp + waitstate + end + +EventScript_1BB857:: @ 81BB857 + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BC6A1 + release + end + +EventScript_1BB867:: @ 81BB867 + special CloseLink + special HelpSystem_Enable + msgbox gUnknown_81BC9E0 + release + end + +EventScript_1BB877:: @ 81BB877 + msgbox Text_WirelessClubUndergoingAdjustments + release + end + +EventScript_1BB881:: @ 81BB881 + msgbox Text_AppearsToBeUndergoingAdjustments + releaseall + end + +Movement_1BB88B:: @ 81BB88B + step_00 + step_end + +Movement_1BB88D:: @ 81BB88D + step_03 + step_end + +Movement_1BB88F:: @ 81BB88F + step_02 + step_end + +Movement_1BB891:: @ 81BB891 + step_10 + step_10 + step_end + +Movement_1BB894:: @ 81BB894 + step_13 + step_11 + step_11 + step_end + +Movement_1BB898:: @ 81BB898 + step_12 + step_11 + step_11 + step_end + +Movement_1BB89C:: @ 81BB89C + step_11 + step_end + +Movement_1BB89E:: @ 81BB89E + step_02 + step_end + +Movement_1BB8A0:: @ 81BB8A0 + step_03 + step_end + +Movement_1BB8A2:: @ 81BB8A2 + step_12 + step_11 + step_11 + step_11 + step_end + +gUnknown_81BB8A7:: @ 81BB8A7 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lockall + fadescreen 1 + setvar VAR_0x8004, 0 + special Special_BattleRecords + waitstate + releaseall + end + +gUnknown_81BB8C3:: @ 81BB8C3 +UnknownMap_00_00_EventScript_1BB8C3:: @ 81BB8C3 + setvar VAR_0x8005, 0 + textcolor 3 + special sub_80819C8 + waitstate + end + +gUnknown_81BB8CF:: @ 81BB8CF +UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF + setvar VAR_0x8005, 1 + textcolor 3 + special sub_80819C8 + waitstate + end + +gUnknown_81BB8DB:: @ 81BB8DB +UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB + fadescreen 1 + special sub_80A0334 + waitstate + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB94F + setvar VAR_0x8005, 0 + textcolor 3 + special sub_80819C8 + waitstate + end + +gUnknown_81BB8F8:: @ 81BB8F8 +UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 + fadescreen 1 + special sub_80A0334 + waitstate + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB94F + setvar VAR_0x8005, 1 + textcolor 3 + special sub_80819C8 + waitstate + end + +gUnknown_81BB915:: @ 81BB915 +UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 + fadescreen 1 + special sub_80A0334 + waitstate + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB94F + setvar VAR_0x8005, 2 + textcolor 3 + special sub_80819C8 + waitstate + end + +gUnknown_81BB932:: @ 81BB932 +UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 + fadescreen 1 + special sub_80A0334 + waitstate + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB94F + setvar VAR_0x8005, 3 + textcolor 3 + special sub_80819C8 + waitstate + end + +EventScript_1BB94F:: @ 81BB94F + end + +gUnknown_81BB950:: @ 81BB950 +UnknownMap_00_01_EventScript_1BB950:: @ 81BB950 + setvar VAR_0x8005, 0 + textcolor 3 + special sub_8081978 + waitstate + end + +gUnknown_81BB95C:: @ 81BB95C +UnknownMap_00_01_EventScript_1BB95C:: @ 81BB95C + setvar VAR_0x8005, 1 + textcolor 3 + special sub_8081978 + waitstate + end + +EventScript_1BB968:: @ 81BB968 + setvar VAR_0x8005, 2 + textcolor 3 + special sub_8081978 + waitstate + end + +EventScript_1BB974:: @ 81BB974 + setvar VAR_0x8005, 3 + textcolor 3 + special sub_8081978 + waitstate + end + +gUnknown_81BB980:: @ 81BB980 +UnknownMap_00_02_EventScript_1BB980:: @ 81BB980 + end + +gUnknown_81BB981:: @ 81BB981 + textcolor 3 + msgbox Text_LookedAtPlayersTrainerCard + fadescreen 1 + special sp02A_crash_sound + waitstate + end + +gUnknown_81BB992:: @ 81BB992 + textcolor 3 + msgbox Text_LookedAtPlayersTrainerCardColored + fadescreen 1 + special sp02A_crash_sound + waitstate + end + +gUnknown_81BB9A3:: @ 81BB9A3 + textcolor 3 + msgbox Text_TrainerTooBusyToNotice + closemessage + end + +UnknownMap_00_00_EventScript_1BB9AF:: @ 81BB9AF + textcolor 3 + special sub_8069740 + msgbox Text_TakeSeatStartBattle + special sub_8069768 + closemessage + end + +UnknownMap_00_01_EventScript_1BB9C1:: @ 81BB9C1 + textcolor 3 + special sub_8069740 + msgbox Text_TakeSeatStartTrade + special sub_8069768 + closemessage + end + +UnknownMap_00_02_EventScript_1BB9D3:: @ 81BB9D3 + end + +gUnknown_81BB9D4:: @ 81BB9D4 + textcolor 3 + msgbox Text_TerminateLinkIfYouLeaveRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if eq, EventScript_1BB9F0 + erasebox 0, 0, 29, 19 + releaseall + end + +EventScript_1BB9F0:: @ 81BB9F0 + textcolor 3 + messageautoscroll Text_1BC7E2 + waitmessage + special sub_8081770 + end + +gUnknown_81BB9FC:: @ 81BB9FC + special sub_8081744 + special sub_807E704 + waitstate + end + +EventScript_1BBA04:: @ 81BBA04 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1BB877 + specialvar VAR_RESULT, Special_BadEggInParty + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BB867 + copyvar VAR_0x8007, VAR_LAST_TALKED + specialvar VAR_RESULT, IsWirelessAdapterConnected + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BBB60 + message Text_1BD65B + waitmessage + goto EventScript_1BBA51 + +EventScript_1BBA50:: @ 81BBA50 + end + +EventScript_1BBA51:: @ 81BBA51 + multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE + switch VAR_RESULT + case 0, EventScript_1BBA94 + case 1, EventScript_1BB82F + case 2, EventScript_1BBA88 + case SCR_MENU_CANCEL, EventScript_1BB82F + end + +EventScript_1BBA88:: @ 81BBA88 + message Text_1BD706 + waitmessage + goto EventScript_1BBA51 + +EventScript_1BBA93:: @ 81BBA93 + end + +EventScript_1BBA94:: @ 81BBA94 + call EventScript_1BBB1E + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB82F + call EventScript_1A4EAF + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB82F + msgbox gUnknown_81BD86A + closemessage + special sp000_heal_pokemon + setvar VAR_0x8004, 6 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 + special HelpSystem_Disable + call CableClub_EventScript_OpenUnionRoomBarrier + special DrawWholeMapView + playse SE_TK_KASYA + delay 60 + applymovement VAR_LAST_TALKED, Movement_1BB88F + waitmovement 0 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + waitmovement 0 + opendoor 5, 1 + waitdooranim + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + waitmovement 0 + hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + closedoor 5, 1 + waitdooranim + special sub_811B15C + special SetCableClubWarp + warpteleport2 MAP_UNKNOWN_MAP_00_04, 255, 7, 11 + waitstate + special UnionRoomSpecial + waitstate + end + +EventScript_1BBB1E:: @ 81BBB1E + specialvar VAR_RESULT, CountPartyNonEggMons + compare VAR_RESULT, 2 + goto_if lt, EventScript_1BBB44 + specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BBB52 + setvar VAR_RESULT, 1 + return + +EventScript_1BBB44:: @ 81BBB44 + msgbox gUnknown_81BCBC3 + goto EventScript_1A77B0 + +EventScript_1BBB51:: @ 81BBB51 + end + +EventScript_1BBB52:: @ 81BBB52 + msgbox gUnknown_81BCC00 + goto EventScript_1A77B0 + +EventScript_1BBB5F:: @ 81BBB5F + end + +EventScript_1BBB60:: @ 81BBB60 + msgbox gUnknown_81BCC3A + release + return + +EventScript_1BBB6A:: @ 81BBB6A + lock + faceplayer + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1BB877 + msgbox gUnknown_81BDB85, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if eq, EventScript_1BBB92 + msgbox gUnknown_81BDBF8 + release + return + +EventScript_1BBB92:: @ 81BBB92 + msgbox gUnknown_81BDEDF + release + return + +EventScript_1BBB9C:: @ 81BBB9C + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1BB877 + specialvar VAR_RESULT, Special_BadEggInParty + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BB867 + specialvar VAR_RESULT, IsWirelessAdapterConnected + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB44A + message Text_1BD28D + waitmessage + delay 15 + goto EventScript_1BBBE7 + +EventScript_1BBBE6:: @ 81BBBE6 + end + +EventScript_1BBBE7:: @ 81BBBE7 + checkflag FLAG_GOT_POWDER_JAR + goto_if FALSE, EventScript_1BBC32 + multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE + switch VAR_RESULT + case 0, EventScript_1BBC69 + case 1, EventScript_1BBC97 + case 2, EventScript_1BBD35 + case 3, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F + end + +EventScript_1BBC32:: @ 81BBC32 + multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_2, FALSE + switch VAR_RESULT + case 0, EventScript_1BBC69 + case 1, EventScript_1BBC97 + case 2, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F + end + +EventScript_1BBC69:: @ 81BBC69 + msgbox gUnknown_81BD317, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if eq, EventScript_1BB82F + call EventScript_1BB79C + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB82F + setvar VAR_0x8004, 3 + goto EventScript_1BBD6F + +EventScript_1BBC96:: @ 81BBC96 + end + +EventScript_1BBC97:: @ 81BBC97 + message Text_1BD338 + waitmessage + multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE + switch VAR_RESULT + case 0, EventScript_1BBCEA + case 1, EventScript_1BBCF5 + case 2, EventScript_1BBD1C + case 3, EventScript_1BBD27 + case 4, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F + end + +EventScript_1BBCEA:: @ 81BBCEA + setvar VAR_0x8004, 0 + goto EventScript_1BBD6F + +EventScript_1BBCF4:: @ 81BBCF4 + end + +EventScript_1BBCF5:: @ 81BBCF5 + special CheckForAlivePartyMons + compare VAR_RESULT, 0 + goto_if ne, EventScript_1BBD0E + setvar VAR_0x8004, 1 + goto EventScript_1BBD6F + +EventScript_1BBD0D:: @ 81BBD0D + end + +EventScript_1BBD0E:: @ 81BBD0E + msgbox gUnknown_81BC409 + goto EventScript_1BBC97 + +EventScript_1BBD1B:: @ 81BBD1B + end + +EventScript_1BBD1C:: @ 81BBD1C + setvar VAR_0x8004, 2 + goto EventScript_1BBD6F + +EventScript_1BBD26:: @ 81BBD26 + end + +EventScript_1BBD27:: @ 81BBD27 + msgbox gUnknown_81BD390 + goto EventScript_1BBC97 + +EventScript_1BBD34:: @ 81BBD34 + end + +EventScript_1BBD35:: @ 81BBD35 + msgbox gUnknown_81BD362, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if eq, EventScript_1BB82F + special CheckHasAtLeastOneBerry + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BBD61 + setvar VAR_0x8004, 5 + goto EventScript_1BBD6F + +EventScript_1BBD60:: @ 81BBD60 + end + +EventScript_1BBD61:: @ 81BBD61 + msgbox gUnknown_81BCB81 + goto EventScript_1BBBE7 + +EventScript_1BBD6E:: @ 81BBD6E + end + +EventScript_1BBD6F:: @ 81BBD6F + call EventScript_1A4EAF + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB82F + switch VAR_0x8004 + case 3, EventScript_1BBDBC + case 0, EventScript_1BBDBC + case 1, EventScript_1BBDBC + case 2, EventScript_1BBE50 + case 5, EventScript_1BBEE4 + end + +EventScript_1BBDBC:: @ 81BBDBC + textcolor 3 + message Text_1BD51B + waitmessage + call EventScript_1A6675 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE + switch VAR_RESULT + case 0, EventScript_1BBE28 + case 1, EventScript_1BBE00 + case 2, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F + end + +EventScript_1BBE00:: @ 81BBE00 + call EventScript_1BBF78 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BBF88 + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BBDBC + compare VAR_RESULT, 8 + goto_if eq, EventScript_1BBE00 + release + return + +EventScript_1BBE28:: @ 81BBE28 + call EventScript_1BBF80 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BBF88 + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BBDBC + compare VAR_RESULT, 8 + goto_if eq, EventScript_1BBE28 + release + return + +EventScript_1BBE50:: @ 81BBE50 + textcolor 3 + message Text_1BD582 + waitmessage + call EventScript_1A6675 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE + switch VAR_RESULT + case 0, EventScript_1BBEBC + case 1, EventScript_1BBE94 + case 2, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F + end + +EventScript_1BBE94:: @ 81BBE94 + call EventScript_1BBF78 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BBF88 + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BBE50 + compare VAR_RESULT, 8 + goto_if eq, EventScript_1BBE94 + release + return + +EventScript_1BBEBC:: @ 81BBEBC + call EventScript_1BBF80 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BBF88 + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BBE50 + compare VAR_RESULT, 8 + goto_if eq, EventScript_1BBEBC + release + return + +EventScript_1BBEE4:: @ 81BBEE4 + textcolor 3 + message Text_1BD5F1 + waitmessage + call EventScript_1A6675 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE + switch VAR_RESULT + case 0, EventScript_1BBF50 + case 1, EventScript_1BBF28 + case 2, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F + end + +EventScript_1BBF28:: @ 81BBF28 + call EventScript_1BBF78 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BBF88 + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BBEE4 + compare VAR_RESULT, 8 + goto_if eq, EventScript_1BBF28 + release + return + +EventScript_1BBF50:: @ 81BBF50 + call EventScript_1BBF80 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BBF88 + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BBEE4 + compare VAR_RESULT, 8 + goto_if eq, EventScript_1BBF50 + release + return + +EventScript_1BBF78:: @ 81BBF78 + special HelpSystem_Disable + special sub_8115A24 + waitstate + return + +EventScript_1BBF80:: @ 81BBF80 + special HelpSystem_Disable + special BerryBlenderLinkJoinGroup + waitstate + return + +EventScript_1BBF88:: @ 81BBF88 + messageautoscroll Text_1BC59E + waitmessage + delay 60 + closemessage + copyvar VAR_0x8007, VAR_LAST_TALKED + call CableClub_EventScript_OpenDirectCornerBarrier + special DrawWholeMapView + playse SE_TK_KASYA + delay 60 + applymovement VAR_LAST_TALKED, Movement_1BB88F + waitmovement 0 + closemessage + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + waitmovement 0 + opendoor 9, 1 + waitdooranim + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + waitmovement 0 + hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + closedoor 9, 1 + waitdooranim + release + waitstate + end + +gUnknown_81BBFD8:: @ 81BBFD8 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lockall + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1BB881 + specialvar VAR_RESULT, IsWirelessAdapterConnected + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BC016 + special HelpSystem_Disable + fadescreen 1 + special sub_814F1D4 + waitstate + msgbox gUnknown_81BCA43 + special HelpSystem_Enable + releaseall + end + +EventScript_1BC016:: @ 81BC016 + msgbox gUnknown_81BCA13 + releaseall + end + +CableClub_EventScript_OpenUnionRoomBarrier:: @ 81BC020 + setmetatile 5, 3, 709, 0 + return + +CableClub_EventScript_CloseUnionRoomBarrier:: @ 81BC02A + setmetatile 5, 3, 761, 1 + return + +CableClub_EventScript_OpenDirectCornerBarrier:: @ 81BC034 + setmetatile 9, 3, 709, 0 + return + +CableClub_EventScript_CloseDirectCornerBarrier:: @ 81BC03E + setmetatile 9, 3, 761, 1 + return + +CableClub_EventScript_OpenGameCornerBarrier:: @ 81BC048 + setmetatile 5, 3, 737, 0 + return + +CableClub_EventScript_CloseGameCornerBarrier:: @ 81BC052 + setmetatile 5, 3, 759, 1 + return + +CeladonCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +FiveIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +FourIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +LavenderTown_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +OneIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +PewterCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +Route10_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +Route4_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +SaffronCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +SevenIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +SixIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +TwoIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +VermilionCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C +ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C + special sub_811999C + end + +EventScript_1BC060:: @ 81BC060 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + message Text_1BCCFF + waitmessage + multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE + switch VAR_RESULT + case 0, EventScript_1BC0B0 + case 1, EventScript_1BC0BA + case 2, EventScript_1BC0C4 + case SCR_MENU_CANCEL, EventScript_1BC0C4 + end + +EventScript_1BC0B0:: @ 81BC0B0 + msgbox gUnknown_81BCD4D + release + end + +EventScript_1BC0BA:: @ 81BC0BA + msgbox gUnknown_81BCE73 + release + end + +EventScript_1BC0C4:: @ 81BC0C4 + msgbox gUnknown_81BCF2E + release + end + +EventScript_1BC0CE:: @ 81BC0CE + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + message Text_1BCF69 + waitmessage + specialvar VAR_RESULT, IsWirelessAdapterConnected + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BC29C + delay 60 + special HelpSystem_Disable + message Text_1BD02D + waitmessage + multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE + switch VAR_RESULT + case 0, EventScript_1BC13A + case 1, EventScript_1BC184 + case 2, EventScript_1BB83F + case SCR_MENU_CANCEL, EventScript_1BB83F + end + +EventScript_1BC13A:: @ 81BC13A + setvar VAR_0x8005, 0 + special sub_8149A18 + compare VAR_RESULT, 0 + goto_if eq, EventScript_NoEligiblePkmn + msgbox gUnknown_81BD059 + setvar VAR_0x8005, 0 + special ChooseMonForWirelessMinigame + waitstate + compare VAR_0x8004, 6 + goto_if ge, EventScript_1BB83F + call EventScript_1A4EAF + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB83F + setvar VAR_0x8004, 4 + goto EventScript_1BC1CE + +EventScript_1BC183:: @ 81BC183 + end + +EventScript_1BC184:: @ 81BC184 + setvar VAR_0x8005, 1 + special sub_81537C0 + compare VAR_RESULT, 0 + goto_if eq, EventScript_NoEligiblePkmn + msgbox gUnknown_81BD059 + setvar VAR_0x8005, 1 + special ChooseMonForWirelessMinigame + waitstate + compare VAR_0x8004, 6 + goto_if ge, EventScript_1BB83F + call EventScript_1A4EAF + compare VAR_RESULT, 0 + goto_if eq, EventScript_1BB83F + setvar VAR_0x8004, 6 + goto EventScript_1BC1CE + +EventScript_1BC1CD:: @ 81BC1CD + end + +EventScript_1BC1CE:: @ 81BC1CE + textcolor 3 + message Text_1BD5F1 + waitmessage + call EventScript_1A6675 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE + switch VAR_RESULT + case 0, EventScript_1BC23A + case 1, EventScript_1BC212 + case 2, EventScript_1BB83F + case SCR_MENU_CANCEL, EventScript_1BB83F + end + +EventScript_1BC212:: @ 81BC212 + call EventScript_1BBF78 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BC262 + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BC1CE + compare VAR_RESULT, 8 + goto_if eq, EventScript_1BC212 + release + return + +EventScript_1BC23A:: @ 81BC23A + call EventScript_1BBF80 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1BC262 + compare VAR_RESULT, 5 + goto_if eq, EventScript_1BC1CE + compare VAR_RESULT, 8 + goto_if eq, EventScript_1BC23A + release + return + +EventScript_1BC262:: @ 81BC262 + messageautoscroll Text_1BD080 + waitmessage + delay 120 + closemessage + copyvar VAR_0x8007, VAR_LAST_TALKED + call CableClub_EventScript_OpenGameCornerBarrier + special DrawWholeMapView + playse SE_TK_KASYA + delay 60 + applymovement VAR_LAST_TALKED, Movement_1BB88F + waitmovement 0 + closemessage + applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A2 + waitmovement 0 + hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + release + waitstate + end + +EventScript_1BC29C:: @ 81BC29C + msgbox gUnknown_81BCFE8 + release + end + +EventScript_NoEligiblePkmn:: @ 81BC2A6 + msgbox gUnknown_81BD0CF, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if eq, EventScript_1BB83F + compare VAR_0x8005, 0 + call_if eq, EventScript_1BC2D5 + compare VAR_0x8005, 1 + call_if eq, EventScript_1BC2DE + goto EventScript_1BB83F + +EventScript_1BC2D4:: @ 81BC2D4 + end + +EventScript_1BC2D5:: @ 81BC2D5 + msgbox gUnknown_81BD14B + return + +EventScript_1BC2DE:: @ 81BC2DE + msgbox gUnknown_81BD213 + return + +TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lockall + special sub_814B504 + waitstate + releaseall + end + +TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lockall + special sub_8153810 + waitstate + releaseall + end + +gUnknown_81BC311:: @ 81BC311 + .string "Welcome to the POKéMON CABLE\n" + .string "CLUB.\p" + .string "Which of our services do you wish\n" + .string "to use?$" + +gUnknown_81BC35E:: @ 81BC35E + .string "Which of our services do you wish\n" + .string "to use?$" + +Text_1BC388:: @ 81BC388 + .string "Trade POKéMON with another player\n" + .string "using a GBA Game Link cable.$" + +Text_1BC3C7:: @ 81BC3C7 + .string "You may battle another TRAINER\n" + .string "using a GBA Game Link cable.$" + +Text_1BC403:: @ 81BC403 + .string "おわります$" + +gUnknown_81BC409:: @ 81BC409 + .string "For a DOUBLE BATTLE, you must\n" + .string "have at least two POKéMON.$" + +gUnknown_81BC442:: @ 81BC442 + .string "For trading, you must have at\n" + .string "least two POKéMON with you.$" + +gUnknown_81BC47C:: @ 81BC47C + .string "A POKéMON holding the {STR_VAR_1}\n" + .string "BERRY can't be traded.$" + +gUnknown_81BC4AC:: @ 81BC4AC + .string "Please wait.\n" + .string "… … B Button: Cancel$" + +gUnknown_81BC4CE:: @ 81BC4CE + .string "When all players are ready…\n" + .string "A Button: Confirm\l" + .string "B Button: Cancel$" + +gUnknown_81BC50D:: @ 81BC50D + .string "Start link with {STR_VAR_1} players.\n" + .string "A Button: Confirm\l" + .string "B Button: Cancel$" + +gUnknown_81BC54C:: @ 81BC54C + .string "Awaiting linkup…\n" + .string "… … B Button: Cancel$" + +Text_1BC572:: @ 81BC572 + .string "はじめる　まえに　レポートを\n" + .string "かきますが　よろしいですか？$" + +Text_1BC590:: @ 81BC590 + .string "Please enter.$" + +Text_1BC59E:: @ 81BC59E + .string "I'll direct you to your room now.$" + +gUnknown_81BC5C0:: @ 81BC5C0 + .string "Someone is not ready to link.\p" + .string "Please come back after everyone\n" + .string "has made preparations.$" + +gUnknown_81BC615:: @ 81BC615 + .string "Sorry, we have a link error…\n" + .string "Please reset and try again.$" + +gUnknown_81BC64E:: @ 81BC64E + .string "The link partners appear to have\n" + .string "made different selections.$" + +gUnknown_81BC68A:: @ 81BC68A + .string "Please do visit again.$" + +gUnknown_81BC6A1:: @ 81BC6A1 + .string "The number of participants is\n" + .string "incorrect.$" + +gUnknown_81BC6CA:: @ 81BC6CA + .string "The SINGLE BATTLE Mode can't be\n" + .string "played by {STR_VAR_1} players.$" + +gUnknown_81BC700:: @ 81BC700 + .string "The DOUBLE BATTLE Mode can't be\n" + .string "played by {STR_VAR_1} players.$" + +gUnknown_81BC736:: @ 81BC736 + .string "There must be four players to play\n" + .string "this Battle Mode.$" + +gUnknown_81BC76B:: @ 81BC76B + .string "Please confirm the number of\n" + .string "players and start again.$" + +Text_TerminateLinkIfYouLeaveRoom:: @ 81BC7A1 + .string "The link will be terminated if you\n" + .string "leave the room. Is that okay?$" + +Text_1BC7E2:: @ 81BC7E2 + .string "Terminating link…\n" + .string "You will be escorted out of\l" + .string "the room. Please wait.$" + +Text_TrainerTooBusyToNotice:: @ 81BC827 + .string "This TRAINER is too busy to\n" + .string "notice…$" + +Text_LookedAtPlayersTrainerCard:: @ 81BC84B + .string "Score! Got to look at {STR_VAR_1}'s\n" + .string "TRAINER CARD!$" + +Text_LookedAtPlayersTrainerCardColored:: @ 81BC874 + .string "Score! Got to look at {STR_VAR_1}'s\n" + .string "TRAINER CARD!\p" + .string "It's a {STR_VAR_2} card!$" + +Text_TakeSeatStartBattle:: @ 81BC8AD + .string "Please take your seat and start\n" + .string "your battle.$" + +Text_TakeSeatStartTrade:: @ 81BC8DA + .string "Please take your seat and start\n" + .string "your trade.$" + +Text_1BC906:: @ 81BC906 + .string "ごりよう　ありがとう　ございました$" + +Text_1BC918:: @ 81BC918 + .string "The TRAINER CARD data will\n" + .string "be overwritten.$" + +Text_1BC943:: @ 81BC943 + .string "I hope to see you again!$" + +gUnknown_81BC95C:: @ 81BC95C + .string "I'm awfully sorry.\p" + .string "We're not set up to conduct trades\n" + .string "with TRAINERS far away in another\l" + .string "region yet…$" + +gUnknown_81BC9C0:: @ 81BC9C0 + .string "The other TRAINER is not ready.$" + +gUnknown_81BC9E0:: @ 81BC9E0 + .string "You have at least one POKéMON\n" + .string "that can't be taken.$" + +gUnknown_81BCA13:: @ 81BCA13 + .string "The Wireless Adapter is not\n" + .string "connected properly.$" + +gUnknown_81BCA43:: @ 81BCA43 + .string "Participants are asked to step up\n" + .string "to the reception counter.$" + +Text_1BCA7F:: @ 81BCA7F + .string "こんにちは！$" + +Text_1BCA86:: @ 81BCA86 + .string "しょうしょう　おまちください$" + +Text_1BCA95:: @ 81BCA95 + .string "You may trade your POKéMON here\n" + .string "with another TRAINER.$" + +Text_1BCACB:: @ 81BCACB + .string "You may battle with your friends\n" + .string "here.$" + +Text_1BCAF2:: @ 81BCAF2 + .string "Two to five TRAINERS can make\n" + .string "BERRY POWDER together.$" + +Text_1BCB27:: @ 81BCB27 + .string "ワイヤレス　クラブでの\n" + .string "あそびかたを　せつめいします$" + +Text_1BCB42:: @ 81BCB42 + .string "Cancels the selected MENU item.$" + +Text_1BCB62:: @ 81BCB62 + .string "どちらの　しょうぶに　しますか？$" + +Text_1BCB73:: @ 81BCB73 + .string "ひとつ　まえに　もどります$" + +gUnknown_81BCB81:: @ 81BCB81 + .string "To use the BERRY CRUSH service,\n" + .string "you must have at least one BERRY.$" + +gUnknown_81BCBC3:: @ 81BCBC3 + .string "To enter the UNION ROOM, you must\n" + .string "have at least two POKéMON.$" + +gUnknown_81BCC00:: @ 81BCC00 + .string "No POKéMON holding the {STR_VAR_1}\n" + .string "BERRY may enter the UNION ROOM.$" + +gUnknown_81BCC3A:: @ 81BCC3A + .string "This is the POKéMON WIRELESS CLUB\n" + .string "UNION ROOM.\p" + .string "Unfortunately, your Wireless\n" + .string "Adapter is not connected properly.\p" + .string "Please do come again.$" + +Text_1BCCBE:: @ 81BCCBE + .string "あ‥‥\n" + .string "おきゃくさま！$" + +Text_PlayerIsPlayingRightNowGoForIt:: @ 81BCCCA + .string "It appears as if {STR_VAR_1} is playing\n" + .string "right now.\l" + .string "Go for it!$" + +Text_1BCCFF:: @ 81BCCFF + .string "I can explain game rules to you,\n" + .string "if you'd like.\p" + .string "Which game should I describe?$" + +gUnknown_81BCD4D:: @ 81BCD4D + .string "“POKéMON JUMP”\p" + .string "Make your POKéMON skip the\n" + .string "VINE WHIP rope with the A Button.\p" + .string "Only mini POKéMON around 28 inches\n" + .string "or less may participate.\p" + .string "POKéMON that only swim, burrow, or\n" + .string "fly are not good at jumping.\p" + .string "As a result, those POKéMON may not\n" + .string "participate.\p" + .string "Good things happen if everyone\n" + .string "jumps in time.$" + +gUnknown_81BCE73:: @ 81BCE73 + .string "“DODRIO BERRY-PICKING”\p" + .string "Command DODRIO's three heads to\n" + .string "catch falling BERRIES.\p" + .string "Press right, up, or left on the\n" + .string "{PLUS} Control Pad to move the heads.\p" + .string "To play this game, you must have\n" + .string "a DODRIO.$" + +gUnknown_81BCF2E:: @ 81BCF2E + .string "If you want to play a game,\n" + .string "please tell the man beside me.$" + +Text_1BCF69:: @ 81BCF69 + .string "Hi, welcome!\n" + .string "You can play games over the\l" + .string "Wireless Communication System.\p" + .string "Can you wait just a little bit?$" + +gUnknown_81BCFD1:: @ 81BCFD1 + .string "All right, come again!$" + +gUnknown_81BCFE8:: @ 81BCFE8 + .string "The Wireless Adapter isn't\n" + .string "connected.\p" + .string "Come back when it's hooked up!$" + +Text_1BD02D:: @ 81BD02D + .string "All right, which game did you want\n" + .string "to play?$" + +gUnknown_81BD059:: @ 81BD059 + .string "Which POKéMON would you like to\n" + .string "enter?$" + +Text_1BD080:: @ 81BD080 + .string "Okay, you're all good to go.\n" + .string "Don't let the others beat you!$" + +Text_1BD0BC:: @ 81BD0BC + .string "きょうは　けえるのか？\n" + .string "またこいよ！$" + +gUnknown_81BD0CF:: @ 81BD0CF + .string "It doesn't look like you have any\n" + .string "POKéMON that you can enter…\p" + .string "Would you like me to explain what\n" + .string "kinds of POKéMON can enter?$" + +gUnknown_81BD14B:: @ 81BD14B + .string "“POKéMON JUMP” is open to POKéMON\n" + .string "around 28 inches or less.\p" + .string "What you can't enter are those\n" + .string "POKéMON that can't jump.\p" + .string "You know, like POKéMON that only\n" + .string "swim, burrow, or fly.\p" + .string "That's all you need to know.$" + +gUnknown_81BD213:: @ 81BD213 + .string "“DODRIO BERRY-PICKING”…\n" + .string "Well, the name says it all.\p" + .string "You have to have a DODRIO to play\n" + .string "this game.$" + +Text_1BD274:: @ 81BD274 + .string "もういちど　はじめから\n" + .string "やりなおして　みて　くれ$" + +Text_1BD28D:: @ 81BD28D + .string "Welcome to the POKéMON WIRELESS\n" + .string "CLUB DIRECT CORNER.\p" + .string "You may interact directly with\n" + .string "your friends here.\p" + .string "Which room would you like to\n" + .string "enter?$" + +gUnknown_81BD317:: @ 81BD317 + .string "Would you like to trade POKéMON?$" + +Text_1BD338:: @ 81BD338 + .string "Which Battle Mode would you like\n" + .string "to play?$" + +gUnknown_81BD362:: @ 81BD362 + .string "Would you like to use the\n" + .string "BERRY CRUSH System?$" + +gUnknown_81BD390:: @ 81BD390 + .string "There are three Battle Modes.\p" + .string "SINGLE BATTLE is for two TRAINERS\n" + .string "with one or more POKéMON each.\p" + .string "Each TRAINER can have one POKéMON\n" + .string "in battle at a time.\p" + .string "DOUBLE BATTLE is for two TRAINERS\n" + .string "with two or more POKéMON each.\p" + .string "Each TRAINER will send out two\n" + .string "POKéMON in battle at a time.\p" + .string "MULTI BATTLE is for four TRAINERS\n" + .string "with one or more POKéMON each.\p" + .string "Each TRAINER can have one POKéMON\n" + .string "in battle at a time.$" + +Text_1BD51B:: @ 81BD51B + .string "Please decide which of you two\n" + .string "will become the LEADER.\p" + .string "The other player must then choose\n" + .string "“JOIN GROUP.”$" + +Text_1BD582:: @ 81BD582 + .string "Please decide which of you four\n" + .string "will become the GROUP LEADER.\p" + .string "The other players must then choose\n" + .string "“JOIN GROUP.”$" + +Text_1BD5F1:: @ 81BD5F1 + .string "Please decide which of you will\n" + .string "become the GROUP LEADER.\p" + .string "The other players must then choose\n" + .string "“JOIN GROUP.”$" + +Text_1BD65B:: @ 81BD65B + .string "Welcome to the POKéMON WIRELESS\n" + .string "CLUB UNION ROOM.\p" + .string "You may interact directly with\n" + .string "other TRAINERS here, some of\l" + .string "whom you may not even know.\p" + .string "Would you like to enter the ROOM?$" + +Text_1BD706:: @ 81BD706 + .string "The TRAINERS in the UNION ROOM\n" + .string "will be those players around you\l" + .string "who have also entered the ROOM.\p" + .string "You may do all sorts of things\n" + .string "here, such as exchanging greetings.\p" + .string "You may enter two POKéMON up to\n" + .string "Lv. 30 for a one-on-one battle.\p" + .string "You may take part in a chat with\n" + .string "two to five people.\p" + .string "Or, you may register a POKéMON for\n" + .string "trade.\p" + .string "Would you like to enter the ROOM?$" + +gUnknown_81BD86A:: @ 81BD86A + .string "I hope you enjoy your time in\n" + .string "the UNION ROOM.$" + +gUnknown_81BD898:: @ 81BD898 + .string "Hello!\n" + .string "My name is TEALA.\p" + .string "This must be your first time\n" + .string "up here.\p" + .string "I'll show you how the Wireless\n" + .string "Communication System works.\p" + .string "First, I need to show you this\n" + .string "floor of our POKéMON CENTER.\p" + .string "Right this way, please.$" + +gUnknown_81BD966:: @ 81BD966 + .string "On the top floor, there are two\n" + .string "rooms.\p" + .string "First, the room on the left.\n" + .string "It's the UNION ROOM.\p" + .string "You may link up with TRAINERS\n" + .string "around you who have also entered\l" + .string "the UNION ROOM.\p" + .string "With them, you may do things like\n" + .string "chat, battle, and trade.\p" + .string "Second, the room on the right is\n" + .string "the DIRECT CORNER.\p" + .string "You may trade or battle POKéMON\n" + .string "with your friends in this room.\p" + .string "If the Wireless Adapter isn't\n" + .string "connected, you may still link up\l" + .string "using a GBA Game Link cable.\p" + .string "If that is the case, you must go\n" + .string "to the DIRECT CORNER.\p" + .string "I hope you enjoy the Wireless \n" + .string "Communication System.$" + +gUnknown_81BDB85:: @ 81BDB85 + .string "Hello, {PLAYER}!\p" + .string "It's me, TEALA, the POKéMON\n" + .string "CENTER 2F attendant.\p" + .string "Is there something you needed to\n" + .string "ask me about linking?$" + +gUnknown_81BDBF8:: @ 81BDBF8 + .string "Let me explain how the POKéMON\n" + .string "WIRELESS CLUB works.\p" + .string "On this, the top floor, there are\n" + .string "two rooms.\p" + .string "First, the room on the left.\n" + .string "It's the UNION ROOM.\p" + .string "You may link up with TRAINERS\n" + .string "around you who have also entered\l" + .string "the UNION ROOM.\p" + .string "With them, you may do things like\n" + .string "chat, battle, and trade.\p" + .string "Second, the room on the right is\n" + .string "the DIRECT CORNER.\p" + .string "You may trade or battle POKéMON\n" + .string "with your friends in this room.\p" + .string "Sometimes, you may not be able to\n" + .string "find your friends in the UNION ROOM\l" + .string "or the DIRECT CORNER.\p" + .string "In that case, please move closer\n" + .string "to your friends.\p" + .string "If the Wireless Adapter isn't\n" + .string "connected, you may still link up\l" + .string "using a GBA Game Link cable.\p" + .string "If that is the case, you must go\n" + .string "to the DIRECT CORNER.\p" + .string "I hope you enjoy the Wireless \n" + .string "Communication System.$" + +gUnknown_81BDEDF:: @ 81BDEDF + .string "I hope you enjoy the Wireless\n" + .string "Communication System.$" diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index 76d2436ee..c268f4dcd 100644 --- a/data/scripts/item_ball_scripts.inc +++ b/data/scripts/item_ball_scripts.inc @@ -1,671 +1,671 @@ Route2_EventScript_1BE58E:: @ 81BE58E - giveitem ITEM_ETHER, 1, 1 + finditem ITEM_ETHER end Route2_EventScript_1BE59B:: @ 81BE59B - giveitem ITEM_PARALYZE_HEAL, 1, 1 + finditem ITEM_PARALYZE_HEAL end ViridianForest_EventScript_1BE5A8:: @ 81BE5A8 - giveitem ITEM_POKE_BALL, 1, 1 + finditem ITEM_POKE_BALL end ViridianForest_EventScript_1BE5B5:: @ 81BE5B5 - giveitem ITEM_ANTIDOTE, 1, 1 + finditem ITEM_ANTIDOTE end ViridianForest_EventScript_1BE5C2:: @ 81BE5C2 - giveitem ITEM_POTION, 1, 1 + finditem ITEM_POTION end MtMoon_1F_EventScript_1BE5CF:: @ 81BE5CF - giveitem ITEM_PARALYZE_HEAL, 1, 1 + finditem ITEM_PARALYZE_HEAL end MtMoon_1F_EventScript_1BE5DC:: @ 81BE5DC - giveitem ITEM_TM09, 1, 1 + finditem ITEM_TM09 end MtMoon_1F_EventScript_1BE5E9:: @ 81BE5E9 - giveitem ITEM_POTION, 1, 1 + finditem ITEM_POTION end MtMoon_1F_EventScript_1BE5F6:: @ 81BE5F6 - giveitem ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end MtMoon_1F_EventScript_1BE603:: @ 81BE603 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + finditem ITEM_ESCAPE_ROPE end MtMoon_1F_EventScript_1BE610:: @ 81BE610 - giveitem ITEM_MOON_STONE, 1, 1 + finditem ITEM_MOON_STONE end MtMoon_B2F_EventScript_1BE61D:: @ 81BE61D - giveitem ITEM_STAR_PIECE, 1, 1 + finditem ITEM_STAR_PIECE end MtMoon_B2F_EventScript_1BE62A:: @ 81BE62A - giveitem ITEM_TM46, 1, 1 + finditem ITEM_TM46 end Route4_EventScript_1BE637:: @ 81BE637 - giveitem ITEM_TM05, 1, 1 + finditem ITEM_TM05 end Route24_EventScript_1BE644:: @ 81BE644 - giveitem ITEM_TM45, 1, 1 + finditem ITEM_TM45 end Route25_EventScript_1BE651:: @ 81BE651 - giveitem ITEM_TM43, 1, 1 + finditem ITEM_TM43 end SSAnne_1F_Room2_EventScript_1BE65E:: @ 81BE65E - giveitem ITEM_TM31, 1, 1 + finditem ITEM_TM31 end SSAnne_2F_Room2_EventScript_1BE66B:: @ 81BE66B - giveitem ITEM_STARDUST, 1, 1 + finditem ITEM_STARDUST end SSAnne_2F_Room4_EventScript_1BE678:: @ 81BE678 - giveitem ITEM_X_ATTACK, 1, 1 + finditem ITEM_X_ATTACK end SSAnne_B1F_Room2_EventScript_1BE685:: @ 81BE685 - giveitem ITEM_TM44, 1, 1 + finditem ITEM_TM44 end SSAnne_B1F_Room3_EventScript_1BE692:: @ 81BE692 - giveitem ITEM_ETHER, 1, 1 + finditem ITEM_ETHER end SSAnne_B1F_Room5_EventScript_1BE69F:: @ 81BE69F - giveitem ITEM_SUPER_POTION, 1, 1 + finditem ITEM_SUPER_POTION end SSAnne_Kitchen_EventScript_1BE6AC:: @ 81BE6AC - giveitem ITEM_GREAT_BALL, 1, 1 + finditem ITEM_GREAT_BALL end Route9_EventScript_1BE6B9:: @ 81BE6B9 - giveitem ITEM_TM40, 1, 1 + finditem ITEM_TM40 end RocketHideout_B1F_EventScript_1BE6C6:: @ 81BE6C6 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + finditem ITEM_ESCAPE_ROPE end RocketHideout_B1F_EventScript_1BE6D3:: @ 81BE6D3 - giveitem ITEM_HYPER_POTION, 1, 1 + finditem ITEM_HYPER_POTION end RocketHideout_B2F_EventScript_1BE6E0:: @ 81BE6E0 - giveitem ITEM_X_SPEED, 1, 1 + finditem ITEM_X_SPEED end RocketHideout_B2F_EventScript_1BE6ED:: @ 81BE6ED - giveitem ITEM_MOON_STONE, 1, 1 + finditem ITEM_MOON_STONE end RocketHideout_B2F_EventScript_1BE6FA:: @ 81BE6FA - giveitem ITEM_TM12, 1, 1 + finditem ITEM_TM12 end RocketHideout_B2F_EventScript_1BE707:: @ 81BE707 - giveitem ITEM_SUPER_POTION, 1, 1 + finditem ITEM_SUPER_POTION end RocketHideout_B3F_EventScript_1BE714:: @ 81BE714 - giveitem ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end RocketHideout_B3F_EventScript_1BE721:: @ 81BE721 - giveitem ITEM_TM21, 1, 1 + finditem ITEM_TM21 end RocketHideout_B4F_EventScript_1BE72E:: @ 81BE72E - giveitem ITEM_TM49, 1, 1 + finditem ITEM_TM49 end RocketHideout_B4F_EventScript_1BE73B:: @ 81BE73B - giveitem ITEM_MAX_ETHER, 1, 1 + finditem ITEM_MAX_ETHER end RocketHideout_B4F_EventScript_1BE748:: @ 81BE748 - giveitem ITEM_CALCIUM, 1, 1 + finditem ITEM_CALCIUM end PokemonTower_3F_EventScript_1BE755:: @ 81BE755 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + finditem ITEM_ESCAPE_ROPE end PokemonTower_4F_EventScript_1BE762:: @ 81BE762 - giveitem ITEM_ELIXIR, 1, 1 + finditem ITEM_ELIXIR end PokemonTower_4F_EventScript_1BE76F:: @ 81BE76F - giveitem ITEM_AWAKENING, 1, 1 + finditem ITEM_AWAKENING end PokemonTower_4F_EventScript_1BE77C:: @ 81BE77C - giveitem ITEM_GREAT_BALL, 1, 1 + finditem ITEM_GREAT_BALL end PokemonTower_5F_EventScript_1BE789:: @ 81BE789 - giveitem ITEM_NUGGET, 1, 1 + finditem ITEM_NUGGET end PokemonTower_6F_EventScript_1BE796:: @ 81BE796 - giveitem ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end PokemonTower_6F_EventScript_1BE7A3:: @ 81BE7A3 - giveitem ITEM_X_ACCURACY, 1, 1 + finditem ITEM_X_ACCURACY end Route12_EventScript_1BE7B0:: @ 81BE7B0 - giveitem ITEM_TM48, 1, 1 + finditem ITEM_TM48 end Route12_EventScript_1BE7BD:: @ 81BE7BD - giveitem ITEM_IRON, 1, 1 + finditem ITEM_IRON end Route15_EventScript_1BE7CA:: @ 81BE7CA - giveitem ITEM_TM18, 1, 1 + finditem ITEM_TM18 end SafariZone_Center_EventScript_1BE7D7:: @ 81BE7D7 - giveitem ITEM_NUGGET, 1, 1 + finditem ITEM_NUGGET end SafariZone_East_EventScript_1BE7E4:: @ 81BE7E4 - giveitem ITEM_MAX_POTION, 1, 1 + finditem ITEM_MAX_POTION end SafariZone_East_EventScript_1BE7F1:: @ 81BE7F1 - giveitem ITEM_FULL_RESTORE, 1, 1 + finditem ITEM_FULL_RESTORE end SafariZone_East_EventScript_1BE7FE:: @ 81BE7FE - giveitem ITEM_TM11, 1, 1 + finditem ITEM_TM11 end SafariZone_East_EventScript_1BE80B:: @ 81BE80B - giveitem ITEM_LEAF_STONE, 1, 1 + finditem ITEM_LEAF_STONE end SafariZone_North_EventScript_1BE818:: @ 81BE818 - giveitem ITEM_PROTEIN, 1, 1 + finditem ITEM_PROTEIN end SafariZone_North_EventScript_1BE825:: @ 81BE825 - giveitem ITEM_TM47, 1, 1 + finditem ITEM_TM47 end SafariZone_West_EventScript_1BE832:: @ 81BE832 - giveitem ITEM_TM32, 1, 1 + finditem ITEM_TM32 end SafariZone_West_EventScript_1BE83F:: @ 81BE83F - giveitem ITEM_GOLD_TEETH, 1, 1 + finditem ITEM_GOLD_TEETH end SafariZone_West_EventScript_1BE84C:: @ 81BE84C - giveitem ITEM_MAX_POTION, 1, 1 + finditem ITEM_MAX_POTION end SafariZone_West_EventScript_1BE859:: @ 81BE859 - giveitem ITEM_MAX_REVIVE, 1, 1 + finditem ITEM_MAX_REVIVE end SilphCo_3F_EventScript_1BE866:: @ 81BE866 - giveitem ITEM_HYPER_POTION, 1, 1 + finditem ITEM_HYPER_POTION end SilphCo_4F_EventScript_1BE873:: @ 81BE873 - giveitem ITEM_MAX_REVIVE, 1, 1 + finditem ITEM_MAX_REVIVE end SilphCo_4F_EventScript_1BE880:: @ 81BE880 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + finditem ITEM_ESCAPE_ROPE end SilphCo_4F_EventScript_1BE88D:: @ 81BE88D - giveitem ITEM_FULL_HEAL, 1, 1 + finditem ITEM_FULL_HEAL end SilphCo_5F_EventScript_1BE89A:: @ 81BE89A - giveitem ITEM_PROTEIN, 1, 1 + finditem ITEM_PROTEIN end SilphCo_5F_EventScript_1BE8A7:: @ 81BE8A7 - giveitem ITEM_TM01, 1, 1 + finditem ITEM_TM01 end SilphCo_5F_EventScript_1BE8B4:: @ 81BE8B4 - giveitem ITEM_CARD_KEY, 1, 1 + finditem ITEM_CARD_KEY end SilphCo_6F_EventScript_1BE8C1:: @ 81BE8C1 - giveitem ITEM_HP_UP, 1, 1 + finditem ITEM_HP_UP end SilphCo_6F_EventScript_1BE8CE:: @ 81BE8CE - giveitem ITEM_X_SPECIAL, 1, 1 + finditem ITEM_X_SPECIAL end SilphCo_7F_EventScript_1BE8DB:: @ 81BE8DB - giveitem ITEM_CALCIUM, 1, 1 + finditem ITEM_CALCIUM end SilphCo_7F_EventScript_1BE8E8:: @ 81BE8E8 - giveitem ITEM_TM08, 1, 1 + finditem ITEM_TM08 end SilphCo_10F_EventScript_1BE8F5:: @ 81BE8F5 - giveitem ITEM_CARBOS, 1, 1 + finditem ITEM_CARBOS end SilphCo_10F_EventScript_1BE902:: @ 81BE902 - giveitem ITEM_ULTRA_BALL, 1, 1 + finditem ITEM_ULTRA_BALL end SilphCo_10F_EventScript_1BE90F:: @ 81BE90F - giveitem ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end PowerPlant_EventScript_1BE91C:: @ 81BE91C - giveitem ITEM_MAX_POTION, 1, 1 + finditem ITEM_MAX_POTION end PowerPlant_EventScript_1BE929:: @ 81BE929 - giveitem ITEM_TM17, 1, 1 + finditem ITEM_TM17 end PowerPlant_EventScript_1BE936:: @ 81BE936 - giveitem ITEM_TM25, 1, 1 + finditem ITEM_TM25 end PowerPlant_EventScript_1BE943:: @ 81BE943 - giveitem ITEM_THUNDER_STONE, 1, 1 + finditem ITEM_THUNDER_STONE end PowerPlant_EventScript_1BE950:: @ 81BE950 - giveitem ITEM_ELIXIR, 1, 1 + finditem ITEM_ELIXIR end PokemonMansion_1F_EventScript_1BE95D:: @ 81BE95D - giveitem ITEM_CARBOS, 1, 1 + finditem ITEM_CARBOS end PokemonMansion_1F_EventScript_1BE96A:: @ 81BE96A - giveitem ITEM_ESCAPE_ROPE, 1, 1 + finditem ITEM_ESCAPE_ROPE end PokemonMansion_2F_EventScript_1BE977:: @ 81BE977 - giveitem ITEM_CALCIUM, 1, 1 + finditem ITEM_CALCIUM end PokemonMansion_3F_EventScript_1BE984:: @ 81BE984 - giveitem ITEM_MAX_POTION, 1, 1 + finditem ITEM_MAX_POTION end PokemonMansion_3F_EventScript_1BE991:: @ 81BE991 - giveitem ITEM_IRON, 1, 1 + finditem ITEM_IRON end PokemonMansion_B1F_EventScript_1BE99E:: @ 81BE99E - giveitem ITEM_TM14, 1, 1 + finditem ITEM_TM14 end PokemonMansion_B1F_EventScript_1BE9AB:: @ 81BE9AB - giveitem ITEM_FULL_RESTORE, 1, 1 + finditem ITEM_FULL_RESTORE end PokemonMansion_B1F_EventScript_1BE9B8:: @ 81BE9B8 - giveitem ITEM_TM22, 1, 1 + finditem ITEM_TM22 end PokemonMansion_B1F_EventScript_1BE9C5:: @ 81BE9C5 - giveitem ITEM_SECRET_KEY, 1, 1 + finditem ITEM_SECRET_KEY end VictoryRoad_1F_EventScript_1BE9D2:: @ 81BE9D2 - giveitem ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end VictoryRoad_1F_EventScript_1BE9DF:: @ 81BE9DF - giveitem ITEM_TM02, 1, 1 + finditem ITEM_TM02 end VictoryRoad_2F_EventScript_1BE9EC:: @ 81BE9EC - giveitem ITEM_GUARD_SPEC, 1, 1 + finditem ITEM_GUARD_SPEC end VictoryRoad_2F_EventScript_1BE9F9:: @ 81BE9F9 - giveitem ITEM_TM07, 1, 1 + finditem ITEM_TM07 end VictoryRoad_2F_EventScript_1BEA06:: @ 81BEA06 - giveitem ITEM_FULL_HEAL, 1, 1 + finditem ITEM_FULL_HEAL end VictoryRoad_2F_EventScript_1BEA13:: @ 81BEA13 - giveitem ITEM_TM37, 1, 1 + finditem ITEM_TM37 end VictoryRoad_3F_EventScript_1BEA20:: @ 81BEA20 - giveitem ITEM_MAX_REVIVE, 1, 1 + finditem ITEM_MAX_REVIVE end VictoryRoad_3F_EventScript_1BEA2D:: @ 81BEA2D - giveitem ITEM_TM50, 1, 1 + finditem ITEM_TM50 end CeruleanCave_1F_EventScript_1BEA3A:: @ 81BEA3A - giveitem ITEM_MAX_ELIXIR, 1, 1 + finditem ITEM_MAX_ELIXIR end CeruleanCave_1F_EventScript_1BEA47:: @ 81BEA47 - giveitem ITEM_NUGGET, 1, 1 + finditem ITEM_NUGGET end CeruleanCave_1F_EventScript_1BEA54:: @ 81BEA54 - giveitem ITEM_FULL_RESTORE, 1, 1 + finditem ITEM_FULL_RESTORE end CeruleanCave_2F_EventScript_1BEA61:: @ 81BEA61 - giveitem ITEM_FULL_RESTORE, 1, 1 + finditem ITEM_FULL_RESTORE end CeruleanCave_2F_EventScript_1BEA6E:: @ 81BEA6E - giveitem ITEM_PP_UP, 1, 1 + finditem ITEM_PP_UP end CeruleanCave_2F_EventScript_1BEA7B:: @ 81BEA7B - giveitem ITEM_ULTRA_BALL, 1, 1 + finditem ITEM_ULTRA_BALL end CeruleanCave_B1F_EventScript_1BEA88:: @ 81BEA88 - giveitem ITEM_MAX_REVIVE, 1, 1 + finditem ITEM_MAX_REVIVE end CeruleanCave_B1F_EventScript_1BEA95:: @ 81BEA95 - giveitem ITEM_ULTRA_BALL, 1, 1 + finditem ITEM_ULTRA_BALL end FuchsiaCity_Building1_EventScript_1BEAA2:: @ 81BEAA2 - giveitem ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end TwoIsland_EventScript_1BEAAF:: @ 81BEAAF - giveitem ITEM_REVIVE, 1, 1 + finditem ITEM_REVIVE end ThreeIsland_EventScript_1BEABC:: @ 81BEABC - giveitem ITEM_ZINC, 1, 1 + finditem ITEM_ZINC end ViridianForest_EventScript_1BEAC9:: @ 81BEAC9 - giveitem ITEM_POTION, 1, 1 + finditem ITEM_POTION end MtMoon_B2F_EventScript_1BEAD6:: @ 81BEAD6 - giveitem ITEM_REVIVE, 1, 1 + finditem ITEM_REVIVE end MtMoon_B2F_EventScript_1BEAE3:: @ 81BEAE3 - giveitem ITEM_ANTIDOTE, 1, 1 + finditem ITEM_ANTIDOTE end Route11_EventScript_1BEAF0:: @ 81BEAF0 - giveitem ITEM_X_DEFEND, 1, 1 + finditem ITEM_X_DEFEND end Route9_EventScript_1BEAFD:: @ 81BEAFD - giveitem ITEM_BURN_HEAL, 1, 1 + finditem ITEM_BURN_HEAL end RockTunnel_1F_EventScript_1BEB0A:: @ 81BEB0A - giveitem ITEM_REPEL, 1, 1 + finditem ITEM_REPEL end RockTunnel_1F_EventScript_1BEB17:: @ 81BEB17 - giveitem ITEM_PEARL, 1, 1 + finditem ITEM_PEARL end RockTunnel_1F_EventScript_1BEB24:: @ 81BEB24 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + finditem ITEM_ESCAPE_ROPE end RockTunnel_B1F_EventScript_1BEB31:: @ 81BEB31 - giveitem ITEM_REVIVE, 1, 1 + finditem ITEM_REVIVE end RockTunnel_B1F_EventScript_1BEB3E:: @ 81BEB3E - giveitem ITEM_MAX_ETHER, 1, 1 + finditem ITEM_MAX_ETHER end SilphCo_8F_EventScript_1BEB4B:: @ 81BEB4B - giveitem ITEM_IRON, 1, 1 + finditem ITEM_IRON end SilphCo_11F_EventScript_1BEB58:: @ 81BEB58 - giveitem ITEM_ZINC, 1, 1 + finditem ITEM_ZINC end PokemonMansion_1F_EventScript_1BEB65:: @ 81BEB65 - giveitem ITEM_PROTEIN, 1, 1 + finditem ITEM_PROTEIN end PokemonMansion_2F_EventScript_1BEB72:: @ 81BEB72 - giveitem ITEM_ZINC, 1, 1 + finditem ITEM_ZINC end PokemonMansion_2F_EventScript_1BEB7F:: @ 81BEB7F - giveitem ITEM_HP_UP, 1, 1 + finditem ITEM_HP_UP end ViridianCity_EventScript_1BEB8C:: @ 81BEB8C - giveitem ITEM_POTION, 1, 1 + finditem ITEM_POTION end Route11_EventScript_1BEB99:: @ 81BEB99 - giveitem ITEM_GREAT_BALL, 1, 1 + finditem ITEM_GREAT_BALL end Route11_EventScript_1BEBA6:: @ 81BEBA6 - giveitem ITEM_AWAKENING, 1, 1 + finditem ITEM_AWAKENING end PokemonTower_5F_EventScript_1BEBB3:: @ 81BEBB3 - giveitem ITEM_CLEANSE_TAG, 1, 1 + finditem ITEM_CLEANSE_TAG end CeladonCity_EventScript_1BEBC0:: @ 81BEBC0 - giveitem ITEM_ETHER, 1, 1 + finditem ITEM_ETHER end RocketHideout_B3F_EventScript_1BEBCD:: @ 81BEBCD - giveitem ITEM_BLACK_GLASSES, 1, 1 + finditem ITEM_BLACK_GLASSES end SafariZone_North_EventScript_1BEBDA:: @ 81BEBDA - giveitem ITEM_QUICK_CLAW, 1, 1 + finditem ITEM_QUICK_CLAW end SeafoamIslands_1F_EventScript_1BEBE7:: @ 81BEBE7 - giveitem ITEM_ICE_HEAL, 1, 1 + finditem ITEM_ICE_HEAL end SeafoamIslands_B1F_EventScript_1BEBF4:: @ 81BEBF4 - giveitem ITEM_WATER_STONE, 1, 1 + finditem ITEM_WATER_STONE end SeafoamIslands_B1F_EventScript_1BEC01:: @ 81BEC01 - giveitem ITEM_REVIVE, 1, 1 + finditem ITEM_REVIVE end SeafoamIslands_B2F_EventScript_1BEC0E:: @ 81BEC0E - giveitem ITEM_BIG_PEARL, 1, 1 + finditem ITEM_BIG_PEARL end SeafoamIslands_B4F_EventScript_1BEC1B:: @ 81BEC1B - giveitem ITEM_ULTRA_BALL, 1, 1 + finditem ITEM_ULTRA_BALL end FourIsland_EventScript_1BEC28:: @ 81BEC28 - giveitem ITEM_STAR_PIECE, 1, 1 + finditem ITEM_STAR_PIECE end FourIsland_EventScript_1BEC35:: @ 81BEC35 - giveitem ITEM_STARDUST, 1, 1 + finditem ITEM_STARDUST end OneIsland_KindleRoad_EventScript_1BEC42:: @ 81BEC42 - giveitem ITEM_ETHER, 1, 1 + finditem ITEM_ETHER end OneIsland_KindleRoad_EventScript_1BEC4F:: @ 81BEC4F - giveitem ITEM_MAX_REPEL, 1, 1 + finditem ITEM_MAX_REPEL end OneIsland_KindleRoad_EventScript_1BEC5C:: @ 81BEC5C - giveitem ITEM_CARBOS, 1, 1 + finditem ITEM_CARBOS end FiveIsland_Meadow_EventScript_1BEC69:: @ 81BEC69 - giveitem ITEM_MAX_POTION, 1, 1 + finditem ITEM_MAX_POTION end FiveIsland_Meadow_EventScript_1BEC76:: @ 81BEC76 - giveitem ITEM_PP_UP, 1, 1 + finditem ITEM_PP_UP end FiveIsland_MemorialPillar_EventScript_1BEC83:: @ 81BEC83 - giveitem ITEM_METAL_COAT, 1, 1 + finditem ITEM_METAL_COAT end SixIsland_OutcastIsland_EventScript_1BEC90:: @ 81BEC90 - giveitem ITEM_PP_UP, 1, 1 + finditem ITEM_PP_UP end SixIsland_WaterPath_EventScript_1BEC9D:: @ 81BEC9D - giveitem ITEM_ELIXIR, 1, 1 + finditem ITEM_ELIXIR end SixIsland_WaterPath_EventScript_1BECAA:: @ 81BECAA - giveitem ITEM_DRAGON_SCALE, 1, 1 + finditem ITEM_DRAGON_SCALE end SixIsland_RuinValley_EventScript_1BECB7:: @ 81BECB7 - giveitem ITEM_FULL_RESTORE, 1, 1 + finditem ITEM_FULL_RESTORE end SixIsland_RuinValley_EventScript_1BECC4:: @ 81BECC4 - giveitem ITEM_HP_UP, 1, 1 + finditem ITEM_HP_UP end SixIsland_RuinValley_EventScript_1BECD1:: @ 81BECD1 - giveitem ITEM_SUN_STONE, 1, 1 + finditem ITEM_SUN_STONE end SevenIsland_SevaultCanyon_EventScript_1BECDE:: @ 81BECDE - giveitem ITEM_KINGS_ROCK, 1, 1 + finditem ITEM_KINGS_ROCK end SevenIsland_SevaultCanyon_EventScript_1BECEB:: @ 81BECEB - giveitem ITEM_MAX_ELIXIR, 1, 1 + finditem ITEM_MAX_ELIXIR end SevenIsland_SevaultCanyon_EventScript_1BECF8:: @ 81BECF8 - giveitem ITEM_NUGGET, 1, 1 + finditem ITEM_NUGGET end ThreeIsland_BerryForest_EventScript_1BED05:: @ 81BED05 - giveitem ITEM_MAX_ETHER, 1, 1 + finditem ITEM_MAX_ETHER end ThreeIsland_BerryForest_EventScript_1BED12:: @ 81BED12 - giveitem ITEM_FULL_HEAL, 1, 1 + finditem ITEM_FULL_HEAL end ThreeIsland_BerryForest_EventScript_1BED1F:: @ 81BED1F - giveitem ITEM_MAX_ELIXIR, 1, 1 + finditem ITEM_MAX_ELIXIR end MtEmber_Exterior_EventScript_1BED2C:: @ 81BED2C - giveitem ITEM_ULTRA_BALL, 1, 1 + finditem ITEM_ULTRA_BALL end MtEmber_Exterior_EventScript_1BED39:: @ 81BED39 - giveitem ITEM_FIRE_STONE, 1, 1 + finditem ITEM_FIRE_STONE end MtEmber_Exterior_EventScript_1BED46:: @ 81BED46 - giveitem ITEM_DIRE_HIT, 1, 1 + finditem ITEM_DIRE_HIT end FourIsland_IcefallCave_1F_EventScript_1BED53:: @ 81BED53 - giveitem ITEM_ULTRA_BALL, 1, 1 + finditem ITEM_ULTRA_BALL end FourIsland_IcefallCave_1F_EventScript_1BED60:: @ 81BED60 - giveitem ITEM_HM07, 1, 1 + finditem ITEM_HM07 end FourIsland_IcefallCave_B1F_EventScript_1BED6D:: @ 81BED6D - giveitem ITEM_FULL_RESTORE, 1, 1 + finditem ITEM_FULL_RESTORE end FourIsland_IcefallCave_B1F_EventScript_1BED7A:: @ 81BED7A - giveitem ITEM_NEVER_MELT_ICE, 1, 1 + finditem ITEM_NEVER_MELT_ICE end FiveIsland_RocketWarehouse_EventScript_1BED87:: @ 81BED87 - giveitem ITEM_BIG_PEARL, 1, 1 + finditem ITEM_BIG_PEARL end FiveIsland_RocketWarehouse_EventScript_1BED94:: @ 81BED94 - giveitem ITEM_TM36, 1, 1 + finditem ITEM_TM36 end FiveIsland_RocketWarehouse_EventScript_1BEDA1:: @ 81BEDA1 - giveitem ITEM_PEARL, 1, 1 + finditem ITEM_PEARL end FiveIsland_RocketWarehouse_EventScript_1BEDAE:: @ 81BEDAE - giveitem ITEM_UP_GRADE, 1, 1 + finditem ITEM_UP_GRADE end FiveIsland_LostCave_Room10_EventScript_1BEDBB:: @ 81BEDBB - giveitem ITEM_SILK_SCARF, 1, 1 + finditem ITEM_SILK_SCARF end FiveIsland_LostCave_Room11_EventScript_1BEDC8:: @ 81BEDC8 - giveitem ITEM_LAX_INCENSE, 1, 1 + finditem ITEM_LAX_INCENSE end FiveIsland_LostCave_Room12_EventScript_1BEDD5:: @ 81BEDD5 - giveitem ITEM_SEA_INCENSE, 1, 1 + finditem ITEM_SEA_INCENSE end FiveIsland_LostCave_Room13_EventScript_1BEDE2:: @ 81BEDE2 - giveitem ITEM_MAX_REVIVE, 1, 1 + finditem ITEM_MAX_REVIVE end FiveIsland_LostCave_Room14_EventScript_1BEDEF:: @ 81BEDEF - giveitem ITEM_RARE_CANDY, 1, 1 + finditem ITEM_RARE_CANDY end SevenIsland_SevaultCanyon_House_EventScript_1BEDFC:: @ 81BEDFC - giveitem ITEM_LUCKY_PUNCH, 1, 1 + finditem ITEM_LUCKY_PUNCH end SilphCo_4F_EventScript_1BEE09:: @ 81BEE09 - giveitem ITEM_TM41, 1, 1 + finditem ITEM_TM41 end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 51f87a6f5..b0bf1dba4 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -3,8 +3,8 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE faceplayer checkflag FLAG_TUTOR_DOUBLE_EDGE goto_if TRUE, EventScript_1C480C - msgbox Text_1749F9, 5 - compare VAR_RESULT, 0 + msgbox Text_1749F9, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4802 call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -33,8 +33,8 @@ EventScript_1C4816:: @ 81C4816 faceplayer checkflag FLAG_TUTOR_THUNDER_WAVE goto_if TRUE, EventScript_1C4874 - msgbox Text_175711, 5 - compare VAR_RESULT, 0 + msgbox Text_175711, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C486A call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -63,8 +63,8 @@ RockTunnel_B1F_EventScript_1C487E:: @ 81C487E faceplayer checkflag FLAG_TUTOR_ROCK_SLIDE goto_if TRUE, EventScript_1C48DC - msgbox Text_1799E0, 5 - compare VAR_RESULT, 0 + msgbox Text_1799E0, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C48D2 call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -93,8 +93,8 @@ MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 faceplayer checkflag FLAG_TUTOR_EXPLOSION goto_if TRUE, EventScript_1C4944 - msgbox Text_17A642, 5 - compare VAR_RESULT, 0 + msgbox Text_17A642, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C493A call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -123,8 +123,8 @@ Route4_EventScript_1C494E:: @ 81C494E faceplayer checkflag FLAG_TUTOR_META_PUNCH goto_if TRUE, EventScript_1C49AC - msgbox Text_1839D5, 5 - compare VAR_RESULT, 0 + msgbox Text_1839D5, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C49A2 call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -153,8 +153,8 @@ Route4_EventScript_1C49B6:: @ 81C49B6 faceplayer checkflag FLAG_TUTOR_MEGA_KICK goto_if TRUE, EventScript_1C4A14 - msgbox Text_183B74, 5 - compare VAR_RESULT, 0 + msgbox Text_183B74, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4A0A call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -183,8 +183,8 @@ EventScript_1C4A1E:: @ 81C4A1E faceplayer checkflag FLAG_TUTOR_DREAM_EATER goto_if TRUE, EventScript_1C4A7C - msgbox Text_17E316, 5 - compare VAR_RESULT, 0 + msgbox Text_17E316, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4A72 call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -213,8 +213,8 @@ EventScript_1C4A86:: @ 81C4A86 faceplayer checkflag FLAG_TUTOR_SOFT_BOILED goto_if TRUE, EventScript_1C4AE4 - msgbox Text_180388, 5 - compare VAR_RESULT, 0 + msgbox Text_180388, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4ADA call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -243,8 +243,8 @@ FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE faceplayer checkflag FLAG_TUTOR_SUBSTITUTE goto_if TRUE, EventScript_1C4B4C - msgbox Text_180948, 5 - compare VAR_RESULT, 0 + msgbox Text_180948, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4B42 call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -273,8 +273,8 @@ SevenIsland_EventScript_1C4B56:: @ 81C4B56 faceplayer checkflag FLAG_TUTOR_SWORDS_DANCE goto_if TRUE, EventScript_1C4BB4 - msgbox Text_182F01, 5 - compare VAR_RESULT, 0 + msgbox Text_182F01, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4BAA call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -303,8 +303,8 @@ PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE faceplayer checkflag FLAG_TUTOR_SEISMIC_TOSS goto_if TRUE, EventScript_1C4C1C - msgbox Text_1909A3, 5 - compare VAR_RESULT, 0 + msgbox Text_1909A3, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4C12 call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -333,8 +333,8 @@ EventScript_1C4C26:: @ 81C4C26 faceplayer checkflag FLAG_TUTOR_COUNTER goto_if TRUE, EventScript_1C4C84 - msgbox Text_195928, 5 - compare VAR_RESULT, 0 + msgbox Text_195928, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4C7A call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -363,8 +363,8 @@ EventScript_1C4C8E:: @ 81C4C8E faceplayer checkflag FLAG_TUTOR_METRONOME goto_if TRUE, EventScript_1C4CEC - msgbox Text_19A137, 5 - compare VAR_RESULT, 0 + msgbox Text_19A137, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4CE2 call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -391,8 +391,8 @@ EventScript_1C4CEC:: @ 81C4CEC EventScript_1C4CF6:: @ 81C4CF6 checkflag FLAG_TUTOR_MIMIC goto_if TRUE, EventScript_1C4D59 - msgbox Text_19AD85, 5 - compare VAR_RESULT, 0 + msgbox Text_19AD85, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4D4F call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -436,8 +436,8 @@ FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 faceplayer checkflag FLAG_TUTOR_BODY_SLAM goto_if TRUE, EventScript_1C4DE2 - msgbox Text_1A3505, 5 - compare VAR_RESULT, 0 + msgbox Text_1A3505, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4DD8 call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -486,8 +486,8 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC call_if eq, EventScript_1C4F06 compare VAR_FACING, 3 call_if eq, EventScript_1C4F11 - msgbox Text_1A4751, 5 - compare VAR_RESULT, 0 + msgbox Text_1A4751, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if eq, EventScript_1C4F1C call EventScript_1C4F37 compare VAR_RESULT, 0 @@ -576,7 +576,7 @@ EventScript_1C4F37:: @ 81C4F37 textcolor 3 special sub_80699BC signmsg - msgbox Text_1A644F, 5 + msgbox Text_1A644F, MSGBOX_YESNO normalmsg call EventScript_1A6675 return diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc index addd6894e..1cc93c95d 100644 --- a/data/scripts/repel.inc +++ b/data/scripts/repel.inc @@ -1,5 +1,5 @@ EventScript_RepelWoreOff:: @ 81BFB65 - msgbox Text_1BFB6E, 3 + msgbox Text_1BFB6E, MSGBOX_SIGN end Text_1BFB6E:: @ 81BFB6E diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 8d44b2783..874bce358 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -150,7 +150,7 @@ EventScript_1A501A:: @ 81A501A releaseall end -gStdScript_Message_WaitButton_AndRelease:: @ 81A501F +Std_MsgboxAutoclose:: @ 81A501F message 0x0 waitmessage waitbuttonpress diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index 0f59cabd1..64bb44c50 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -3,12 +3,12 @@ Route3_EventScript_1A93C9:: @ 81A93C9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A93F0 - msgbox Text_1835B4, 6 + msgbox Text_1835B4, MSGBOX_AUTOCLOSE end EventScript_1A93F0:: @ 81A93F0 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_BEN, 0, Text_1C149D, Text_1835A0 - msgbox Text_1835B4, 6 + msgbox Text_1835B4, MSGBOX_AUTOCLOSE end Route3_EventScript_1A9407:: @ 81A9407 @@ -16,12 +16,12 @@ Route3_EventScript_1A9407:: @ 81A9407 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A942E - msgbox Text_1837CF, 6 + msgbox Text_1837CF, MSGBOX_AUTOCLOSE end EventScript_1A942E:: @ 81A942E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_CALVIN, 0, Text_1C1588, Text_1837BD - msgbox Text_1837CF, 6 + msgbox Text_1837CF, MSGBOX_AUTOCLOSE end Route3_EventScript_1A9445:: @ 81A9445 @@ -29,12 +29,12 @@ Route3_EventScript_1A9445:: @ 81A9445 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A946C - msgbox Text_18351C, 6 + msgbox Text_18351C, MSGBOX_AUTOCLOSE end EventScript_1A946C:: @ 81A946C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_COLTON, 0, Text_1C147A, Text_183509 - msgbox Text_18351C, 6 + msgbox Text_18351C, MSGBOX_AUTOCLOSE end Route3_EventScript_1A9483:: @ 81A9483 @@ -42,12 +42,12 @@ Route3_EventScript_1A9483:: @ 81A9483 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A94AA - msgbox Text_1836D9, 6 + msgbox Text_1836D9, MSGBOX_AUTOCLOSE end EventScript_1A94AA:: @ 81A94AA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_GREG, 0, Text_1C1521, Text_1836B3 - msgbox Text_1836D9, 6 + msgbox Text_1836D9, MSGBOX_AUTOCLOSE end Route3_EventScript_1A94C1:: @ 81A94C1 @@ -55,12 +55,12 @@ Route3_EventScript_1A94C1:: @ 81A94C1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A94E8 - msgbox Text_183849, 6 + msgbox Text_183849, MSGBOX_AUTOCLOSE end EventScript_1A94E8:: @ 81A94E8 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_JAMES, 0, Text_1C15C5, Text_183837 - msgbox Text_183849, 6 + msgbox Text_183849, MSGBOX_AUTOCLOSE end Route3_EventScript_1A94FF:: @ 81A94FF @@ -68,12 +68,12 @@ Route3_EventScript_1A94FF:: @ 81A94FF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9526 - msgbox Text_18364C, 6 + msgbox Text_18364C, MSGBOX_AUTOCLOSE end EventScript_1A9526:: @ 81A9526 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_JANICE, 0, Text_1C14F3, Text_18363F - msgbox Text_18364C, 6 + msgbox Text_18364C, MSGBOX_AUTOCLOSE end Route3_EventScript_1A953D:: @ 81A953D @@ -81,12 +81,12 @@ Route3_EventScript_1A953D:: @ 81A953D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9564 - msgbox Text_18374F, 6 + msgbox Text_18374F, MSGBOX_AUTOCLOSE end EventScript_1A9564:: @ 81A9564 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_SALLY, 0, Text_1C155D, Text_183746 - msgbox Text_18374F, 6 + msgbox Text_18374F, MSGBOX_AUTOCLOSE end Route3_EventScript_1A957B:: @ 81A957B @@ -94,12 +94,12 @@ Route3_EventScript_1A957B:: @ 81A957B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A95A2 - msgbox Text_18389C, 6 + msgbox Text_18389C, MSGBOX_AUTOCLOSE end EventScript_1A95A2:: @ 81A95A2 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ROBIN, 0, Text_1C15F9, Text_183891 - msgbox Text_18389C, 6 + msgbox Text_18389C, MSGBOX_AUTOCLOSE end Route4_EventScript_1A95B9:: @ 81A95B9 @@ -107,12 +107,12 @@ Route4_EventScript_1A95B9:: @ 81A95B9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A95E0 - msgbox Text_183957, 6 + msgbox Text_183957, MSGBOX_AUTOCLOSE end EventScript_1A95E0:: @ 81A95E0 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_CRISSY, 0, Text_1C160F, Text_183938 - msgbox Text_183957, 6 + msgbox Text_183957, MSGBOX_AUTOCLOSE end Route24_EventScript_1A95F7:: @ 81A95F7 @@ -120,12 +120,12 @@ Route24_EventScript_1A95F7:: @ 81A95F7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A961E - msgbox Text_188FA7, 6 + msgbox Text_188FA7, MSGBOX_AUTOCLOSE end EventScript_1A961E:: @ 81A961E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_TIMMY, 0, Text_1C3657, Text_188F95 - msgbox Text_188FA7, 6 + msgbox Text_188FA7, MSGBOX_AUTOCLOSE end Route24_EventScript_1A9635:: @ 81A9635 @@ -133,12 +133,12 @@ Route24_EventScript_1A9635:: @ 81A9635 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A965C - msgbox Text_18909E, 6 + msgbox Text_18909E, MSGBOX_AUTOCLOSE end EventScript_1A965C:: @ 81A965C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_CALE, 0, Text_1C36DA, Text_18908C - msgbox Text_18909E, 6 + msgbox Text_18909E, MSGBOX_AUTOCLOSE end Route24_EventScript_1A9673:: @ 81A9673 @@ -146,12 +146,12 @@ Route24_EventScript_1A9673:: @ 81A9673 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A969A - msgbox Text_188F53, 6 + msgbox Text_188F53, MSGBOX_AUTOCLOSE end EventScript_1A969A:: @ 81A969A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_RELI, 0, Text_1C3624, Text_188F46 - msgbox Text_188F53, 6 + msgbox Text_188F53, MSGBOX_AUTOCLOSE end Route24_EventScript_1A96B1:: @ 81A96B1 @@ -159,12 +159,12 @@ Route24_EventScript_1A96B1:: @ 81A96B1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A96D8 - msgbox Text_188FF9, 6 + msgbox Text_188FF9, MSGBOX_AUTOCLOSE end EventScript_1A96D8:: @ 81A96D8 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ALI, 0, Text_1C3685, Text_188FE7 - msgbox Text_188FF9, 6 + msgbox Text_188FF9, MSGBOX_AUTOCLOSE end Route24_EventScript_1A96EF:: @ 81A96EF @@ -172,12 +172,12 @@ Route24_EventScript_1A96EF:: @ 81A96EF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9716 - msgbox Text_188EA3, 6 + msgbox Text_188EA3, MSGBOX_AUTOCLOSE end EventScript_1A9716:: @ 81A9716 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_SHANE, 0, Text_1C35EE, Text_188E94 - msgbox Text_188EA3, 6 + msgbox Text_188EA3, MSGBOX_AUTOCLOSE end Route24_EventScript_1A972D:: @ 81A972D @@ -185,12 +185,12 @@ Route24_EventScript_1A972D:: @ 81A972D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9754 - msgbox Text_188F0A, 6 + msgbox Text_188F0A, MSGBOX_AUTOCLOSE end EventScript_1A9754:: @ 81A9754 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_ETHAN, 0, Text_1C360E, Text_188EFA - msgbox Text_188F0A, 6 + msgbox Text_188F0A, MSGBOX_AUTOCLOSE end Route25_EventScript_1A976B:: @ 81A976B @@ -198,12 +198,12 @@ Route25_EventScript_1A976B:: @ 81A976B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9792 - msgbox Text_1890F5, 6 + msgbox Text_1890F5, MSGBOX_AUTOCLOSE end EventScript_1A9792:: @ 81A9792 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_JOEY, 0, Text_1C33E7, Text_1890E6 - msgbox Text_1890F5, 6 + msgbox Text_1890F5, MSGBOX_AUTOCLOSE end Route25_EventScript_1A97A9:: @ 81A97A9 @@ -211,12 +211,12 @@ Route25_EventScript_1A97A9:: @ 81A97A9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A97D0 - msgbox Text_1891B3, 6 + msgbox Text_1891B3, MSGBOX_AUTOCLOSE end EventScript_1A97D0:: @ 81A97D0 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DAN, 0, Text_1C3404, Text_1891A6 - msgbox Text_1891B3, 6 + msgbox Text_1891B3, MSGBOX_AUTOCLOSE end Route25_EventScript_1A97E7:: @ 81A97E7 @@ -224,12 +224,12 @@ Route25_EventScript_1A97E7:: @ 81A97E7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A980E - msgbox Text_1892EF, 6 + msgbox Text_1892EF, MSGBOX_AUTOCLOSE end EventScript_1A980E:: @ 81A980E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_CHAD, 0, Text_1C34D4, Text_1892D9 - msgbox Text_1892EF, 6 + msgbox Text_1892EF, MSGBOX_AUTOCLOSE end Route25_EventScript_1A9825:: @ 81A9825 @@ -237,12 +237,12 @@ Route25_EventScript_1A9825:: @ 81A9825 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A984C - msgbox Text_189281, 6 + msgbox Text_189281, MSGBOX_AUTOCLOSE end EventScript_1A984C:: @ 81A984C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_KELSEY, 0, Text_1C349C, Text_189261 - msgbox Text_189281, 6 + msgbox Text_189281, MSGBOX_AUTOCLOSE end Route25_EventScript_1A9863:: @ 81A9863 @@ -250,12 +250,12 @@ Route25_EventScript_1A9863:: @ 81A9863 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A988A - msgbox Text_189378, 6 + msgbox Text_189378, MSGBOX_AUTOCLOSE end EventScript_1A988A:: @ 81A988A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_HALEY, 0, Text_1C350A, Text_189364 - msgbox Text_189378, 6 + msgbox Text_189378, MSGBOX_AUTOCLOSE end Route25_EventScript_1A98A1:: @ 81A98A1 @@ -263,12 +263,12 @@ Route25_EventScript_1A98A1:: @ 81A98A1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A98C8 - msgbox Text_1893FB, 6 + msgbox Text_1893FB, MSGBOX_AUTOCLOSE end EventScript_1A98C8:: @ 81A98C8 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_FRANKLIN, 0, Text_1C353B, Text_1893EA - msgbox Text_1893FB, 6 + msgbox Text_1893FB, MSGBOX_AUTOCLOSE end Route25_EventScript_1A98DF:: @ 81A98DF @@ -276,12 +276,12 @@ Route25_EventScript_1A98DF:: @ 81A98DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9906 - msgbox Text_18947E, 6 + msgbox Text_18947E, MSGBOX_AUTOCLOSE end EventScript_1A9906:: @ 81A9906 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_NOB, 0, Text_1C357E, Text_189459 - msgbox Text_18947E, 6 + msgbox Text_18947E, MSGBOX_AUTOCLOSE end Route25_EventScript_1A991D:: @ 81A991D @@ -289,12 +289,12 @@ Route25_EventScript_1A991D:: @ 81A991D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9944 - msgbox Text_18951C, 6 + msgbox Text_18951C, MSGBOX_AUTOCLOSE end EventScript_1A9944:: @ 81A9944 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_WAYNE, 0, Text_1C35BC, Text_18950A - msgbox Text_18951C, 6 + msgbox Text_18951C, MSGBOX_AUTOCLOSE end Route25_EventScript_1A995B:: @ 81A995B @@ -302,12 +302,12 @@ Route25_EventScript_1A995B:: @ 81A995B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9982 - msgbox Text_18921D, 6 + msgbox Text_18921D, MSGBOX_AUTOCLOSE end EventScript_1A9982:: @ 81A9982 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_FLINT, 0, Text_1C3445, Text_189212 - msgbox Text_18921D, 6 + msgbox Text_18921D, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9999:: @ 81A9999 @@ -315,12 +315,12 @@ Route6_EventScript_1A9999:: @ 81A9999 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A99C0 - msgbox Text_183ED4, 6 + msgbox Text_183ED4, MSGBOX_AUTOCLOSE end EventScript_1A99C0:: @ 81A99C0 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_KEIGO, 0, Text_1C16E2, Text_183EC0 - msgbox Text_183ED4, 6 + msgbox Text_183ED4, MSGBOX_AUTOCLOSE end Route6_EventScript_1A99D7:: @ 81A99D7 @@ -328,12 +328,12 @@ Route6_EventScript_1A99D7:: @ 81A99D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A99FE - msgbox Text_18402B, 6 + msgbox Text_18402B, MSGBOX_AUTOCLOSE end EventScript_1A99FE:: @ 81A99FE trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_1C176B, Text_18401A - msgbox Text_18402B, 6 + msgbox Text_18402B, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9A15:: @ 81A9A15 @@ -341,12 +341,12 @@ Route6_EventScript_1A9A15:: @ 81A9A15 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9A3C - msgbox Text_183E3C, 6 + msgbox Text_183E3C, MSGBOX_AUTOCLOSE end EventScript_1A9A3C:: @ 81A9A3C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_RICKY, 0, Text_1C163C, Text_183E2A - msgbox Text_183E3C, 6 + msgbox Text_183E3C, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9A53:: @ 81A9A53 @@ -354,12 +354,12 @@ Route6_EventScript_1A9A53:: @ 81A9A53 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9A7A - msgbox Text_183F51, 6 + msgbox Text_183F51, MSGBOX_AUTOCLOSE end EventScript_1A9A7A:: @ 81A9A7A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_JEFF, 0, Text_1C1723, Text_183F24 - msgbox Text_183F51, 6 + msgbox Text_183F51, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9A91:: @ 81A9A91 @@ -367,12 +367,12 @@ Route6_EventScript_1A9A91:: @ 81A9A91 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9AB8 - msgbox Text_183E8D, 6 + msgbox Text_183E8D, MSGBOX_AUTOCLOSE end EventScript_1A9AB8:: @ 81A9AB8 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_NANCY, 0, Text_1C166D, Text_183E79 - msgbox Text_183E8D, 6 + msgbox Text_183E8D, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9ACF:: @ 81A9ACF @@ -380,12 +380,12 @@ Route6_EventScript_1A9ACF:: @ 81A9ACF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9AF6 - msgbox Text_183FC4, 6 + msgbox Text_183FC4, MSGBOX_AUTOCLOSE end EventScript_1A9AF6:: @ 81A9AF6 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ISABELLE, 0, Text_1C1746, Text_183FAB - msgbox Text_183FC4, 6 + msgbox Text_183FC4, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9B0D:: @ 81A9B0D @@ -393,12 +393,12 @@ Route11_EventScript_1A9B0D:: @ 81A9B0D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9B34 - msgbox Text_184FEF, 6 + msgbox Text_184FEF, MSGBOX_AUTOCLOSE end EventScript_1A9B34:: @ 81A9B34 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_EDDIE, 0, Text_1C1DB5, Text_184FD8 - msgbox Text_184FEF, 6 + msgbox Text_184FEF, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9B4B:: @ 81A9B4B @@ -406,12 +406,12 @@ Route11_EventScript_1A9B4B:: @ 81A9B4B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9B72 - msgbox Text_1850CF, 6 + msgbox Text_1850CF, MSGBOX_AUTOCLOSE end EventScript_1A9B72:: @ 81A9B72 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DILLON, 0, Text_1C1E1F, Text_18509B - msgbox Text_1850CF, 6 + msgbox Text_1850CF, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9B89:: @ 81A9B89 @@ -419,12 +419,12 @@ Route11_EventScript_1A9B89:: @ 81A9B89 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9BB0 - msgbox Text_1851D2, 6 + msgbox Text_1851D2, MSGBOX_AUTOCLOSE end EventScript_1A9BB0:: @ 81A9BB0 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_YASU, 0, Text_1C1EE2, Text_1851AC - msgbox Text_1851D2, 6 + msgbox Text_1851D2, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9BC7:: @ 81A9BC7 @@ -432,12 +432,12 @@ Route11_EventScript_1A9BC7:: @ 81A9BC7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9BEE - msgbox Text_1852E3, 6 + msgbox Text_1852E3, MSGBOX_AUTOCLOSE end EventScript_1A9BEE:: @ 81A9BEE trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DAVE, 0, Text_1C1F40, Text_1852C1 - msgbox Text_1852E3, 6 + msgbox Text_1852E3, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9C05:: @ 81A9C05 @@ -445,12 +445,12 @@ Route11_EventScript_1A9C05:: @ 81A9C05 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9C2C - msgbox Text_18504A, 6 + msgbox Text_18504A, MSGBOX_AUTOCLOSE end EventScript_1A9C2C:: @ 81A9C2C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ENGINEER_BRAXTON, 0, Text_1C1DE1, Text_185037 - msgbox Text_18504A, 6 + msgbox Text_18504A, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9C43:: @ 81A9C43 @@ -458,12 +458,12 @@ Route11_EventScript_1A9C43:: @ 81A9C43 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9C6A - msgbox Text_185266, 6 + msgbox Text_185266, MSGBOX_AUTOCLOSE end EventScript_1A9C6A:: @ 81A9C6A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ENGINEER_BERNIE, 0, Text_1C1F1D, Text_185250 - msgbox Text_185266, 6 + msgbox Text_185266, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9C81:: @ 81A9C81 @@ -471,12 +471,12 @@ Route11_EventScript_1A9C81:: @ 81A9C81 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9CA8 - msgbox Text_184F2E, 6 + msgbox Text_184F2E, MSGBOX_AUTOCLOSE end EventScript_1A9CA8:: @ 81A9CA8 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_HUGO, 0, Text_1C1D50, Text_184F15 - msgbox Text_184F2E, 6 + msgbox Text_184F2E, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9CBF:: @ 81A9CBF @@ -484,12 +484,12 @@ Route11_EventScript_1A9CBF:: @ 81A9CBF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9CE6 - msgbox Text_184F8E, 6 + msgbox Text_184F8E, MSGBOX_AUTOCLOSE end EventScript_1A9CE6:: @ 81A9CE6 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_JASPER, 0, Text_1C1D79, Text_184F7E - msgbox Text_184F8E, 6 + msgbox Text_184F8E, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9CFD:: @ 81A9CFD @@ -497,12 +497,12 @@ Route11_EventScript_1A9CFD:: @ 81A9CFD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9D24 - msgbox Text_185114, 6 + msgbox Text_185114, MSGBOX_AUTOCLOSE end EventScript_1A9D24:: @ 81A9D24 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_DIRK, 0, Text_1C1E57, Text_185105 - msgbox Text_185114, 6 + msgbox Text_185114, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9D3B:: @ 81A9D3B @@ -510,12 +510,12 @@ Route11_EventScript_1A9D3B:: @ 81A9D3B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9D62 - msgbox Text_185161, 6 + msgbox Text_185161, MSGBOX_AUTOCLOSE end EventScript_1A9D62:: @ 81A9D62 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_DARIAN, 0, Text_1C1E9F, Text_18514E - msgbox Text_185161, 6 + msgbox Text_185161, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9D79:: @ 81A9D79 @@ -523,12 +523,12 @@ Route9_EventScript_1A9D79:: @ 81A9D79 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9DA0 - msgbox Text_184A8C, 6 + msgbox Text_184A8C, MSGBOX_AUTOCLOSE end EventScript_1A9DA0:: @ 81A9DA0 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_BRENT, 0, Text_1C1B83, Text_184A6A - msgbox Text_184A8C, 6 + msgbox Text_184A8C, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9DB7:: @ 81A9DB7 @@ -536,12 +536,12 @@ Route9_EventScript_1A9DB7:: @ 81A9DB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9DDE - msgbox Text_184B3B, 6 + msgbox Text_184B3B, MSGBOX_AUTOCLOSE end EventScript_1A9DDE:: @ 81A9DDE trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_CONNER, 0, Text_1C1BDC, Text_184B32 - msgbox Text_184B3B, 6 + msgbox Text_184B3B, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9DF5:: @ 81A9DF5 @@ -549,12 +549,12 @@ Route9_EventScript_1A9DF5:: @ 81A9DF5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9E1C - msgbox Text_184890, 6 + msgbox Text_184890, MSGBOX_AUTOCLOSE end EventScript_1A9E1C:: @ 81A9E1C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_CHRIS, 0, Text_1C1A5D, Text_18487E - msgbox Text_184890, 6 + msgbox Text_184890, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9E33:: @ 81A9E33 @@ -562,12 +562,12 @@ Route9_EventScript_1A9E33:: @ 81A9E33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9E5A - msgbox Text_1848DE, 6 + msgbox Text_1848DE, MSGBOX_AUTOCLOSE end EventScript_1A9E5A:: @ 81A9E5A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_DREW, 0, Text_1C1A9B, Text_1848CC - msgbox Text_1848DE, 6 + msgbox Text_1848DE, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9E71:: @ 81A9E71 @@ -575,12 +575,12 @@ Route9_EventScript_1A9E71:: @ 81A9E71 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9E98 - msgbox Text_1847F0, 6 + msgbox Text_1847F0, MSGBOX_AUTOCLOSE end EventScript_1A9E98:: @ 81A9E98 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ALICIA, 0, Text_1C1A2E, Text_1847DF - msgbox Text_1847F0, 6 + msgbox Text_1847F0, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9EAF:: @ 81A9EAF @@ -588,12 +588,12 @@ Route9_EventScript_1A9EAF:: @ 81A9EAF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9ED6 - msgbox Text_184931, 6 + msgbox Text_184931, MSGBOX_AUTOCLOSE end EventScript_1A9ED6:: @ 81A9ED6 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CAITLIN, 0, Text_1C1AFB, Text_18491C - msgbox Text_184931, 6 + msgbox Text_184931, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9EED:: @ 81A9EED @@ -601,12 +601,12 @@ Route9_EventScript_1A9EED:: @ 81A9EED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9F14 - msgbox Text_184AF1, 6 + msgbox Text_184AF1, MSGBOX_AUTOCLOSE end EventScript_1A9F14:: @ 81A9F14 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_ALAN, 0, Text_1C1BBE, Text_184AD5 - msgbox Text_184AF1, 6 + msgbox Text_184AF1, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9F2B:: @ 81A9F2B @@ -614,12 +614,12 @@ Route9_EventScript_1A9F2B:: @ 81A9F2B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9F52 - msgbox Text_184A11, 6 + msgbox Text_184A11, MSGBOX_AUTOCLOSE end EventScript_1A9F52:: @ 81A9F52 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_BRICE, 0, Text_1C1B5E, Text_184A04 - msgbox Text_184A11, 6 + msgbox Text_184A11, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9F69:: @ 81A9F69 @@ -627,12 +627,12 @@ Route9_EventScript_1A9F69:: @ 81A9F69 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9F90 - msgbox Text_1849B0, 6 + msgbox Text_1849B0, MSGBOX_AUTOCLOSE end EventScript_1A9F90:: @ 81A9F90 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_JEREMY, 0, Text_1C1B37, Text_18497F - msgbox Text_1849B0, 6 + msgbox Text_1849B0, MSGBOX_AUTOCLOSE end Route10_EventScript_1A9FA7:: @ 81A9FA7 @@ -640,12 +640,12 @@ Route10_EventScript_1A9FA7:: @ 81A9FA7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1A9FCE - msgbox Text_184D4D, 6 + msgbox Text_184D4D, MSGBOX_AUTOCLOSE end EventScript_1A9FCE:: @ 81A9FCE trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_HEIDI, 0, Text_1C1C9A, Text_184D31 - msgbox Text_184D4D, 6 + msgbox Text_184D4D, MSGBOX_AUTOCLOSE end Route10_EventScript_1A9FE5:: @ 81A9FE5 @@ -653,12 +653,12 @@ Route10_EventScript_1A9FE5:: @ 81A9FE5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA00C - msgbox Text_184E5E, 6 + msgbox Text_184E5E, MSGBOX_AUTOCLOSE end EventScript_1AA00C:: @ 81AA00C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CAROL, 0, Text_1C1D14, Text_184E3B - msgbox Text_184E5E, 6 + msgbox Text_184E5E, MSGBOX_AUTOCLOSE end Route10_EventScript_1AA023:: @ 81AA023 @@ -666,12 +666,12 @@ Route10_EventScript_1AA023:: @ 81AA023 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA04A - msgbox Text_184BFB, 6 + msgbox Text_184BFB, MSGBOX_AUTOCLOSE end EventScript_1AA04A:: @ 81AA04A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_MARK, 0, Text_1C1BFA, Text_184BE5 - msgbox Text_184BFB, 6 + msgbox Text_184BFB, MSGBOX_AUTOCLOSE end Route10_EventScript_1AA061:: @ 81AA061 @@ -679,12 +679,12 @@ Route10_EventScript_1AA061:: @ 81AA061 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA088 - msgbox Text_184CBB, 6 + msgbox Text_184CBB, MSGBOX_AUTOCLOSE end EventScript_1AA088:: @ 81AA088 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_HERMAN, 0, Text_1C1C76, Text_184CA7 - msgbox Text_184CBB, 6 + msgbox Text_184CBB, MSGBOX_AUTOCLOSE end Route10_EventScript_1AA09F:: @ 81AA09F @@ -692,12 +692,12 @@ Route10_EventScript_1AA09F:: @ 81AA09F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA0C6 - msgbox Text_184C60, 6 + msgbox Text_184C60, MSGBOX_AUTOCLOSE end EventScript_1AA0C6:: @ 81AA0C6 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_CLARK, 0, Text_1C1C4F, Text_184C2D - msgbox Text_184C60, 6 + msgbox Text_184C60, MSGBOX_AUTOCLOSE end Route10_EventScript_1AA0DD:: @ 81AA0DD @@ -705,12 +705,12 @@ Route10_EventScript_1AA0DD:: @ 81AA0DD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA104 - msgbox Text_184DE4, 6 + msgbox Text_184DE4, MSGBOX_AUTOCLOSE end EventScript_1AA104:: @ 81AA104 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_TRENT, 0, Text_1C1CD3, Text_184DCE - msgbox Text_184DE4, 6 + msgbox Text_184DE4, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA11B:: @ 81AA11B @@ -718,12 +718,12 @@ Route8_EventScript_1AA11B:: @ 81AA11B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA142 - msgbox Text_18421B, 6 + msgbox Text_18421B, MSGBOX_AUTOCLOSE end EventScript_1AA142:: @ 81AA142 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_PAIGE, 0, Text_1C1834, Text_184210 - msgbox Text_18421B, 6 + msgbox Text_18421B, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA159:: @ 81AA159 @@ -731,12 +731,12 @@ Route8_EventScript_1AA159:: @ 81AA159 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA180 - msgbox Text_184350, 6 + msgbox Text_184350, MSGBOX_AUTOCLOSE end EventScript_1AA180:: @ 81AA180 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ANDREA, 0, Text_1C18AA, Text_184346 - msgbox Text_184350, 6 + msgbox Text_184350, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA197:: @ 81AA197 @@ -744,12 +744,12 @@ Route8_EventScript_1AA197:: @ 81AA197 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA1BE - msgbox Text_1843D2, 6 + msgbox Text_1843D2, MSGBOX_AUTOCLOSE end EventScript_1AA1BE:: @ 81AA1BE trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_MEGAN, 0, Text_1C18DC, Text_1843A6 - msgbox Text_1843D2, 6 + msgbox Text_1843D2, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA1D5:: @ 81AA1D5 @@ -757,12 +757,12 @@ Route8_EventScript_1AA1D5:: @ 81AA1D5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA1FC - msgbox Text_1844FD, 6 + msgbox Text_1844FD, MSGBOX_AUTOCLOSE end EventScript_1AA1FC:: @ 81AA1FC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_JULIA, 0, Text_1C1955, Text_1844D6 - msgbox Text_1844FD, 6 + msgbox Text_1844FD, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA213:: @ 81AA213 @@ -770,12 +770,12 @@ Route8_EventScript_1AA213:: @ 81AA213 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA23A - msgbox Text_18410E, 6 + msgbox Text_18410E, MSGBOX_AUTOCLOSE end EventScript_1AA23A:: @ 81AA23A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_AIDAN, 0, Text_1C1793, Text_184100 - msgbox Text_18410E, 6 + msgbox Text_18410E, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA251:: @ 81AA251 @@ -783,12 +783,12 @@ Route8_EventScript_1AA251:: @ 81AA251 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA278 - msgbox Text_1841C8, 6 + msgbox Text_1841C8, MSGBOX_AUTOCLOSE end EventScript_1AA278:: @ 81AA278 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_GLENN, 0, Text_1C17F1, Text_1841B6 - msgbox Text_1841C8, 6 + msgbox Text_1841C8, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA28F:: @ 81AA28F @@ -796,12 +796,12 @@ Route8_EventScript_1AA28F:: @ 81AA28F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA2B6 - msgbox Text_1842B3, 6 + msgbox Text_1842B3, MSGBOX_AUTOCLOSE end EventScript_1AA2B6:: @ 81AA2B6 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_LESLIE, 0, Text_1C1873, Text_18427A - msgbox Text_1842B3, 6 + msgbox Text_1842B3, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA2CD:: @ 81AA2CD @@ -809,12 +809,12 @@ Route8_EventScript_1AA2CD:: @ 81AA2CD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA2F4 - msgbox Text_184162, 6 + msgbox Text_184162, MSGBOX_AUTOCLOSE end EventScript_1AA2F4:: @ 81AA2F4 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_STAN, 0, Text_1C17CD, Text_18414D - msgbox Text_184162, 6 + msgbox Text_184162, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA30B:: @ 81AA30B @@ -822,12 +822,12 @@ Route8_EventScript_1AA30B:: @ 81AA30B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA332 - msgbox Text_184466, 6 + msgbox Text_184466, MSGBOX_AUTOCLOSE end EventScript_1AA332:: @ 81AA332 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_RICH, 0, Text_1C191F, Text_18444F - msgbox Text_184466, 6 + msgbox Text_184466, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA349:: @ 81AA349 @@ -835,12 +835,12 @@ Route8_EventScript_1AA349:: @ 81AA349 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA374 - msgbox Text_1845F2, 6 + msgbox Text_1845F2, MSGBOX_AUTOCLOSE end EventScript_1AA374:: @ 81AA374 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1C19E5, Text_1845D0, Text_184616 - msgbox Text_1845F2, 6 + msgbox Text_1845F2, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA38F:: @ 81AA38F @@ -848,12 +848,12 @@ Route8_EventScript_1AA38F:: @ 81AA38F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA3BA - msgbox Text_18468B, 6 + msgbox Text_18468B, MSGBOX_AUTOCLOSE end EventScript_1AA3BA:: @ 81AA3BA trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1C1A0D, Text_184675, Text_1846AF - msgbox Text_18468B, 6 + msgbox Text_18468B, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA3D5:: @ 81AA3D5 @@ -861,12 +861,12 @@ Route8_EventScript_1AA3D5:: @ 81AA3D5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA3FC - msgbox Text_184719, 6 + msgbox Text_184719, MSGBOX_AUTOCLOSE end EventScript_1AA3FC:: @ 81AA3FC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_RICARDO, 0, Text_1C199C, Text_1846FC - msgbox Text_184719, 6 + msgbox Text_184719, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA413:: @ 81AA413 @@ -874,12 +874,12 @@ Route8_EventScript_1AA413:: @ 81AA413 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA43A - msgbox Text_18477A, 6 + msgbox Text_18477A, MSGBOX_AUTOCLOSE end EventScript_1AA43A:: @ 81AA43A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JAREN, 0, Text_1C19BC, Text_184767 - msgbox Text_18477A, 6 + msgbox Text_18477A, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA451:: @ 81AA451 @@ -887,12 +887,12 @@ Route12_EventScript_1AA451:: @ 81AA451 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA478 - msgbox Text_185432, 6 + msgbox Text_185432, MSGBOX_AUTOCLOSE end EventScript_1AA478:: @ 81AA478 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_NED, 0, Text_1C1F9D, Text_18541B - msgbox Text_185432, 6 + msgbox Text_185432, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA48F:: @ 81AA48F @@ -900,12 +900,12 @@ Route12_EventScript_1AA48F:: @ 81AA48F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA4B6 - msgbox Text_185488, 6 + msgbox Text_185488, MSGBOX_AUTOCLOSE end EventScript_1AA4B6:: @ 81AA4B6 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_CHIP, 0, Text_1C1FD8, Text_185475 - msgbox Text_185488, 6 + msgbox Text_185488, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA4CD:: @ 81AA4CD @@ -913,12 +913,12 @@ Route12_EventScript_1AA4CD:: @ 81AA4CD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA4F4 - msgbox Text_185616, 6 + msgbox Text_185616, MSGBOX_AUTOCLOSE end EventScript_1AA4F4:: @ 81AA4F4 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_HANK, 0, Text_1C209C, Text_185606 - msgbox Text_185616, 6 + msgbox Text_185616, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA50B:: @ 81AA50B @@ -926,12 +926,12 @@ Route12_EventScript_1AA50B:: @ 81AA50B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA532 - msgbox Text_1856DF, 6 + msgbox Text_1856DF, MSGBOX_AUTOCLOSE end EventScript_1AA532:: @ 81AA532 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_ELLIOT, 0, Text_1C20D4, Text_1856D0 - msgbox Text_1856DF, 6 + msgbox Text_1856DF, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA549:: @ 81AA549 @@ -939,12 +939,12 @@ Route12_EventScript_1AA549:: @ 81AA549 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA570 - msgbox Text_18574D, 6 + msgbox Text_18574D, MSGBOX_AUTOCLOSE end EventScript_1AA570:: @ 81AA570 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_ANDREW, 0, Text_1C2134, Text_185744 - msgbox Text_18574D, 6 + msgbox Text_18574D, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA587:: @ 81AA587 @@ -952,12 +952,12 @@ Route12_EventScript_1AA587:: @ 81AA587 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA5AE - msgbox Text_1855A6, 6 + msgbox Text_1855A6, MSGBOX_AUTOCLOSE end EventScript_1AA5AE:: @ 81AA5AE trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ROCKER_LUCA, 0, Text_1C203B, Text_18559B - msgbox Text_1855A6, 6 + msgbox Text_1855A6, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA5C5:: @ 81AA5C5 @@ -965,12 +965,12 @@ Route12_EventScript_1AA5C5:: @ 81AA5C5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA5EC - msgbox Text_1854F2, 6 + msgbox Text_1854F2, MSGBOX_AUTOCLOSE end EventScript_1AA5EC:: @ 81AA5EC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_JUSTIN, 0, Text_1C2008, Text_1854ED - msgbox Text_1854F2, 6 + msgbox Text_1854F2, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA603:: @ 81AA603 @@ -978,12 +978,12 @@ Route12_EventScript_1AA603:: @ 81AA603 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA62E - msgbox Text_18581F, 6 + msgbox Text_18581F, MSGBOX_AUTOCLOSE end EventScript_1AA62E:: @ 81AA62E trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C216B, Text_1857F1, Text_185842 - msgbox Text_18581F, 6 + msgbox Text_18581F, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA649:: @ 81AA649 @@ -991,12 +991,12 @@ Route12_EventScript_1AA649:: @ 81AA649 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA674 - msgbox Text_1858E2, 6 + msgbox Text_1858E2, MSGBOX_AUTOCLOSE end EventScript_1AA674:: @ 81AA674 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C219B, Text_1858D0, Text_185908 - msgbox Text_1858E2, 6 + msgbox Text_1858E2, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA68F:: @ 81AA68F @@ -1004,12 +1004,12 @@ Route13_EventScript_1AA68F:: @ 81AA68F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA6B6 - msgbox Text_185D33, 6 + msgbox Text_185D33, MSGBOX_AUTOCLOSE end EventScript_1AA6B6:: @ 81AA6B6 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JARED, 0, Text_1C236B, Text_185D1D - msgbox Text_185D33, 6 + msgbox Text_185D33, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA6CD:: @ 81AA6CD @@ -1017,12 +1017,12 @@ Route13_EventScript_1AA6CD:: @ 81AA6CD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA6F4 - msgbox Text_185C35, 6 + msgbox Text_185C35, MSGBOX_AUTOCLOSE end EventScript_1AA6F4:: @ 81AA6F4 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_LOLA, 0, Text_1C2306, Text_185C1F - msgbox Text_185C35, 6 + msgbox Text_185C35, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA70B:: @ 81AA70B @@ -1030,12 +1030,12 @@ Route13_EventScript_1AA70B:: @ 81AA70B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA732 - msgbox Text_185CA8, 6 + msgbox Text_185CA8, MSGBOX_AUTOCLOSE end EventScript_1AA732:: @ 81AA732 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_SHEILA, 0, Text_1C2340, Text_185C95 - msgbox Text_185CA8, 6 + msgbox Text_185CA8, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA749:: @ 81AA749 @@ -1043,12 +1043,12 @@ Route13_EventScript_1AA749:: @ 81AA749 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA770 - msgbox Text_1859A2, 6 + msgbox Text_1859A2, MSGBOX_AUTOCLOSE end EventScript_1AA770:: @ 81AA770 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_1C21EE, Text_18597E - msgbox Text_1859A2, 6 + msgbox Text_1859A2, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA787:: @ 81AA787 @@ -1056,12 +1056,12 @@ Route13_EventScript_1AA787:: @ 81AA787 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA7AE - msgbox Text_185BDB, 6 + msgbox Text_185BDB, MSGBOX_AUTOCLOSE end EventScript_1AA7AE:: @ 81AA7AE trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_PERRY, 0, Text_1C22CA, Text_185BCA - msgbox Text_185BDB, 6 + msgbox Text_185BDB, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA7C5:: @ 81AA7C5 @@ -1069,12 +1069,12 @@ Route13_EventScript_1AA7C5:: @ 81AA7C5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA7EC - msgbox Text_185D89, 6 + msgbox Text_185D89, MSGBOX_AUTOCLOSE end EventScript_1AA7EC:: @ 81AA7EC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_1C2383, Text_185D7B - msgbox Text_185D89, 6 + msgbox Text_185D89, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA803:: @ 81AA803 @@ -1082,12 +1082,12 @@ Route13_EventScript_1AA803:: @ 81AA803 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA82A - msgbox Text_185B67, 6 + msgbox Text_185B67, MSGBOX_AUTOCLOSE end EventScript_1AA82A:: @ 81AA82A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ALMA, 0, Text_1C2299, Text_185B48 - msgbox Text_185B67, 6 + msgbox Text_185B67, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA841:: @ 81AA841 @@ -1095,12 +1095,12 @@ Route13_EventScript_1AA841:: @ 81AA841 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA868 - msgbox Text_1859F9, 6 + msgbox Text_1859F9, MSGBOX_AUTOCLOSE end EventScript_1AA868:: @ 81AA868 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_SUSIE, 0, Text_1C220C, Text_1859EC - msgbox Text_1859F9, 6 + msgbox Text_1859F9, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA87F:: @ 81AA87F @@ -1108,12 +1108,12 @@ Route13_EventScript_1AA87F:: @ 81AA87F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA8A6 - msgbox Text_185A62, 6 + msgbox Text_185A62, MSGBOX_AUTOCLOSE end EventScript_1AA8A6:: @ 81AA8A6 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_VALERIE, 0, Text_1C223C, Text_185A56 - msgbox Text_185A62, 6 + msgbox Text_185A62, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA8BD:: @ 81AA8BD @@ -1121,12 +1121,12 @@ Route13_EventScript_1AA8BD:: @ 81AA8BD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA8E4 - msgbox Text_185ADE, 6 + msgbox Text_185ADE, MSGBOX_AUTOCLOSE end EventScript_1AA8E4:: @ 81AA8E4 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_GWEN, 0, Text_1C225B, Text_185AC1 - msgbox Text_185ADE, 6 + msgbox Text_185ADE, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA8FB:: @ 81AA8FB @@ -1134,12 +1134,12 @@ Route14_EventScript_1AA8FB:: @ 81AA8FB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA922 - msgbox Text_18636E, 6 + msgbox Text_18636E, MSGBOX_AUTOCLOSE end EventScript_1AA922:: @ 81AA922 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_MALIK, 0, Text_1C25D6, Text_186362 - msgbox Text_18636E, 6 + msgbox Text_18636E, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA939:: @ 81AA939 @@ -1147,12 +1147,12 @@ Route14_EventScript_1AA939:: @ 81AA939 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA960 - msgbox Text_186239, 6 + msgbox Text_186239, MSGBOX_AUTOCLOSE end EventScript_1AA960:: @ 81AA960 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_LUKAS, 0, Text_1C2531, Text_186223 - msgbox Text_186239, 6 + msgbox Text_186239, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA977:: @ 81AA977 @@ -1160,12 +1160,12 @@ Route14_EventScript_1AA977:: @ 81AA977 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA99E - msgbox Text_18629D, 6 + msgbox Text_18629D, MSGBOX_AUTOCLOSE end EventScript_1AA99E:: @ 81AA99E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ISAAC, 0, Text_1C2572, Text_186291 - msgbox Text_18629D, 6 + msgbox Text_18629D, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA9B5:: @ 81AA9B5 @@ -1173,12 +1173,12 @@ Route14_EventScript_1AA9B5:: @ 81AA9B5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AA9DC - msgbox Text_1862F8, 6 + msgbox Text_1862F8, MSGBOX_AUTOCLOSE end EventScript_1AA9DC:: @ 81AA9DC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_GERALD, 0, Text_1C259E, Text_1862EF - msgbox Text_1862F8, 6 + msgbox Text_1862F8, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA9F3:: @ 81AA9F3 @@ -1186,12 +1186,12 @@ Route14_EventScript_1AA9F3:: @ 81AA9F3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAA1A - msgbox Text_18611D, 6 + msgbox Text_18611D, MSGBOX_AUTOCLOSE end EventScript_1AAA1A:: @ 81AAA1A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1C24CB, Text_18610A - msgbox Text_18611D, 6 + msgbox Text_18611D, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAA31:: @ 81AAA31 @@ -1199,12 +1199,12 @@ Route14_EventScript_1AAA31:: @ 81AAA31 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAA58 - msgbox Text_1861BE, 6 + msgbox Text_1861BE, MSGBOX_AUTOCLOSE end EventScript_1AAA58:: @ 81AAA58 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_BENNY, 0, Text_1C2505, Text_1861B3 - msgbox Text_1861BE, 6 + msgbox Text_1861BE, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAA6F:: @ 81AAA6F @@ -1212,12 +1212,12 @@ Route14_EventScript_1AAA6F:: @ 81AAA6F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAA96 - msgbox Text_185E9C, 6 + msgbox Text_185E9C, MSGBOX_AUTOCLOSE end EventScript_1AAA96:: @ 81AAA96 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CARTER, 0, Text_1C23C1, Text_185E81 - msgbox Text_185E9C, 6 + msgbox Text_185E9C, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAAAD:: @ 81AAAAD @@ -1225,12 +1225,12 @@ Route14_EventScript_1AAAAD:: @ 81AAAAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAAD4 - msgbox Text_185F1A, 6 + msgbox Text_185F1A, MSGBOX_AUTOCLOSE end EventScript_1AAAD4:: @ 81AAAD4 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MITCH, 0, Text_1C23EF, Text_185F0B - msgbox Text_185F1A, 6 + msgbox Text_185F1A, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAAEB:: @ 81AAAEB @@ -1238,12 +1238,12 @@ Route14_EventScript_1AAAEB:: @ 81AAAEB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAB12 - msgbox Text_185FBB, 6 + msgbox Text_185FBB, MSGBOX_AUTOCLOSE end EventScript_1AAB12:: @ 81AAB12 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_BECK, 0, Text_1C2425, Text_185FAE - msgbox Text_185FBB, 6 + msgbox Text_185FBB, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAB29:: @ 81AAB29 @@ -1251,12 +1251,12 @@ Route14_EventScript_1AAB29:: @ 81AAB29 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAB50 - msgbox Text_186091, 6 + msgbox Text_186091, MSGBOX_AUTOCLOSE end EventScript_1AAB50:: @ 81AAB50 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MARLON, 0, Text_1C2461, Text_18607C - msgbox Text_186091, 6 + msgbox Text_186091, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAB67:: @ 81AAB67 @@ -1264,12 +1264,12 @@ Route14_EventScript_1AAB67:: @ 81AAB67 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAB92 - msgbox Text_18640D, 6 + msgbox Text_18640D, MSGBOX_AUTOCLOSE end EventScript_1AAB92:: @ 81AAB92 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1C25FB, Text_1863EA, Text_18642E - msgbox Text_18640D, 6 + msgbox Text_18640D, MSGBOX_AUTOCLOSE end Route14_EventScript_1AABAD:: @ 81AABAD @@ -1277,12 +1277,12 @@ Route14_EventScript_1AABAD:: @ 81AABAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AABD8 - msgbox Text_18649C, 6 + msgbox Text_18649C, MSGBOX_AUTOCLOSE end EventScript_1AABD8:: @ 81AABD8 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1C261B, Text_186487, Text_1864D3 - msgbox Text_18649C, 6 + msgbox Text_18649C, MSGBOX_AUTOCLOSE end Route15_EventScript_1AABF3:: @ 81AABF3 @@ -1290,12 +1290,12 @@ Route15_EventScript_1AABF3:: @ 81AABF3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAC1A - msgbox Text_1868F1, 6 + msgbox Text_1868F1, MSGBOX_AUTOCLOSE end EventScript_1AAC1A:: @ 81AAC1A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ERNEST, 0, Text_1C27E7, Text_1868E8 - msgbox Text_1868F1, 6 + msgbox Text_1868F1, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAC31:: @ 81AAC31 @@ -1303,12 +1303,12 @@ Route15_EventScript_1AAC31:: @ 81AAC31 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAC58 - msgbox Text_18697C, 6 + msgbox Text_18697C, MSGBOX_AUTOCLOSE end EventScript_1AAC58:: @ 81AAC58 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ALEX, 0, Text_1C2814, Text_186968 - msgbox Text_18697C, 6 + msgbox Text_18697C, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAC6F:: @ 81AAC6F @@ -1316,12 +1316,12 @@ Route15_EventScript_1AAC6F:: @ 81AAC6F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAC96 - msgbox Text_1867DA, 6 + msgbox Text_1867DA, MSGBOX_AUTOCLOSE end EventScript_1AAC96:: @ 81AAC96 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_GRACE, 0, Text_1C2753, Text_1867C1 - msgbox Text_1867DA, 6 + msgbox Text_1867DA, MSGBOX_AUTOCLOSE end Route15_EventScript_1AACAD:: @ 81AACAD @@ -1329,12 +1329,12 @@ Route15_EventScript_1AACAD:: @ 81AACAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AACD4 - msgbox Text_18686F, 6 + msgbox Text_18686F, MSGBOX_AUTOCLOSE end EventScript_1AACD4:: @ 81AACD4 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_OLIVIA, 0, Text_1C279D, Text_186841 - msgbox Text_18686F, 6 + msgbox Text_18686F, MSGBOX_AUTOCLOSE end Route15_EventScript_1AACEB:: @ 81AACEB @@ -1342,12 +1342,12 @@ Route15_EventScript_1AACEB:: @ 81AACEB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAD12 - msgbox Text_18668D, 6 + msgbox Text_18668D, MSGBOX_AUTOCLOSE end EventScript_1AAD12:: @ 81AAD12 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_1C26D3, Text_18667A - msgbox Text_18668D, 6 + msgbox Text_18668D, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAD29:: @ 81AAD29 @@ -1355,12 +1355,12 @@ Route15_EventScript_1AAD29:: @ 81AAD29 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAD50 - msgbox Text_18671A, 6 + msgbox Text_18671A, MSGBOX_AUTOCLOSE end EventScript_1AAD50:: @ 81AAD50 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1C2717, Text_186707 - msgbox Text_18671A, 6 + msgbox Text_18671A, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAD67:: @ 81AAD67 @@ -1368,12 +1368,12 @@ Route15_EventScript_1AAD67:: @ 81AAD67 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAD8E - msgbox Text_186A55, 6 + msgbox Text_186A55, MSGBOX_AUTOCLOSE end EventScript_1AAD8E:: @ 81AAD8E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_YAZMIN, 0, Text_1C287D, Text_186A40 - msgbox Text_186A55, 6 + msgbox Text_186A55, MSGBOX_AUTOCLOSE end Route15_EventScript_1AADA5:: @ 81AADA5 @@ -1381,12 +1381,12 @@ Route15_EventScript_1AADA5:: @ 81AADA5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AADCC - msgbox Text_18655A, 6 + msgbox Text_18655A, MSGBOX_AUTOCLOSE end EventScript_1AADCC:: @ 81AADCC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_KINDRA, 0, Text_1C2650, Text_186549 - msgbox Text_18655A, 6 + msgbox Text_18655A, MSGBOX_AUTOCLOSE end Route15_EventScript_1AADE3:: @ 81AADE3 @@ -1394,12 +1394,12 @@ Route15_EventScript_1AADE3:: @ 81AADE3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAE0A - msgbox Text_18661D, 6 + msgbox Text_18661D, MSGBOX_AUTOCLOSE end EventScript_1AAE0A:: @ 81AAE0A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_BECKY, 0, Text_1C268D, Text_186612 - msgbox Text_18661D, 6 + msgbox Text_18661D, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAE21:: @ 81AAE21 @@ -1407,12 +1407,12 @@ Route15_EventScript_1AAE21:: @ 81AAE21 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAE48 - msgbox Text_1869F4, 6 + msgbox Text_1869F4, MSGBOX_AUTOCLOSE end EventScript_1AAE48:: @ 81AAE48 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CELIA, 0, Text_1C2846, Text_1869E6 - msgbox Text_1869F4, 6 + msgbox Text_1869F4, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAE5F:: @ 81AAE5F @@ -1420,12 +1420,12 @@ Route15_EventScript_1AAE5F:: @ 81AAE5F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAE8A - msgbox Text_186B0A, 6 + msgbox Text_186B0A, MSGBOX_AUTOCLOSE end EventScript_1AAE8A:: @ 81AAE8A trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28A1, Text_186ACB, Text_186B46 - msgbox Text_186B0A, 6 + msgbox Text_186B0A, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAEA5:: @ 81AAEA5 @@ -1433,12 +1433,12 @@ Route15_EventScript_1AAEA5:: @ 81AAEA5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAED0 - msgbox Text_186BD2, 6 + msgbox Text_186BD2, MSGBOX_AUTOCLOSE end EventScript_1AAED0:: @ 81AAED0 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28EC, Text_186BB1, Text_186BFE - msgbox Text_186BD2, 6 + msgbox Text_186BD2, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAEEB:: @ 81AAEEB @@ -1446,12 +1446,12 @@ Route16_EventScript_1AAEEB:: @ 81AAEEB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAF12 - msgbox Text_186C75, 6 + msgbox Text_186C75, MSGBOX_AUTOCLOSE end EventScript_1AAF12:: @ 81AAF12 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_LAO, 0, Text_1C2913, Text_186C5F - msgbox Text_186C75, 6 + msgbox Text_186C75, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAF29:: @ 81AAF29 @@ -1459,12 +1459,12 @@ Route16_EventScript_1AAF29:: @ 81AAF29 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAF50 - msgbox Text_186D5A, 6 + msgbox Text_186D5A, MSGBOX_AUTOCLOSE end EventScript_1AAF50:: @ 81AAF50 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_HIDEO, 0, Text_1C297B, Text_186D52 - msgbox Text_186D5A, 6 + msgbox Text_186D5A, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAF67:: @ 81AAF67 @@ -1472,12 +1472,12 @@ Route16_EventScript_1AAF67:: @ 81AAF67 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAF8E - msgbox Text_186EC7, 6 + msgbox Text_186EC7, MSGBOX_AUTOCLOSE end EventScript_1AAF8E:: @ 81AAF8E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_RUBEN, 0, Text_1C29EB, Text_186EB4 - msgbox Text_186EC7, 6 + msgbox Text_186EC7, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAFA5:: @ 81AAFA5 @@ -1485,12 +1485,12 @@ Route16_EventScript_1AAFA5:: @ 81AAFA5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AAFCC - msgbox Text_186CC5, 6 + msgbox Text_186CC5, MSGBOX_AUTOCLOSE end EventScript_1AAFCC:: @ 81AAFCC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_KOJI, 0, Text_1C2925, Text_186CBB - msgbox Text_186CC5, 6 + msgbox Text_186CC5, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAFE3:: @ 81AAFE3 @@ -1498,12 +1498,12 @@ Route16_EventScript_1AAFE3:: @ 81AAFE3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB00A - msgbox Text_186D16, 6 + msgbox Text_186D16, MSGBOX_AUTOCLOSE end EventScript_1AB00A:: @ 81AB00A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_LUKE, 0, Text_1C2944, Text_186D06 - msgbox Text_186D16, 6 + msgbox Text_186D16, MSGBOX_AUTOCLOSE end Route16_EventScript_1AB021:: @ 81AB021 @@ -1511,12 +1511,12 @@ Route16_EventScript_1AB021:: @ 81AB021 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB048 - msgbox Text_186E1C, 6 + msgbox Text_186E1C, MSGBOX_AUTOCLOSE end EventScript_1AB048:: @ 81AB048 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_CAMRON, 0, Text_1C29B0, Text_186E0D - msgbox Text_186E1C, 6 + msgbox Text_186E1C, MSGBOX_AUTOCLOSE end Route16_EventScript_1AB05F:: @ 81AB05F @@ -1524,12 +1524,12 @@ Route16_EventScript_1AB05F:: @ 81AB05F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB08A - msgbox Text_187027, 6 + msgbox Text_187027, MSGBOX_AUTOCLOSE end EventScript_1AB08A:: @ 81AB08A trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A19, Text_186FFA, Text_187057 - msgbox Text_187027, 6 + msgbox Text_187027, MSGBOX_AUTOCLOSE end Route16_EventScript_1AB0A5:: @ 81AB0A5 @@ -1537,12 +1537,12 @@ Route16_EventScript_1AB0A5:: @ 81AB0A5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB0D0 - msgbox Text_1870F9, 6 + msgbox Text_1870F9, MSGBOX_AUTOCLOSE end EventScript_1AB0D0:: @ 81AB0D0 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A53, Text_1870CC, Text_187120 - msgbox Text_1870F9, 6 + msgbox Text_1870F9, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB0EB:: @ 81AB0EB @@ -1550,12 +1550,12 @@ Route17_EventScript_1AB0EB:: @ 81AB0EB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB112 - msgbox Text_1872EB, 6 + msgbox Text_1872EB, MSGBOX_AUTOCLOSE end EventScript_1AB112:: @ 81AB112 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_BILLY, 0, Text_1C2B06, Text_1872E3 - msgbox Text_1872EB, 6 + msgbox Text_1872EB, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB129:: @ 81AB129 @@ -1563,12 +1563,12 @@ Route17_EventScript_1AB129:: @ 81AB129 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB150 - msgbox Text_187333, 6 + msgbox Text_187333, MSGBOX_AUTOCLOSE end EventScript_1AB150:: @ 81AB150 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_NIKOLAS, 0, Text_1C2B2C, Text_187325 - msgbox Text_187333, 6 + msgbox Text_187333, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB167:: @ 81AB167 @@ -1576,12 +1576,12 @@ Route17_EventScript_1AB167:: @ 81AB167 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB18E - msgbox Text_187479, 6 + msgbox Text_187479, MSGBOX_AUTOCLOSE end EventScript_1AB18E:: @ 81AB18E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JAXON, 0, Text_1C2BE6, Text_187472 - msgbox Text_187479, 6 + msgbox Text_187479, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB1A5:: @ 81AB1A5 @@ -1589,12 +1589,12 @@ Route17_EventScript_1AB1A5:: @ 81AB1A5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB1CC - msgbox Text_1874C9, 6 + msgbox Text_1874C9, MSGBOX_AUTOCLOSE end EventScript_1AB1CC:: @ 81AB1CC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_WILLIAM, 0, Text_1C2C10, Text_1874B6 - msgbox Text_1874C9, 6 + msgbox Text_1874C9, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB1E3:: @ 81AB1E3 @@ -1602,12 +1602,12 @@ Route17_EventScript_1AB1E3:: @ 81AB1E3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB20A - msgbox Text_1871BA, 6 + msgbox Text_1871BA, MSGBOX_AUTOCLOSE end EventScript_1AB20A:: @ 81AB20A trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_RAUL, 0, Text_1C2A88, Text_1871AE - msgbox Text_1871BA, 6 + msgbox Text_1871BA, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB221:: @ 81AB221 @@ -1615,12 +1615,12 @@ Route17_EventScript_1AB221:: @ 81AB221 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB248 - msgbox Text_18725A, 6 + msgbox Text_18725A, MSGBOX_AUTOCLOSE end EventScript_1AB248:: @ 81AB248 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_ISAIAH, 0, Text_1C2AC4, Text_187254 - msgbox Text_18725A, 6 + msgbox Text_18725A, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB25F:: @ 81AB25F @@ -1628,12 +1628,12 @@ Route17_EventScript_1AB25F:: @ 81AB25F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB286 - msgbox Text_18739F, 6 + msgbox Text_18739F, MSGBOX_AUTOCLOSE end EventScript_1AB286:: @ 81AB286 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_ZEEK, 0, Text_1C2B5E, Text_187395 - msgbox Text_18739F, 6 + msgbox Text_18739F, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB29D:: @ 81AB29D @@ -1641,12 +1641,12 @@ Route17_EventScript_1AB29D:: @ 81AB29D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB2C4 - msgbox Text_1873FF, 6 + msgbox Text_1873FF, MSGBOX_AUTOCLOSE end EventScript_1AB2C4:: @ 81AB2C4 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_JAMAL, 0, Text_1C2B9C, Text_1873EB - msgbox Text_1873FF, 6 + msgbox Text_1873FF, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB2DB:: @ 81AB2DB @@ -1654,12 +1654,12 @@ Route17_EventScript_1AB2DB:: @ 81AB2DB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB302 - msgbox Text_187432, 6 + msgbox Text_187432, MSGBOX_AUTOCLOSE end EventScript_1AB302:: @ 81AB302 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_COREY, 0, Text_1C2BDA, Text_187429 - msgbox Text_187432, 6 + msgbox Text_187432, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB319:: @ 81AB319 @@ -1667,12 +1667,12 @@ Route17_EventScript_1AB319:: @ 81AB319 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB340 - msgbox Text_1872A5, 6 + msgbox Text_1872A5, MSGBOX_AUTOCLOSE end EventScript_1AB340:: @ 81AB340 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_VIRGIL, 0, Text_1C2AF0, Text_187295 - msgbox Text_1872A5, 6 + msgbox Text_1872A5, MSGBOX_AUTOCLOSE end Route18_EventScript_1AB357:: @ 81AB357 @@ -1680,12 +1680,12 @@ Route18_EventScript_1AB357:: @ 81AB357 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB37E - msgbox Text_187677, 6 + msgbox Text_187677, MSGBOX_AUTOCLOSE end EventScript_1AB37E:: @ 81AB37E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_WILTON, 0, Text_1C2C2B, Text_187672 - msgbox Text_187677, 6 + msgbox Text_187677, MSGBOX_AUTOCLOSE end Route18_EventScript_1AB395:: @ 81AB395 @@ -1693,12 +1693,12 @@ Route18_EventScript_1AB395:: @ 81AB395 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB3BC - msgbox Text_1876C5, 6 + msgbox Text_1876C5, MSGBOX_AUTOCLOSE end EventScript_1AB3BC:: @ 81AB3BC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_1C2C7B, Text_1876B3 - msgbox Text_1876C5, 6 + msgbox Text_1876C5, MSGBOX_AUTOCLOSE end Route18_EventScript_1AB3D3:: @ 81AB3D3 @@ -1706,12 +1706,12 @@ Route18_EventScript_1AB3D3:: @ 81AB3D3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB3FA - msgbox Text_18772C, 6 + msgbox Text_18772C, MSGBOX_AUTOCLOSE end EventScript_1AB3FA:: @ 81AB3FA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_JACOB, 0, Text_1C2CA8, Text_187726 - msgbox Text_18772C, 6 + msgbox Text_18772C, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB411:: @ 81AB411 @@ -1719,12 +1719,12 @@ Route19_EventScript_1AB411:: @ 81AB411 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB438 - msgbox Text_1877EE, 6 + msgbox Text_1877EE, MSGBOX_AUTOCLOSE end EventScript_1AB438:: @ 81AB438 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1C2CEE, Text_1877DF - msgbox Text_1877EE, 6 + msgbox Text_1877EE, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB44F:: @ 81AB44F @@ -1732,12 +1732,12 @@ Route19_EventScript_1AB44F:: @ 81AB44F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB476 - msgbox Text_187852, 6 + msgbox Text_187852, MSGBOX_AUTOCLOSE end EventScript_1AB476:: @ 81AB476 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_REECE, 0, Text_1C2D19, Text_18783E - msgbox Text_187852, 6 + msgbox Text_187852, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB48D:: @ 81AB48D @@ -1745,12 +1745,12 @@ Route19_EventScript_1AB48D:: @ 81AB48D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB4B4 - msgbox Text_1878B1, 6 + msgbox Text_1878B1, MSGBOX_AUTOCLOSE end EventScript_1AB4B4:: @ 81AB4B4 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_1C2D4B, Text_1878A5 - msgbox Text_1878B1, 6 + msgbox Text_1878B1, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB4CB:: @ 81AB4CB @@ -1758,12 +1758,12 @@ Route19_EventScript_1AB4CB:: @ 81AB4CB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB4F2 - msgbox Text_1878FE, 6 + msgbox Text_1878FE, MSGBOX_AUTOCLOSE end EventScript_1AB4F2:: @ 81AB4F2 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1C2D7D, Text_1878F8 - msgbox Text_1878FE, 6 + msgbox Text_1878FE, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB509:: @ 81AB509 @@ -1771,12 +1771,12 @@ Route19_EventScript_1AB509:: @ 81AB509 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB530 - msgbox Text_18795B, 6 + msgbox Text_18795B, MSGBOX_AUTOCLOSE end EventScript_1AB530:: @ 81AB530 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DAVID, 0, Text_1C2DA7, Text_187955 - msgbox Text_18795B, 6 + msgbox Text_18795B, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB547:: @ 81AB547 @@ -1784,12 +1784,12 @@ Route19_EventScript_1AB547:: @ 81AB547 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB56E - msgbox Text_1879D3, 6 + msgbox Text_1879D3, MSGBOX_AUTOCLOSE end EventScript_1AB56E:: @ 81AB56E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_TONY, 0, Text_1C2DE9, Text_1879C3 - msgbox Text_1879D3, 6 + msgbox Text_1879D3, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB585:: @ 81AB585 @@ -1797,12 +1797,12 @@ Route19_EventScript_1AB585:: @ 81AB585 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB5AC - msgbox Text_187B35, 6 + msgbox Text_187B35, MSGBOX_AUTOCLOSE end EventScript_1AB5AC:: @ 81AB5AC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_AXLE, 0, Text_1C2EC0, Text_187B25 - msgbox Text_187B35, 6 + msgbox Text_187B35, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB5C3:: @ 81AB5C3 @@ -1810,12 +1810,12 @@ Route19_EventScript_1AB5C3:: @ 81AB5C3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB5EA - msgbox Text_187A50, 6 + msgbox Text_187A50, MSGBOX_AUTOCLOSE end EventScript_1AB5EA:: @ 81AB5EA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_1C2E4A, Text_187A44 - msgbox Text_187A50, 6 + msgbox Text_187A50, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB601:: @ 81AB601 @@ -1823,12 +1823,12 @@ Route19_EventScript_1AB601:: @ 81AB601 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB628 - msgbox Text_187ACA, 6 + msgbox Text_187ACA, MSGBOX_AUTOCLOSE end EventScript_1AB628:: @ 81AB628 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_1C2E9D, Text_187AC1 - msgbox Text_187ACA, 6 + msgbox Text_187ACA, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB63F:: @ 81AB63F @@ -1836,12 +1836,12 @@ Route19_EventScript_1AB63F:: @ 81AB63F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB666 - msgbox Text_187B94, 6 + msgbox Text_187B94, MSGBOX_AUTOCLOSE end EventScript_1AB666:: @ 81AB666 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_1C2EFC, Text_187B85 - msgbox Text_187B94, 6 + msgbox Text_187B94, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB67D:: @ 81AB67D @@ -1849,12 +1849,12 @@ Route19_EventScript_1AB67D:: @ 81AB67D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB6A8 - msgbox Text_187C9E, 6 + msgbox Text_187C9E, MSGBOX_AUTOCLOSE end EventScript_1AB6A8:: @ 81AB6A8 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2F41, Text_187C6F, Text_187CF2 - msgbox Text_187C9E, 6 + msgbox Text_187C9E, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB6C3:: @ 81AB6C3 @@ -1862,12 +1862,12 @@ Route19_EventScript_1AB6C3:: @ 81AB6C3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB6EE - msgbox Text_187DAD, 6 + msgbox Text_187DAD, MSGBOX_AUTOCLOSE end EventScript_1AB6EE:: @ 81AB6EE trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2FAE, Text_187D7E, Text_187DE8 - msgbox Text_187DAD, 6 + msgbox Text_187DAD, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB709:: @ 81AB709 @@ -1875,12 +1875,12 @@ Route20_EventScript_1AB709:: @ 81AB709 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB730 - msgbox Text_187E83, 6 + msgbox Text_187E83, MSGBOX_AUTOCLOSE end EventScript_1AB730:: @ 81AB730 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_BARRY, 0, Text_1C2FF3, Text_187E7B - msgbox Text_187E83, 6 + msgbox Text_187E83, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB747:: @ 81AB747 @@ -1888,12 +1888,12 @@ Route20_EventScript_1AB747:: @ 81AB747 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB76E - msgbox Text_187FFE, 6 + msgbox Text_187FFE, MSGBOX_AUTOCLOSE end EventScript_1AB76E:: @ 81AB76E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DEAN, 0, Text_1C30B0, Text_187FF7 - msgbox Text_187FFE, 6 + msgbox Text_187FFE, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB785:: @ 81AB785 @@ -1901,12 +1901,12 @@ Route20_EventScript_1AB785:: @ 81AB785 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB7AC - msgbox Text_18806D, 6 + msgbox Text_18806D, MSGBOX_AUTOCLOSE end EventScript_1AB7AC:: @ 81AB7AC trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_1C30ED, Text_18805C - msgbox Text_18806D, 6 + msgbox Text_18806D, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB7C3:: @ 81AB7C3 @@ -1914,12 +1914,12 @@ Route20_EventScript_1AB7C3:: @ 81AB7C3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB7EA - msgbox Text_187F61, 6 + msgbox Text_187F61, MSGBOX_AUTOCLOSE end EventScript_1AB7EA:: @ 81AB7EA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_1C305F, Text_187F5A - msgbox Text_187F61, 6 + msgbox Text_187F61, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB801:: @ 81AB801 @@ -1927,12 +1927,12 @@ Route20_EventScript_1AB801:: @ 81AB801 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB828 - msgbox Text_188139, 6 + msgbox Text_188139, MSGBOX_AUTOCLOSE end EventScript_1AB828:: @ 81AB828 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1C3149, Text_188119 - msgbox Text_188139, 6 + msgbox Text_188139, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB83F:: @ 81AB83F @@ -1940,12 +1940,12 @@ Route20_EventScript_1AB83F:: @ 81AB83F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB866 - msgbox Text_18827B, 6 + msgbox Text_18827B, MSGBOX_AUTOCLOSE end EventScript_1AB866:: @ 81AB866 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_1C31C4, Text_18825C - msgbox Text_18827B, 6 + msgbox Text_18827B, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB87D:: @ 81AB87D @@ -1953,12 +1953,12 @@ Route20_EventScript_1AB87D:: @ 81AB87D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB8A4 - msgbox Text_187EF6, 6 + msgbox Text_187EF6, MSGBOX_AUTOCLOSE end EventScript_1AB8A4:: @ 81AB8A4 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_1C302E, Text_187EED - msgbox Text_187EF6, 6 + msgbox Text_187EF6, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB8BB:: @ 81AB8BB @@ -1966,12 +1966,12 @@ Route20_EventScript_1AB8BB:: @ 81AB8BB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB8E2 - msgbox Text_1880C8, 6 + msgbox Text_1880C8, MSGBOX_AUTOCLOSE end EventScript_1AB8E2:: @ 81AB8E2 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_ROGER, 0, Text_1C312C, Text_1880AB - msgbox Text_1880C8, 6 + msgbox Text_1880C8, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB8F9:: @ 81AB8F9 @@ -1979,12 +1979,12 @@ Route20_EventScript_1AB8F9:: @ 81AB8F9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB920 - msgbox Text_1881B8, 6 + msgbox Text_1881B8, MSGBOX_AUTOCLOSE end EventScript_1AB920:: @ 81AB920 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_MISSY, 0, Text_1C3185, Text_1881A3 - msgbox Text_1881B8, 6 + msgbox Text_1881B8, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB937:: @ 81AB937 @@ -1992,12 +1992,12 @@ Route20_EventScript_1AB937:: @ 81AB937 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB95E - msgbox Text_187FA3, 6 + msgbox Text_187FA3, MSGBOX_AUTOCLOSE end EventScript_1AB95E:: @ 81AB95E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_IRENE, 0, Text_1C3095, Text_187F92 - msgbox Text_187FA3, 6 + msgbox Text_187FA3, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1AB975:: @ 81AB975 @@ -2005,12 +2005,12 @@ Route21_North_EventScript_1AB975:: @ 81AB975 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB99C - msgbox Text_188389, 6 + msgbox Text_188389, MSGBOX_AUTOCLOSE end EventScript_1AB99C:: @ 81AB99C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_RONALD, 0, Text_1C3208, Text_188383 - msgbox Text_188389, 6 + msgbox Text_188389, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1AB9B3:: @ 81AB9B3 @@ -2018,12 +2018,12 @@ Route21_South_EventScript_1AB9B3:: @ 81AB9B3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AB9DA - msgbox Text_188632, 6 + msgbox Text_188632, MSGBOX_AUTOCLOSE end EventScript_1AB9DA:: @ 81AB9DA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_CLAUDE, 0, Text_1C331D, Text_1885F8 - msgbox Text_188632, 6 + msgbox Text_188632, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1AB9F1:: @ 81AB9F1 @@ -2031,12 +2031,12 @@ Route21_North_EventScript_1AB9F1:: @ 81AB9F1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABA18 - msgbox Text_18841D, 6 + msgbox Text_18841D, MSGBOX_AUTOCLOSE end EventScript_1ABA18:: @ 81ABA18 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_WADE, 0, Text_1C3231, Text_1883E9 - msgbox Text_18841D, 6 + msgbox Text_18841D, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1ABA2F:: @ 81ABA2F @@ -2044,12 +2044,12 @@ Route21_South_EventScript_1ABA2F:: @ 81ABA2F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABA56 - msgbox Text_1886C5, 6 + msgbox Text_1886C5, MSGBOX_AUTOCLOSE end EventScript_1ABA56:: @ 81ABA56 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_NOLAN, 0, Text_1C3356, Text_1886AE - msgbox Text_1886C5, 6 + msgbox Text_1886C5, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1ABA6D:: @ 81ABA6D @@ -2057,12 +2057,12 @@ Route21_North_EventScript_1ABA6D:: @ 81ABA6D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABA94 - msgbox Text_188465, 6 + msgbox Text_188465, MSGBOX_AUTOCLOSE end EventScript_1ABA94:: @ 81ABA94 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_1C3264, Text_18845F - msgbox Text_188465, 6 + msgbox Text_188465, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1ABAAB:: @ 81ABAAB @@ -2070,12 +2070,12 @@ Route21_South_EventScript_1ABAAB:: @ 81ABAAB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABAD2 - msgbox Text_1884FF, 6 + msgbox Text_1884FF, MSGBOX_AUTOCLOSE end EventScript_1ABAD2:: @ 81ABAD2 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_JACK, 0, Text_1C3298, Text_1884F0 - msgbox Text_1884FF, 6 + msgbox Text_1884FF, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1ABAE9:: @ 81ABAE9 @@ -2083,12 +2083,12 @@ Route21_South_EventScript_1ABAE9:: @ 81ABAE9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABB10 - msgbox Text_188555, 6 + msgbox Text_188555, MSGBOX_AUTOCLOSE end EventScript_1ABB10:: @ 81ABB10 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_JEROME, 0, Text_1C32D3, Text_188543 - msgbox Text_188555, 6 + msgbox Text_188555, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1ABB27:: @ 81ABB27 @@ -2096,12 +2096,12 @@ Route21_South_EventScript_1ABB27:: @ 81ABB27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABB4E - msgbox Text_1885BF, 6 + msgbox Text_1885BF, MSGBOX_AUTOCLOSE end EventScript_1ABB4E:: @ 81ABB4E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_1C32FD, Text_1885B2 - msgbox Text_1885BF, 6 + msgbox Text_1885BF, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1ABB65:: @ 81ABB65 @@ -2109,12 +2109,12 @@ Route21_North_EventScript_1ABB65:: @ 81ABB65 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABB90 - msgbox Text_188734, 6 + msgbox Text_188734, MSGBOX_AUTOCLOSE end EventScript_1ABB90:: @ 81ABB90 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C3378, Text_188712, Text_18875E - msgbox Text_188734, 6 + msgbox Text_188734, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1ABBAB:: @ 81ABBAB @@ -2122,12 +2122,12 @@ Route21_North_EventScript_1ABBAB:: @ 81ABBAB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABBD6 - msgbox Text_188812, 6 + msgbox Text_188812, MSGBOX_AUTOCLOSE end EventScript_1ABBD6:: @ 81ABBD6 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C33AE, Text_1887F1, Text_188850 - msgbox Text_188812, 6 + msgbox Text_188812, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 @@ -2135,12 +2135,12 @@ OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABC18 - msgbox Text_189657, 6 + msgbox Text_189657, MSGBOX_AUTOCLOSE end EventScript_1ABC18:: @ 81ABC18 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_1C37B5, Text_18964D - msgbox Text_189657, 6 + msgbox Text_189657, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F @@ -2148,12 +2148,12 @@ OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABC56 - msgbox Text_1896C1, 6 + msgbox Text_1896C1, MSGBOX_AUTOCLOSE end EventScript_1ABC56:: @ 81ABC56 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_1C37E7, Text_1896AC - msgbox Text_1896C1, 6 + msgbox Text_1896C1, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D @@ -2161,12 +2161,12 @@ OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABC94 - msgbox Text_189740, 6 + msgbox Text_189740, MSGBOX_AUTOCLOSE end EventScript_1ABC94:: @ 81ABC94 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_FINN, 0, Text_1C3807, Text_189728 - msgbox Text_189740, 6 + msgbox Text_189740, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB @@ -2174,12 +2174,12 @@ OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABCD2 - msgbox Text_1897C5, 6 + msgbox Text_1897C5, MSGBOX_AUTOCLOSE end EventScript_1ABCD2:: @ 81ABCD2 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_1C3835, Text_1897A4 - msgbox Text_1897C5, 6 + msgbox Text_1897C5, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 @@ -2187,12 +2187,12 @@ OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABD10 - msgbox Text_18984B, 6 + msgbox Text_18984B, MSGBOX_AUTOCLOSE end EventScript_1ABD10:: @ 81ABD10 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_TOMMY, 0, Text_1C386A, Text_189833 - msgbox Text_18984B, 6 + msgbox Text_18984B, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 @@ -2200,12 +2200,12 @@ OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABD4E - msgbox Text_1898C4, 6 + msgbox Text_1898C4, MSGBOX_AUTOCLOSE end EventScript_1ABD4E:: @ 81ABD4E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_SHARON, 0, Text_1C389F, Text_1898AB - msgbox Text_1898C4, 6 + msgbox Text_1898C4, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 @@ -2213,12 +2213,12 @@ OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABD8C - msgbox Text_18992C, 6 + msgbox Text_18992C, MSGBOX_AUTOCLOSE end EventScript_1ABD8C:: @ 81ABD8C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1C38CA, Text_18991B - msgbox Text_18992C, 6 + msgbox Text_18992C, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 @@ -2226,12 +2226,12 @@ OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABDCA - msgbox Text_189998, 6 + msgbox Text_189998, MSGBOX_AUTOCLOSE end EventScript_1ABDCA:: @ 81ABDCA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BLACK_BELT_SHEA, 0, Text_1C38FA, Text_18998C - msgbox Text_189998, 6 + msgbox Text_189998, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 @@ -2239,12 +2239,12 @@ OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABE08 - msgbox Text_189A13, 6 + msgbox Text_189A13, MSGBOX_AUTOCLOSE end EventScript_1ABE08:: @ 81ABE08 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BLACK_BELT_HUGH, 0, Text_1C3943, Text_189A0A - msgbox Text_189A13, 6 + msgbox Text_189A13, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F @@ -2252,12 +2252,12 @@ OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABE46 - msgbox Text_189A9F, 6 + msgbox Text_189A9F, MSGBOX_AUTOCLOSE end EventScript_1ABE46:: @ 81ABE46 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_BRYCE, 0, Text_1C3987, Text_189A92 - msgbox Text_189A9F, 6 + msgbox Text_189A9F, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D @@ -2265,12 +2265,12 @@ OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABE84 - msgbox Text_189B24, 6 + msgbox Text_189B24, MSGBOX_AUTOCLOSE end EventScript_1ABE84:: @ 81ABE84 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CLAIRE, 0, Text_1C39C6, Text_189B0B - msgbox Text_189B24, 6 + msgbox Text_189B24, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B @@ -2278,12 +2278,12 @@ OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABEC6 - msgbox Text_189BA3, 6 + msgbox Text_189BA3, MSGBOX_AUTOCLOSE end EventScript_1ABEC6:: @ 81ABEC6 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A05, Text_189B84, Text_189BDE - msgbox Text_189BA3, 6 + msgbox Text_189BA3, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 @@ -2291,12 +2291,12 @@ OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABF0C - msgbox Text_189C7E, 6 + msgbox Text_189C7E, MSGBOX_AUTOCLOSE end EventScript_1ABF0C:: @ 81ABF0C trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A55, Text_189C62, Text_189CAB - msgbox Text_189C7E, 6 + msgbox Text_189C7E, MSGBOX_AUTOCLOSE end OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 @@ -2304,12 +2304,12 @@ OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABF4E - msgbox Text_189DA3, 6 + msgbox Text_189DA3, MSGBOX_AUTOCLOSE end EventScript_1ABF4E:: @ 81ABF4E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_1C3773, Text_189D8B - msgbox Text_189DA3, 6 + msgbox Text_189DA3, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 @@ -2317,12 +2317,12 @@ ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABF8C - msgbox Text_189E9E, 6 + msgbox Text_189E9E, MSGBOX_AUTOCLOSE end EventScript_1ABF8C:: @ 81ABF8C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_NIKKI, 0, Text_1C3AA7, Text_189E72 - msgbox Text_189E9E, 6 + msgbox Text_189E9E, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 @@ -2330,12 +2330,12 @@ ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ABFCA - msgbox Text_189F21, 6 + msgbox Text_189F21, MSGBOX_AUTOCLOSE end EventScript_1ABFCA:: @ 81ABFCA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_VIOLET, 0, Text_1C3ABF, Text_189EFA - msgbox Text_189F21, 6 + msgbox Text_189F21, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 @@ -2343,12 +2343,12 @@ ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC008 - msgbox Text_189FA8, 6 + msgbox Text_189FA8, MSGBOX_AUTOCLOSE end EventScript_1AC008:: @ 81AC008 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TUBER_AMIRA, 0, Text_1C3AF2, Text_189F9A - msgbox Text_189FA8, 6 + msgbox Text_189FA8, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F @@ -2356,12 +2356,12 @@ ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC046 - msgbox Text_18A000, 6 + msgbox Text_18A000, MSGBOX_AUTOCLOSE end EventScript_1AC046:: @ 81AC046 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TUBER_ALEXIS, 0, Text_1C3B1D, Text_189FEE - msgbox Text_18A000, 6 + msgbox Text_18A000, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D @@ -2369,12 +2369,12 @@ ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC084 - msgbox Text_18A082, 6 + msgbox Text_18A082, MSGBOX_AUTOCLOSE end EventScript_1AC084:: @ 81AC084 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_1C3B30, Text_18A053 - msgbox Text_18A082, 6 + msgbox Text_18A082, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B @@ -2382,12 +2382,12 @@ ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC0C6 - msgbox Text_18A106, 6 + msgbox Text_18A106, MSGBOX_AUTOCLOSE end EventScript_1AC0C6:: @ 81AC0C6 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B6E, Text_18A0F7, Text_18A138 - msgbox Text_18A106, 6 + msgbox Text_18A106, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 @@ -2395,12 +2395,12 @@ ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC10C - msgbox Text_18A1B2, 6 + msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end EventScript_1AC10C:: @ 81AC10C trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B99, Text_18A1A3, Text_18A1CD - msgbox Text_18A1B2, 6 + msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 @@ -2408,12 +2408,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC14E - msgbox Text_18A430, 6 + msgbox Text_18A430, MSGBOX_AUTOCLOSE end EventScript_1AC14E:: @ 81AC14E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_DAISY, 0, Text_1C3BF6, Text_18A40E - msgbox Text_18A430, 6 + msgbox Text_18A430, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 @@ -2421,12 +2421,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC18C - msgbox Text_18A4C6, 6 + msgbox Text_18A4C6, MSGBOX_AUTOCLOSE end EventScript_1AC18C:: @ 81AC18C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_CELINA, 0, Text_1C3C28, Text_18A49E - msgbox Text_18A4C6, 6 + msgbox Text_18A4C6, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 @@ -2434,12 +2434,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC1CA - msgbox Text_18A555, 6 + msgbox Text_18A555, MSGBOX_AUTOCLOSE end EventScript_1AC1CA:: @ 81AC1CA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_RAYNA, 0, Text_1C3C70, Text_18A535 - msgbox Text_18A555, 6 + msgbox Text_18A555, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 @@ -2447,12 +2447,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC208 - msgbox Text_18A601, 6 + msgbox Text_18A601, MSGBOX_AUTOCLOSE end EventScript_1AC208:: @ 81AC208 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LADY_JACKI, 0, Text_1C3CB0, Text_18A5EE - msgbox Text_18A601, 6 + msgbox Text_18A601, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F @@ -2460,12 +2460,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC246 - msgbox Text_18A699, 6 + msgbox Text_18A699, MSGBOX_AUTOCLOSE end EventScript_1AC246:: @ 81AC246 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LADY_GILLIAN, 0, Text_1C3CF1, Text_18A67F - msgbox Text_18A699, 6 + msgbox Text_18A699, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D @@ -2473,12 +2473,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC284 - msgbox Text_18A715, 6 + msgbox Text_18A715, MSGBOX_AUTOCLOSE end EventScript_1AC284:: @ 81AC284 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DESTIN, 0, Text_1C3D47, Text_18A6FE - msgbox Text_18A715, 6 + msgbox Text_18A715, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B @@ -2486,12 +2486,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC2C2 - msgbox Text_18A7AC, 6 + msgbox Text_18A7AC, MSGBOX_AUTOCLOSE end EventScript_1AC2C2:: @ 81AC2C2 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_TOBY, 0, Text_1C3D73, Text_18A786 - msgbox Text_18A7AC, 6 + msgbox Text_18A7AC, MSGBOX_AUTOCLOSE end FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 @@ -2499,12 +2499,12 @@ FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC300 - msgbox Text_18AB37, 6 + msgbox Text_18AB37, MSGBOX_AUTOCLOSE end EventScript_1AC300:: @ 81AC300 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_1C3BB7, Text_18AB0B - msgbox Text_18AB37, 6 + msgbox Text_18AB37, MSGBOX_AUTOCLOSE end FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 @@ -2512,12 +2512,12 @@ FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC33E - msgbox Text_18AEB6, 6 + msgbox Text_18AEB6, MSGBOX_AUTOCLOSE end EventScript_1AC33E:: @ 81AC33E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MILO, 0, Text_1C3DA2, Text_18AEA8 - msgbox Text_18AEB6, 6 + msgbox Text_18AEB6, MSGBOX_AUTOCLOSE end FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 @@ -2525,12 +2525,12 @@ FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC37C - msgbox Text_18AF45, 6 + msgbox Text_18AF45, MSGBOX_AUTOCLOSE end EventScript_1AC37C:: @ 81AC37C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_1C3E0F, Text_18AF39 - msgbox Text_18AF45, 6 + msgbox Text_18AF45, MSGBOX_AUTOCLOSE end FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 @@ -2538,12 +2538,12 @@ FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC3BA - msgbox Text_18AFF2, 6 + msgbox Text_18AFF2, MSGBOX_AUTOCLOSE end EventScript_1AC3BA:: @ 81AC3BA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_1C3E6A, Text_18AFCC - msgbox Text_18AFF2, 6 + msgbox Text_18AFF2, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 @@ -2551,12 +2551,12 @@ SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC3F8 - msgbox Text_18B451, 6 + msgbox Text_18B451, MSGBOX_AUTOCLOSE end EventScript_1AC3F8:: @ 81AC3F8 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_TYLOR, 0, Text_1C3ED0, Text_18B43B - msgbox Text_18B451, 6 + msgbox Text_18B451, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F @@ -2564,12 +2564,12 @@ SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC436 - msgbox Text_18B4D1, 6 + msgbox Text_18B4D1, MSGBOX_AUTOCLOSE end EventScript_1AC436:: @ 81AC436 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_MYMO, 0, Text_1C3F11, Text_18B4C5 - msgbox Text_18B4D1, 6 + msgbox Text_18B4D1, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D @@ -2577,12 +2577,12 @@ SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC474 - msgbox Text_18B573, 6 + msgbox Text_18B573, MSGBOX_AUTOCLOSE end EventScript_1AC474:: @ 81AC474 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_1C3F51, Text_18B539 - msgbox Text_18B573, 6 + msgbox Text_18B573, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B @@ -2590,12 +2590,12 @@ SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC4B6 - msgbox Text_18B62E, 6 + msgbox Text_18B62E, MSGBOX_AUTOCLOSE end EventScript_1AC4B6:: @ 81AC4B6 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3F7B, Text_18B5F4, Text_18B660 - msgbox Text_18B62E, 6 + msgbox Text_18B62E, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 @@ -2603,12 +2603,12 @@ SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC4FC - msgbox Text_18B720, 6 + msgbox Text_18B720, MSGBOX_AUTOCLOSE end EventScript_1AC4FC:: @ 81AC4FC trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3FB3, Text_18B6EF, Text_18B762 - msgbox Text_18B720, 6 + msgbox Text_18B720, MSGBOX_AUTOCLOSE end SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 @@ -2616,12 +2616,12 @@ SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC53E - msgbox Text_18B7FD, 6 + msgbox Text_18B7FD, MSGBOX_AUTOCLOSE end EventScript_1AC53E:: @ 81AC53E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_JACLYN, 0, Text_1C3FE9, Text_18B7F0 - msgbox Text_18B7FD, 6 + msgbox Text_18B7FD, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 @@ -2629,12 +2629,12 @@ SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC57C - msgbox Text_18B8F7, 6 + msgbox Text_18B8F7, MSGBOX_AUTOCLOSE end EventScript_1AC57C:: @ 81AC57C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_ROSE, 0, Text_1C4028, Text_18B8C8 - msgbox Text_18B8F7, 6 + msgbox Text_18B8F7, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 @@ -2642,12 +2642,12 @@ SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC5BA - msgbox Text_18B9A5, 6 + msgbox Text_18B9A5, MSGBOX_AUTOCLOSE end EventScript_1AC5BA:: @ 81AC5BA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_JUGGLER_EDWARD, 0, Text_1C4057, Text_18B988 - msgbox Text_18B9A5, 6 + msgbox Text_18B9A5, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 @@ -2655,12 +2655,12 @@ SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC5F8 - msgbox Text_18BA57, 6 + msgbox Text_18BA57, MSGBOX_AUTOCLOSE end EventScript_1AC5F8:: @ 81AC5F8 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_1C407F, Text_18BA47 - msgbox Text_18BA57, 6 + msgbox Text_18BA57, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F @@ -2668,12 +2668,12 @@ SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC636 - msgbox Text_18BAE0, 6 + msgbox Text_18BAE0, MSGBOX_AUTOCLOSE end EventScript_1AC636:: @ 81AC636 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_1C40D9, Text_18BAC0 - msgbox Text_18BAE0, 6 + msgbox Text_18BAE0, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D @@ -2681,12 +2681,12 @@ SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC678 - msgbox Text_18BBF6, 6 + msgbox Text_18BBF6, MSGBOX_AUTOCLOSE end EventScript_1AC678:: @ 81AC678 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_1C4138, Text_18BBE2, Text_18BC24 - msgbox Text_18BBF6, 6 + msgbox Text_18BBF6, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 @@ -2694,12 +2694,12 @@ SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC6BE - msgbox Text_18BCAE, 6 + msgbox Text_18BCAE, MSGBOX_AUTOCLOSE end EventScript_1AC6BE:: @ 81AC6BE trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_1C4166, Text_18BC84, Text_18BCCF - msgbox Text_18BCAE, 6 + msgbox Text_18BCAE, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 @@ -2707,12 +2707,12 @@ SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC700 - msgbox Text_18BB8B, 6 + msgbox Text_18BB8B, MSGBOX_AUTOCLOSE end EventScript_1AC700:: @ 81AC700 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_EARL, 0, Text_1C40FA, Text_18BB62 - msgbox Text_18BB8B, 6 + msgbox Text_18BB8B, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 @@ -2720,12 +2720,12 @@ SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC73E - msgbox Text_18BEA0, 6 + msgbox Text_18BEA0, MSGBOX_AUTOCLOSE end EventScript_1AC73E:: @ 81AC73E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_STANLY, 0, Text_1C4196, Text_18BE9B - msgbox Text_18BEA0, 6 + msgbox Text_18BEA0, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 @@ -2733,12 +2733,12 @@ SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC77C - msgbox Text_18BF6C, 6 + msgbox Text_18BF6C, MSGBOX_AUTOCLOSE end EventScript_1AC77C:: @ 81AC77C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_1C41D4, Text_18BF33 - msgbox Text_18BF6C, 6 + msgbox Text_18BF6C, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 @@ -2746,12 +2746,12 @@ SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC7BA - msgbox Text_18C04C, 6 + msgbox Text_18C04C, MSGBOX_AUTOCLOSE end EventScript_1AC7BA:: @ 81AC7BA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_LARRY, 0, Text_1C4210, Text_18C03B - msgbox Text_18C04C, 6 + msgbox Text_18C04C, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 @@ -2759,12 +2759,12 @@ SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC7F8 - msgbox Text_18C0EA, 6 + msgbox Text_18C0EA, MSGBOX_AUTOCLOSE end EventScript_1AC7F8:: @ 81AC7F8 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_DARYL, 0, Text_1C4280, Text_18C0BB - msgbox Text_18C0EA, 6 + msgbox Text_18C0EA, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F @@ -2772,12 +2772,12 @@ SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC836 - msgbox Text_18C17A, 6 + msgbox Text_18C17A, MSGBOX_AUTOCLOSE end EventScript_1AC836:: @ 81AC836 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_HECTOR, 0, Text_1C42A0, Text_18C140 - msgbox Text_18C17A, 6 + msgbox Text_18C17A, MSGBOX_AUTOCLOSE end SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D @@ -2785,12 +2785,12 @@ SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC874 - msgbox Text_18C20E, 6 + msgbox Text_18C20E, MSGBOX_AUTOCLOSE end EventScript_1AC874:: @ 81AC874 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_DARIO, 0, Text_1C42D6, Text_18C205 - msgbox Text_18C20E, 6 + msgbox Text_18C20E, MSGBOX_AUTOCLOSE end SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B @@ -2798,12 +2798,12 @@ SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC8B2 - msgbox Text_18C2D5, 6 + msgbox Text_18C2D5, MSGBOX_AUTOCLOSE end EventScript_1AC8B2:: @ 81AC8B2 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_RODETTE, 0, Text_1C42EE, Text_18C2BC - msgbox Text_18C2D5, 6 + msgbox Text_18C2D5, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 @@ -2811,12 +2811,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC8F0 - msgbox Text_18C3FF, 6 + msgbox Text_18C3FF, MSGBOX_AUTOCLOSE end EventScript_1AC8F0:: @ 81AC8F0 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_MIAH, 0, Text_1C4327, Text_18C3E7 - msgbox Text_18C3FF, 6 + msgbox Text_18C3FF, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 @@ -2824,12 +2824,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC932 - msgbox Text_18C683, 6 + msgbox Text_18C683, MSGBOX_AUTOCLOSE end EventScript_1AC932:: @ 81AC932 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C4416, Text_18C662, Text_18C6AB - msgbox Text_18C683, 6 + msgbox Text_18C683, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D @@ -2837,12 +2837,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC978 - msgbox Text_18C773, 6 + msgbox Text_18C773, MSGBOX_AUTOCLOSE end EventScript_1AC978:: @ 81AC978 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C444C, Text_18C73B, Text_18C7BD - msgbox Text_18C773, 6 + msgbox Text_18C773, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 @@ -2850,12 +2850,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC9BA - msgbox Text_18C4BA, 6 + msgbox Text_18C4BA, MSGBOX_AUTOCLOSE end EventScript_1AC9BA:: @ 81AC9BA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_JUGGLER_MASON, 0, Text_1C4374, Text_18C473 - msgbox Text_18C4BA, 6 + msgbox Text_18C4BA, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 @@ -2863,12 +2863,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1AC9F8 - msgbox Text_18C54B, 6 + msgbox Text_18C54B, MSGBOX_AUTOCLOSE end EventScript_1AC9F8:: @ 81AC9F8 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_1C43AD, Text_18C543 - msgbox Text_18C54B, 6 + msgbox Text_18C54B, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F @@ -2876,12 +2876,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACA36 - msgbox Text_18C5F5, 6 + msgbox Text_18C5F5, MSGBOX_AUTOCLOSE end EventScript_1ACA36:: @ 81ACA36 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_MADELINE, 0, Text_1C43EC, Text_18C5CD - msgbox Text_18C5F5, 6 + msgbox Text_18C5F5, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D @@ -2889,12 +2889,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACA74 - msgbox Text_18C8C2, 6 + msgbox Text_18C8C2, MSGBOX_AUTOCLOSE end EventScript_1ACA74:: @ 81ACA74 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_1C4491, Text_18C8A6 - msgbox Text_18C8C2, 6 + msgbox Text_18C8C2, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B @@ -2902,12 +2902,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACAB2 - msgbox Text_18C999, 6 + msgbox Text_18C999, MSGBOX_AUTOCLOSE end EventScript_1ACAB2:: @ 81ACAB2 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TAMER_EVAN, 0, Text_1C44CB, Text_18C980 - msgbox Text_18C999, 6 + msgbox Text_18C999, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 @@ -2915,12 +2915,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACAF0 - msgbox Text_18CA9C, 6 + msgbox Text_18CA9C, MSGBOX_AUTOCLOSE end EventScript_1ACAF0:: @ 81ACAF0 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_JACKSON, 0, Text_1C454E, Text_18CA6F - msgbox Text_18CA9C, 6 + msgbox Text_18CA9C, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 @@ -2928,12 +2928,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACB2E - msgbox Text_18CB6C, 6 + msgbox Text_18CB6C, MSGBOX_AUTOCLOSE end EventScript_1ACB2E:: @ 81ACB2E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_KATELYN, 0, Text_1C458E, Text_18CB3E - msgbox Text_18CB6C, 6 + msgbox Text_18CB6C, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 @@ -2941,12 +2941,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACB6C - msgbox Text_18CC09, 6 + msgbox Text_18CC09, MSGBOX_AUTOCLOSE end EventScript_1ACB6C:: @ 81ACB6C trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_COOLTRAINER_LEROY, 0, Text_1C45C2, Text_18CBE0 - msgbox Text_18CC09, 6 + msgbox Text_18CC09, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 @@ -2954,12 +2954,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACBAA - msgbox Text_18CCEA, 6 + msgbox Text_18CCEA, MSGBOX_AUTOCLOSE end EventScript_1ACBAA:: @ 81ACBAA trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_COOLTRAINER_MICHELLE, 0, Text_1C45FB, Text_18CCAE - msgbox Text_18CCEA, 6 + msgbox Text_18CCEA, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 @@ -2967,12 +2967,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACBEC - msgbox Text_18CD9C, 6 + msgbox Text_18CD9C, MSGBOX_AUTOCLOSE end EventScript_1ACBEC:: @ 81ACBEC trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4662, Text_18CD75, Text_18CDE2 - msgbox Text_18CD9C, 6 + msgbox Text_18CD9C, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 @@ -2980,12 +2980,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACC32 - msgbox Text_18CE78, 6 + msgbox Text_18CE78, MSGBOX_AUTOCLOSE end EventScript_1ACC32:: @ 81ACC32 trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4699, Text_18CE5A, Text_18CEF4 - msgbox Text_18CE78, 6 + msgbox Text_18CE78, MSGBOX_AUTOCLOSE end SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D @@ -2993,12 +2993,12 @@ SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACC74 - msgbox Text_18D061, 6 + msgbox Text_18D061, MSGBOX_AUTOCLOSE end EventScript_1ACC74:: @ 81ACC74 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_1C46D3, Text_18D02A - msgbox Text_18D061, 6 + msgbox Text_18D061, MSGBOX_AUTOCLOSE end SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B @@ -3006,12 +3006,12 @@ SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACCB2 - msgbox Text_18D125, 6 + msgbox Text_18D125, MSGBOX_AUTOCLOSE end EventScript_1ACCB2:: @ 81ACCB2 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_1C470A, Text_18D108 - msgbox Text_18D125, 6 + msgbox Text_18D125, MSGBOX_AUTOCLOSE end SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 @@ -3019,12 +3019,12 @@ SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACCF0 - msgbox Text_18D1E3, 6 + msgbox Text_18D1E3, MSGBOX_AUTOCLOSE end EventScript_1ACCF0:: @ 81ACCF0 trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_EDNA, 0, Text_1C4739, Text_18D1B5 - msgbox Text_18D1E3, 6 + msgbox Text_18D1E3, MSGBOX_AUTOCLOSE end SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 @@ -3032,10 +3032,10 @@ SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if eq, EventScript_1ACD2E - msgbox Text_18D284, 6 + msgbox Text_18D284, MSGBOX_AUTOCLOSE end EventScript_1ACD2E:: @ 81ACD2E trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_1C476A, Text_18D26D - msgbox Text_18D284, 6 + msgbox Text_18D284, MSGBOX_AUTOCLOSE end diff --git a/data/text/trainers.inc b/data/text/trainers.inc new file mode 100644 index 000000000..21a96a964 --- /dev/null +++ b/data/text/trainers.inc @@ -0,0 +1,1006 @@ +gUnknown_81C137C:: @ 81C137C + .string "The battery isn't charged enough.\p" + .string "No. of steps required to fully\n" + .string "charge the battery: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" + +gUnknown_81C13D6:: @ 81C13D6 + .string "There are no TRAINERS within range\n" + .string "who can battle…\p" + .string "The VS SEEKER was turned off.{PAUSE_UNTIL_PRESS}$" + +gUnknown_81C1429:: @ 81C1429 + .string "The other TRAINERS don't appear\n" + .string "to be ready for battle.\p" + .string "Let's wait till later.{PAUSE_UNTIL_PRESS}$" + +Text_1C147A:: @ 81C147A + .string "Hey!\n" + .string "I saw you in VIRIDIAN FOREST!$" + +Text_1C149D:: @ 81C149D + .string "Hi! I like shorts!\n" + .string "They're comfy and easy to wear!\p" + .string "You should be wearing shorts, too!$" + +Text_1C14F3:: @ 81C14F3 + .string "Excuse me!\n" + .string "You keep looking at me, don't you?$" + +Text_1C1521:: @ 81C1521 + .string "You're a TRAINER, aren't you?\n" + .string "Let's get with it right away!$" + +Text_1C155D:: @ 81C155D + .string "That look you give me…\n" + .string "It intrigues me so!$" + +Text_1C1588:: @ 81C1588 + .string "Hey! What's wrong with you?\n" + .string "You're still not wearing shorts!$" + +Text_1C15C5:: @ 81C15C5 + .string "I'll battle you with the POKéMON\n" + .string "I started raising.$" + +Text_1C15F9:: @ 81C15F9 + .string "Eek!\n" + .string "Did you push me?$" + +Text_1C160F:: @ 81C160F + .string "I always catch mushroom POKéMON\n" + .string "on MT. MOON.$" + +Text_1C163C:: @ 81C163C + .string "Oh! You're that nosy kid who\n" + .string "eavesdropped on us!$" + +Text_1C166D:: @ 81C166D + .string "Excuse me! Didn't I tell you that\n" + .string "this is a private conversation?\p" + .string "You shouldn't be listening in,\n" + .string "you uncouth person!$" + +Text_1C16E2:: @ 81C16E2 + .string "I'm trying to find something good\n" + .string "that's not a BUG POKéMON, but…$" + +Text_1C1723:: @ 81C1723 + .string "Huh?\n" + .string "You want to go with me again?$" + +Text_1C1746:: @ 81C1746 + .string "Me?\n" + .string "Well, okay. I'll play this once.$" + +Text_1C176B:: @ 81C176B + .string "Hey, long time!\n" + .string "Have you gotten better?$" + +Text_1C1793:: @ 81C1793 + .string "You are good at POKéMON, but how\n" + .string "is your chemistry grade?$" + +Text_1C17CD:: @ 81C17CD + .string "All right!\n" + .string "Let's play another game!$" + +Text_1C17F1:: @ 81C17F1 + .string "You need strategy to win at\n" + .string "battling.\p" + .string "Are you following my advice?$" + +Text_1C1834:: @ 81C1834 + .string "I've collected many NIDORAN.\n" + .string "I don't want them to evolve, but…$" + +Text_1C1873:: @ 81C1873 + .string "School is fun, but I still think\n" + .string "POKéMON are fun, too.$" + +Text_1C18AA:: @ 81C18AA + .string "MEOWTH and PERSIAN are so cute,\n" + .string "meow, meow, meow!$" + +Text_1C18DC:: @ 81C18DC + .string "We may look silly standing here\n" + .string "like this, but I can still battle.$" + +Text_1C191F:: @ 81C191F + .string "I'm a rambling, gaming dude!\n" + .string "I'm on a winning streak!$" + +Text_1C1955:: @ 81C1955 + .string "What's a cute, round, and fluffy\n" + .string "POKéMON?\p" + .string "You already know, don't you?$" + +Text_1C199C:: @ 81C199C + .string "My bike's still acting up, man.$" + +Text_1C19BC:: @ 81C19BC + .string "Okay, kid!\n" + .string "Don't expect mercy this time!$" + +Text_1C19E5:: @ 81C19E5 + .string "ELI: Our twin power became even\n" + .string "better!$" + +Text_1C1A0D:: @ 81C1A0D + .string "ANNE: Our twin power powered up!$" + +Text_1C1A2E:: @ 81C1A2E + .string "We're to battle again?\n" + .string "This time, you're mine!$" + +Text_1C1A5D:: @ 81C1A5D + .string "I haven't forgotten you were with\n" + .string "those good-looking POKéMON.$" + +Text_1C1A9B:: @ 81C1A9B + .string "I'm taking ROCK TUNNEL to go to\n" + .string "LAVENDER…\p" + .string "But I keep getting stopped by\n" + .string "everyone along the way…$" + +Text_1C1AFB:: @ 81C1AFB + .string "Don't you dare patronize me today!\n" + .string "We're playing for keeps!$" + +Text_1C1B37:: @ 81C1B37 + .string "Bwahaha!\n" + .string "Great! I was bored again, eh!$" + +Text_1C1B5E:: @ 81C1B5E + .string "Hahaha!\n" + .string "A little toughie, as always!$" + +Text_1C1B83:: @ 81C1B83 + .string "I got up early every day to train\n" + .string "my POKéMON from cocoons!$" + +Text_1C1BBE:: @ 81C1BBE + .string "Hahahaha!\n" + .string "I'll win this time!$" + +Text_1C1BDC:: @ 81C1BDC + .string "Go win, my super BUG POKéMON!$" + +Text_1C1BFA:: @ 81C1BFA + .string "Wow, you came here again?\n" + .string "Maybe you're a POKéMANIAC, too?\l" + .string "Want to see my collection?$" + +Text_1C1C4F:: @ 81C1C4F + .string "Ha-hahah-ah-ha!\n" + .string "I can't stop sneezing!$" + +Text_1C1C76:: @ 81C1C76 + .string "Hi, kid!\n" + .string "Did I show you my POKéMON?$" + +Text_1C1C9A:: @ 81C1C9A + .string "I went out to a POKéMON GYM again.\p" + .string "…But I lost as usual.$" + +Text_1C1CD3:: @ 81C1CD3 + .string "Ah!\n" + .string "This mountain air is delicious!\l" + .string "It's so good, I can't leave!$" + +Text_1C1D14:: @ 81C1D14 + .string "My head is starting to spin.\n" + .string "I've been hiking for too long…$" + +Text_1C1D50:: @ 81C1D50 + .string "Win, lose, or draw!\n" + .string "Now for our rematch!$" + +Text_1C1D79:: @ 81C1D79 + .string "Competing is the ultimate thrill.\n" + .string "I still can't get enough!$" + +Text_1C1DB5:: @ 81C1DB5 + .string "You know, right?\n" + .string "Let's go, but don't cheat!$" + +Text_1C1DE1:: @ 81C1DE1 + .string "Hi, there!\p" + .string "But be careful!\n" + .string "I'm still laying down some cables!$" + +Text_1C1E1F:: @ 81C1E1F + .string "I became a TRAINER a while ago.\n" + .string "But, I think I can win.$" + +Text_1C1E57:: @ 81C1E57 + .string "Fwahaha!\n" + .string "I have never lost!\p" + .string "…And if I did, I've forgotten all\n" + .string "about it!$" + +Text_1C1E9F:: @ 81C1E9F + .string "I have never won before…\p" + .string "Perhaps I am destined to remain\n" + .string "that way…$" + +Text_1C1EE2:: @ 81C1EE2 + .string "I'm the best in my class.\n" + .string "I train every morning and night!$" + +Text_1C1F1D:: @ 81C1F1D + .string "Keep your eyes out for live wires!$" + +Text_1C1F40:: @ 81C1F40 + .string "I raised my POKéMON carefully.\n" + .string "They should be ready by now.\l" + .string "This time, they should win, too.$" + +Text_1C1F9D:: @ 81C1F9D + .string "Yeah!\n" + .string "I got a bite, here!\l" + .string "Th-this might be the real thing!$" + +Text_1C1FD8:: @ 81C1FD8 + .string "You're finally here.\n" + .string "Fishing is a waiting game.$" + +Text_1C2008:: @ 81C2008 + .string "Still can't find a MOON STONE…\n" + .string "Have you found one?$" + +Text_1C203B:: @ 81C203B + .string "Electricity has always been my\n" + .string "specialty.\p" + .string "I don't know a thing about POKéMON\n" + .string "of the sea, though.$" + +Text_1C209C:: @ 81C209C + .string "The FISHING FOOL vs. POKéMON KID!\n" + .string "Another round, fight!$" + +Text_1C20D4:: @ 81C20D4 + .string "I love fishing, don't get me wrong.\n" + .string "But, I wish I had more work…\l" + .string "…It's hard to give up fishing!$" + +Text_1C2134:: @ 81C2134 + .string "What's catching?\p" + .string "You'll never know unless you beat\n" + .string "me!$" + +Text_1C216B:: @ 81C216B + .string "JES: I'll win here today and\n" + .string "propose to my GIA.$" + +Text_1C219B:: @ 81C219B + .string "GIA: Hey, JES…\n" + .string "I've been waiting a long time now.\p" + .string "If we win today, I'll marry you!$" + +Text_1C21EE:: @ 81C21EE + .string "My bird POKéMON remember you!$" + +Text_1C220C:: @ 81C220C + .string "I want to be the best TRAINER \n" + .string "while I'm a kid!$" + +Text_1C223C:: @ 81C223C + .string "Wow!\n" + .string "You got more cool BADGES!$" + +Text_1C225B:: @ 81C225B + .string "My cutely grown POKéMON wish to\n" + .string "become reacquainted with you.$" + +Text_1C2299:: @ 81C2299 + .string "I cleaned out my savings and\n" + .string "bought more CARBOS.$" + +Text_1C22CA:: @ 81C22CA + .string "I'm not going to lose this time.\n" + .string "The wind's blowing my way!$" + +Text_1C2306:: @ 81C2306 + .string "Oh, you're back?\p" + .string "Sure, I'll play again with you,\n" + .string "sweetie.$" + +Text_1C2340:: @ 81C2340 + .string "Can't you forget that you battled\n" + .string "with me?$" + +Text_1C236B:: @ 81C236B + .string "What're you starin' at?$" + +Text_1C2383:: @ 81C2383 + .string "I always go with bird POKéMON.\n" + .string "I've dedicated myself to them.$" + +Text_1C23C1:: @ 81C23C1 + .string "I used TMs to teach good moves\n" + .string "to my POKéMON.$" + +Text_1C23EF:: @ 81C23EF + .string "My bird POKéMON should be ready\n" + .string "for battle this time.$" + +Text_1C2425:: @ 81C2425 + .string "Are you using TMs on POKéMON?\n" + .string "Just holding them is useless.$" + +Text_1C2461:: @ 81C2461 + .string "Have you taught your bird POKéMON\n" + .string "how to FLY?\p" + .string "You'll be able to soar with it into\n" + .string "the sky! Give it a try.$" + +Text_1C24CB:: @ 81C24CB + .string "The legend of the winged mirages…\n" + .string "You've heard it, right?$" + +Text_1C2505:: @ 81C2505 + .string "I'm really not into it, but okay.\n" + .string "Let's go!$" + +Text_1C2531:: @ 81C2531 + .string "Hey!\n" + .string "I remember you!\p" + .string "C'mon, c'mon.\n" + .string "Let's go, let's go, let's go!$" + +Text_1C2572:: @ 81C2572 + .string "You're here again, huh?\n" + .string "Shut up and battle.$" + +Text_1C259E:: @ 81C259E + .string "We've been riding here because of\n" + .string "the wide-open spaces.$" + +Text_1C25D6:: @ 81C25D6 + .string "POKéMON battle, right?\n" + .string "Cool! Rumble!$" + +Text_1C25FB:: @ 81C25FB + .string "KIRI: JAN, I hope we win today.$" + +Text_1C261B:: @ 81C261B + .string "JAN: KIRI, here we go!\n" + .string "Let's win for sure this time!$" + +Text_1C2650:: @ 81C2650 + .string "I'm going to keep battling with the\n" + .string "POKéMON I got in trades.$" + +Text_1C268D:: @ 81C268D + .string "You look gentle, so I think I can\n" + .string "beat you.\p" + .string "I'll give it one more go!$" + +Text_1C26D3:: @ 81C26D3 + .string "When I whistle, bird POKéMON\n" + .string "gather around.\p" + .string "They're amazingly cute!$" + +Text_1C2717:: @ 81C2717 + .string "Hmm? My birds are shivering!\n" + .string "Wait, aren't you that TRAINER…$" + +Text_1C2753:: @ 81C2753 + .string "Oh, you're a little cutie!\n" + .string "So like a darling POKéMON!\l" + .string "I remember you now!$" + +Text_1C279D:: @ 81C279D + .string "I raise POKéMON for protection\n" + .string "because I live alone.\p" + .string "That hasn't changed.$" + +Text_1C27E7:: @ 81C27E7 + .string "Hey, kid! C'mon!\n" + .string "I got these off some loser!$" + +Text_1C2814:: @ 81C2814 + .string "Fork over all your cash when you\n" + .string "lose to me, kid!$" + +Text_1C2846:: @ 81C2846 + .string "What's cool and happening?\n" + .string "Trading POKéMON, of course.$" + +Text_1C287D:: @ 81C287D + .string "Want to play with my POKéMON\n" + .string "again?$" + +Text_1C28A1:: @ 81C28A1 + .string "MYA: Hi, we keep meeting,\n" + .string "don't we?\p" + .string "Help me train my little brother\n" + .string "again?$" + +Text_1C28EC:: @ 81C28EC + .string "RON: My sister's gotten more\n" + .string "powerful…$" + +Text_1C2913:: @ 81C2913 + .string "What do you want?$" + +Text_1C2925:: @ 81C2925 + .string "Nice BIKE!\n" + .string "Hand it over quick!$" + +Text_1C2944:: @ 81C2944 + .string "Come out and play, little mouse.\n" + .string "I'll treat you right!$" + +Text_1C297B:: @ 81C297B + .string "Hey, wait a second!\n" + .string "Don't call me and then run away!$" + +Text_1C29B0:: @ 81C29B0 + .string "I'm feeling hungry and mean!\n" + .string "I really need a punching bag!$" + +Text_1C29EB:: @ 81C29EB + .string "Hey, there!\n" + .string "We'll have ourselves a good time!$" + +Text_1C2A19:: @ 81C2A19 + .string "JED: Are you here to see our\n" + .string "love, which knows no bounds?$" + +Text_1C2A53:: @ 81C2A53 + .string "LEA: Sometimes, the intensity of\n" + .string "our love scares me.$" + +Text_1C2A88:: @ 81C2A88 + .string "I told you, there's no getting rich\n" + .string "quick in battling kids.$" + +Text_1C2AC4:: @ 81C2AC4 + .string "I'm mighty proud of my bod, kiddo.\n" + .string "Come on!$" + +Text_1C2AF0:: @ 81C2AF0 + .string "You out for a stroll?$" + +Text_1C2B06:: @ 81C2B06 + .string "We're BIKERS!\n" + .string "We rule the roads, man!$" + +Text_1C2B2C:: @ 81C2B2C + .string "VOLTORB's going to seriously\n" + .string "electrify you today!$" + +Text_1C2B5E:: @ 81C2B5E + .string "I leveled up my POKéMON, but it\n" + .string "absolutely won't evolve. Why?$" + +Text_1C2B9C:: @ 81C2B9C + .string "Gaah! I really need to exercise\n" + .string "and seriously trim some flab!$" + +Text_1C2BDA:: @ 81C2BDA + .string "Be a rebel!$" + +Text_1C2BE6:: @ 81C2BE6 + .string "Yep, that's a nice BIKE!\n" + .string "How's it handle?$" + +Text_1C2C10:: @ 81C2C10 + .string "Get lost, kid!\n" + .string "I'm bushed!$" + +Text_1C2C2B:: @ 81C2C2B + .string "I've been checking every grassy\n" + .string "area for new POKéMON.\p" + .string "But it's not always easy…$" + +Text_1C2C7B:: @ 81C2C7B + .string "Koorukukukoo!\n" + .string "Is my birdcall getting better?$" + +Text_1C2CA8:: @ 81C2CA8 + .string "I warned you before, this is my\n" + .string "turf!\p" + .string "I don't want you coming around.$" + +Text_1C2CEE:: @ 81C2CEE + .string "I'm almost warmed up to go\n" + .string "out for a swim.$" + +Text_1C2D19:: @ 81C2D19 + .string "Wait! Slow down!\n" + .string "What if you have a heart attack?$" + +Text_1C2D4B:: @ 81C2D4B + .string "I love swimming!\n" + .string "I guess you're the surfing type.$" + +Text_1C2D7D:: @ 81C2D7D + .string "What's beyond the horizon?\n" + .string "Have you seen?$" + +Text_1C2DA7:: @ 81C2DA7 + .string "I tried diving for POKéMON again,\n" + .string "but it was a no-go like before.$" + +Text_1C2DE9:: @ 81C2DE9 + .string "I look at the sea to forget all\n" + .string "the bad things that happened.\p" + .string "…Like losing to you the last time!$" + +Text_1C2E4A:: @ 81C2E4A + .string "You always get to ride your\n" + .string "POKéMON…\p" + .string "It looks so relaxing.\n" + .string "Can I have it if I win?$" + +Text_1C2E9D:: @ 81C2E9D + .string "Swimming's great!\n" + .string "Sunburns aren't!$" + +Text_1C2EC0:: @ 81C2EC0 + .string "These waters are treacherous!\n" + .string "You shouldn't come back here!$" + +Text_1C2EFC:: @ 81C2EFC + .string "I swam here with my friends…\n" + .string "I'm tired…\l" + .string "Must we really battle again?$" + +Text_1C2F41:: @ 81C2F41 + .string "LIA: You know my brother just\n" + .string "became a TRAINER, right?\p" + .string "I want to make him better, so I\n" + .string "need your help again.$" + +Text_1C2FAE:: @ 81C2FAE + .string "LUC: My big sis taught me all\n" + .string "about POKéMON.\p" + .string "I wonder if I'm better?$" + +Text_1C2FF3:: @ 81C2FF3 + .string "The water is shallow here.\n" + .string "There are many people swimming.$" + +Text_1C302E:: @ 81C302E + .string "Are you jealous that I'm\n" + .string "vacationing on SEAFOAM?$" + +Text_1C305F:: @ 81C305F + .string "I love floating with the fishes\n" + .string "here among the waves.$" + +Text_1C3095:: @ 81C3095 + .string "Were you on vacation, too?$" + +Text_1C30B0:: @ 81C30B0 + .string "Check out my physique!\p" + .string "It's even more buff than ever\n" + .string "before!$" + +Text_1C30ED:: @ 81C30ED + .string "Why are you riding a POKéMON?\n" + .string "Haven't you learned to swim yet?$" + +Text_1C312C:: @ 81C312C + .string "I rode my bird POKéMON here.$" + +Text_1C3149:: @ 81C3149 + .string "My boyfriend gave me big pearls.\n" + .string "And, they've grown bigger!$" + +Text_1C3185:: @ 81C3185 + .string "I swam here from CINNABAR ISLAND.\n" + .string "It wasn't easy, like I said.$" + +Text_1C31C4:: @ 81C31C4 + .string "CINNABAR, in the west, has a LAB\n" + .string "for POKéMON.\p" + .string "My daddy works there.$" + +Text_1C3208:: @ 81C3208 + .string "You want to know if the fish are\n" + .string "biting?$" + +Text_1C3231:: @ 81C3231 + .string "I got a big haul again!\n" + .string "Wanna go for it once more?$" + +Text_1C3264:: @ 81C3264 + .string "The sea cleanses my body and soul!$" + +Text_1C3287:: @ 81C3287 + .string "きょうも　およぎに\n" + .string "きちまったぜ$" + +Text_1C3298:: @ 81C3298 + .string "I caught my POKéMON at sea.\n" + .string "And that's where I train them.$" + +Text_1C32D3:: @ 81C32D3 + .string "Right now, I'm in another triathlon\n" + .string "meet!$" + +Text_1C32FD:: @ 81C32FD + .string "Ahh!\n" + .string "Feel the sun and the wind!$" + +Text_1C331D:: @ 81C331D + .string "Hey, cut it out already.\n" + .string "You always scare away the fish!$" + +Text_1C3356:: @ 81C3356 + .string "Keep me company till I get a hit.$" + +Text_1C3378:: @ 81C3378 + .string "LIL: Huh? A battle again?\n" + .string "IAN, can't you do it alone?$" + +Text_1C33AE:: @ 81C33AE + .string "IAN: My sis is still a slob.\n" + .string "Help me get her into shape!$" + +Text_1C33E7:: @ 81C33E7 + .string "I won't lose while I'm here!$" + +Text_1C3404:: @ 81C3404 + .string "Dad took me to a great party on\n" + .string "the S.S. ANNE at VERMILION CITY.$" + +Text_1C3445:: @ 81C3445 + .string "I'm a cool guy.\n" + .string "I've got a girlfriend!\p" + .string "I'll show her how cool I am for\n" + .string "sure this time!$" + +Text_1C349C:: @ 81C349C + .string "Hi!\n" + .string "My boyfriend is cool!\l" + .string "My conditioning's good today!$" + +Text_1C34D4:: @ 81C34D4 + .string "I had this feeling…\n" + .string "I knew I had to battle you again!$" + +Text_1C350A:: @ 81C350A + .string "My friend has many cute POKéMON.\n" + .string "I'm so jealous!$" + +Text_1C353B:: @ 81C353B + .string "I just trained up on MT. MOON,\n" + .string "but I've still got gas in the tank!$" + +Text_1C357E:: @ 81C357E + .string "A POKéMANIAC lives on the cape.\n" + .string "Have you seen his collection?$" + +Text_1C35BC:: @ 81C35BC + .string "You're going to see BILL again?\n" + .string "First, we battle!$" + +Text_1C35EE:: @ 81C35EE + .string "I saw your feat from the grass!$" + +Text_1C360E:: @ 81C360E + .string "Okay!\n" + .string "I'll stomp you!$" + +Text_1C3624:: @ 81C3624 + .string "You always look so busy…\n" + .string "Aren't you getting tired?$" + +Text_1C3657:: @ 81C3657 + .string "You really must love coming to\n" + .string "NUGGET BRIDGE.$" + +Text_1C3685:: @ 81C3685 + .string "The time we battled…\p" + .string "Even though I was the second in\n" + .string "line, I was the best, wasn't I?$" + +Text_1C36DA:: @ 81C36DA + .string "People call this the NUGGET\n" + .string "BRIDGE!\p" + .string "You've already beaten us, so you're\n" + .string "not allowed to take the challenge…\p" + .string "…But, you're welcome to battle with\n" + .string "us again.$" + +Text_1C3773:: @ 81C3773 + .string "Lying back, rocked by the waves…\n" + .string "I don't notice time slipping by…$" + +Text_1C37B5:: @ 81C37B5 + .string "The weather's gorgeous!\n" + .string "I'll try not to spoil it.$" + +Text_1C37E7:: @ 81C37E7 + .string "My sunburn is starting to hurt…$" + +Text_1C3807:: @ 81C3807 + .string "The fire bird's mountain casts\n" + .string "a huge shadow…$" + +Text_1C3835:: @ 81C3835 + .string "I have this strong feeling that\n" + .string "I can win this time!$" + +Text_1C386A:: @ 81C386A + .string "Wait! Wait a second!\n" + .string "I'm sure I've hooked a big one!$" + +Text_1C389F:: @ 81C389F + .string "You'll help me out with my\n" + .string "training again?$" + +Text_1C38CA:: @ 81C38CA + .string "We haven't missed a single day of\n" + .string "training yet!$" + +Text_1C38FA:: @ 81C38FA + .string "Every morning, before breakfast,\n" + .string "I swim around this island…\l" + .string "Three times!$" + +Text_1C3943:: @ 81C3943 + .string "Dress appropriately for battle!\n" + .string "Lose that frivolous outfit, I said!$" + +Text_1C3987:: @ 81C3987 + .string "You know, everything tastes great\n" + .string "when you're out in the wild.$" + +Text_1C39C6:: @ 81C39C6 + .string "I ate too much again, so will you\n" + .string "battle us for some exercise?$" + +Text_1C3A05:: @ 81C3A05 + .string "KIA: My big brother and I make\n" + .string "an awesome combination!\p" + .string "We won't lose this time!$" + +Text_1C3A55:: @ 81C3A55 + .string "MIK: Together with KIA, we're\n" + .string "afraid of nothing!\p" + .string "We'll prove it to you this time!$" + +Text_1C3AA7:: @ 81C3AA7 + .string "Are we to battle again?$" + +Text_1C3ABF:: @ 81C3ABF + .string "From where have you come, and\n" + .string "where are you bound?$" + +Text_1C3AF2:: @ 81C3AF2 + .string "I want to swim without my float\n" + .string "ring soon.$" + +Text_1C3B1D:: @ 81C3B1D + .string "Yay, yay!\n" + .string "POKéMON!$" + +Text_1C3B30:: @ 81C3B30 + .string "Oh, no, didn't I tell you already?\n" + .string "Please, stay away from me!$" + +Text_1C3B6E:: @ 81C3B6E + .string "JOY: We've gotten stronger!\n" + .string "Lots and lots!$" + +Text_1C3B99:: @ 81C3B99 + .string "MEG: You can't beat us today!$" + +Text_1C3BB7:: @ 81C3BB7 + .string "Oh, hello!\p" + .string "Are you raising your POKéMON in a\n" + .string "good environment?$" + +Text_1C3BF6:: @ 81C3BF6 + .string "With these hands, I will create\n" + .string "my victory today.$" + +Text_1C3C28:: @ 81C3C28 + .string "Must I repeat myself?\n" + .string "I'm trying to paint.\l" + .string "Please keep out of my sight!$" + +Text_1C3C70:: @ 81C3C70 + .string "I haven't made any progress…\n" + .string "I still can't get the right angle…$" + +Text_1C3CB0:: @ 81C3CB0 + .string "Oh, you will give me another\n" + .string "opportunity to match wits with you?$" + +Text_1C3CF1:: @ 81C3CF1 + .string "They're almost finished making the\n" + .string "pool for my POKéMON.\p" + .string "You must drop in for a visit.$" + +Text_1C3D47:: @ 81C3D47 + .string "I'm a good runner.\n" + .string "I've gotten even faster!$" + +Text_1C3D73:: @ 81C3D73 + .string "I say, friend!\n" + .string "Let us enjoy our time together!$" + +Text_1C3DA2:: @ 81C3DA2 + .string "I'm the eldest of the BIRD\n" + .string "BROTHERS. Remember me?\p" + .string "That's right, I'm the one who loves\n" + .string "birds for their beaks!$" + +Text_1C3E0F:: @ 81C3E0F + .string "I'm the middle kid of the BIRD\n" + .string "BROTHERS.\p" + .string "I'm the one that loves wings.\n" + .string "Let's battle again!$" + +Text_1C3E6A:: @ 81C3E6A + .string "I'm the youngest of the BIRD\n" + .string "BROTHERS.\p" + .string "I love birds for their down.\n" + .string "I didn't think I'd see you again!$" + +Text_1C3ED0:: @ 81C3ED0 + .string "I'm still having no luck at all.\n" + .string "A battle'd be a change of pace!$" + +Text_1C3F11:: @ 81C3F11 + .string "Gasp… Gasp…\p" + .string "I swam here from SIX ISLAND's port\n" + .string "in one go again.$" + +Text_1C3F51:: @ 81C3F51 + .string "You always come along while I'm\n" + .string "swimming.$" + +Text_1C3F7B:: @ 81C3F7B + .string "AVA: Let's have another\n" + .string "two-on-two marine battle today!$" + +Text_1C3FB3:: @ 81C3FB3 + .string "GEB: My big sister and I are way\n" + .string "tougher than before!$" + +Text_1C3FE9:: @ 81C3FE9 + .string "…Huh?\p" + .string "I envision my house, but TELEPORT\n" + .string "always brings me here!$" + +Text_1C4028:: @ 81C4028 + .string "Oh, hello.\n" + .string "A pleasant breeze is blowing again.$" + +Text_1C4057:: @ 81C4057 + .string "Hehehe, I'm practicing in secret\n" + .string "again.$" + +Text_1C407F:: @ 81C407F + .string "What, you're sick of seeing\n" + .string "SWIMMERS like me?\p" + .string "Aww, don't be hatin'!\n" + .string "Battle with me again.$" + +Text_1C40D9:: @ 81C40D9 + .string "Sigh…\n" + .string "My boyfriend's busy again…$" + +Text_1C40FA:: @ 81C40FA + .string "Come on, tell me, where are the\n" + .string "mountains around these parts?$" + +Text_1C4138:: @ 81C4138 + .string "MIU: Hello, POKéMON!\n" + .string "It's time to play again!$" + +Text_1C4166:: @ 81C4166 + .string "MIA: Hello, POKéMON!\n" + .string "It's time to battle again!$" + +Text_1C4196:: @ 81C4196 + .string "There appear to be many secrets\n" + .string "still unsolved in this world.$" + +Text_1C41D4:: @ 81C41D4 + .string "Hi, didn't we meet before?\n" + .string "What compelled you to come back?$" + +Text_1C4210:: @ 81C4210 + .string "It's been said that there are\n" + .string "mysterious stones on this island.\p" + .string "Have you discovered anything since\n" + .string "we last met?$" + +Text_1C4280:: @ 81C4280 + .string "A rematch with you, so high up!$" + +Text_1C42A0:: @ 81C42A0 + .string "I'm pretty familiar with the land\n" + .string "around these parts.$" + +Text_1C42D6:: @ 81C42D6 + .string "I sensed your approach.$" + +Text_1C42EE:: @ 81C42EE + .string "Somewhere on this island, peculiar\n" + .string "POKéMON are sleeping.$" + +Text_1C4327:: @ 81C4327 + .string "Kyahaha!\p" + .string "Coming back won't change a thing.\n" + .string "I'll flick you away effortlessly!$" + +Text_1C4374:: @ 81C4374 + .string "Howdy! You're a member of my\n" + .string "fan club, isn't that right?$" + +Text_1C43AD:: @ 81C43AD + .string "This island is too spread out…\n" + .string "Patrolling the place is a drag…$" + +Text_1C43EC:: @ 81C43EC + .string "I don't forgive people who abuse\n" + .string "POKéMON!$" + +Text_1C4416:: @ 81C4416 + .string "EVE: I'll team up with JON and\n" + .string "battle together again.$" + +Text_1C444C:: @ 81C444C + .string "JON: When I'm with EVE, it feels\n" + .string "like we could never lose, not ever.$" + +Text_1C4491:: @ 81C4491 + .string "Let's have another battle.\n" + .string "My conditioning's in top form!$" + +Text_1C44CB:: @ 81C44CB + .string "It doesn't matter if you happen to\n" + .string "have the strongest POKéMON…\p" + .string "It doesn't mean a thing if you don't\n" + .string "know how to use them properly!$" + +Text_1C454E:: @ 81C454E + .string "I work to protect the environment.\n" + .string "In turn, nature protects me!$" + +Text_1C458E:: @ 81C458E + .string "Every time we meet, you have those\n" + .string "snazzy shoes on.$" + +Text_1C45C2:: @ 81C45C2 + .string "You must have gotten tougher.\n" + .string "Let me battle you, please!$" + +Text_1C45FB:: @ 81C45FB + .string "I was given the best possible\n" + .string "education to become this strong.\p" + .string "I won't lose this time.\n" + .string "Absolutely not!$" + +Text_1C4662:: @ 81C4662 + .string "LEX: My darling NYA, together\n" + .string "we will win for certain!$" + +Text_1C4699:: @ 81C4699 + .string "NYA: I won't drag down my mentor\n" + .string "LEX! We're going to win!$" + +Text_1C46D3:: @ 81C46D3 + .string "Have you discovered anything about\n" + .string "this stone chamber?$" + +Text_1C470A:: @ 81C470A + .string "A mystic POKéMON is said to sleep\n" + .string "inside here.$" + +Text_1C4739:: @ 81C4739 + .string "My teacher is showing me how to\n" + .string "paint some more.$" + +Text_1C476A:: @ 81C476A + .string "Today, in addition to our lesson,\n" + .string "we came to see the chamber again.$" diff --git a/include/constants/cable_club.h b/include/constants/cable_club.h new file mode 100644 index 000000000..f2aa4120c --- /dev/null +++ b/include/constants/cable_club.h @@ -0,0 +1,15 @@ +#ifndef GUARD_CONSTANTS_CABLE_CLUB_H +#define GUARD_CONSTANTS_CABLE_CLUB_H + +// States for VAR_CABLE_CLUB_STATE +#define USING_SINGLE_BATTLE 1 +#define USING_DOUBLE_BATTLE 2 +#define USING_TRADE_CENTER 3 +#define USING_RECORD_CORNER 4 +#define USING_MULTI_BATTLE 5 +#define USING_UNION_ROOM 6 +#define USING_BERRY_CRUSH 7 +#define USING_MINIGAME 8 +#define USING_BATTLE_TOWER 9 + +#endif //GUARD_CONSTANTS_CABLE_CLUB_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 3635aef6b..5806b8c42 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -155,7 +155,7 @@ #define VAR_MAP_SCENE_PEWTER_CITY 0x406C #define VAR_0x406D 0x406D #define VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 0x406E -#define VAR_0x406F 0x406F +#define VAR_CABLE_CLUB_STATE 0x406F #define VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY 0x4070 #define VAR_MAP_SCENE_CINNABAR_ISLAND 0x4071 #define VAR_0x4072 0x4072 From c39d295386654b34982d384a332b8cb7b2e55e24 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 9 Jan 2020 00:15:41 -0500 Subject: [PATCH 06/20] Label used movement steps --- asm/macros/movement.inc | 184 +- data/event_scripts.s | 173 +- data/maps/BirthIsland_Exterior/scripts.inc | 14 +- data/maps/CeladonCity/scripts.inc | 4 +- data/maps/CeladonCity_GameCorner/scripts.inc | 30 +- data/maps/CeruleanCity/scripts.inc | 122 +- data/maps/CeruleanCity_House4/scripts.inc | 10 +- data/maps/CinnabarIsland/scripts.inc | 134 +- data/maps/CinnabarIsland_Gym/scripts.inc | 68 +- .../scripts.inc | 98 +- .../FiveIsland_LostCave_Room10/scripts.inc | 18 +- .../FiveIsland_MemorialPillar/scripts.inc | 10 +- .../FiveIsland_ResortGorgeous/scripts.inc | 4 +- .../scripts.inc | 44 +- .../FiveIsland_RocketWarehouse/scripts.inc | 22 +- data/maps/FourIsland/scripts.inc | 24 +- .../FourIsland_IcefallCave_Back/scripts.inc | 128 +- .../FourIsland_PokemonDayCare/scripts.inc | 36 +- .../scripts.inc | 34 +- data/maps/IndigoPlateau_Exterior/scripts.inc | 132 +- data/maps/MtEmber_Exterior/scripts.inc | 14 +- data/maps/MtMoon_B2F/scripts.inc | 16 +- data/maps/NavelRock_Summit/scripts.inc | 44 +- data/maps/OneIsland/scripts.inc | 56 +- data/maps/OneIsland_Harbor/scripts.inc | 6 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 172 +- data/maps/PalletTown/scripts.inc | 338 +-- data/maps/PalletTown_GarysHouse/scripts.inc | 6 +- .../PalletTown_PlayersHouse_1F/scripts.inc | 2 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 508 ++-- data/maps/PewterCity/scripts.inc | 2192 ++++++++--------- data/maps/PewterCity_House1/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/scripts.inc | 30 +- .../maps/PokemonLeague_BrunosRoom/scripts.inc | 6 +- .../PokemonLeague_ChampionsRoom/scripts.inc | 128 +- .../maps/PokemonLeague_HallOfFame/scripts.inc | 24 +- .../maps/PokemonLeague_LancesRoom/scripts.inc | 76 +- data/maps/PokemonTower_2F/scripts.inc | 44 +- data/maps/PokemonTower_6F/scripts.inc | 2 +- data/maps/PokemonTower_7F/scripts.inc | 144 +- .../maps/Route16_NorthEntrance_1F/scripts.inc | 24 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 24 +- data/maps/Route22/scripts.inc | 124 +- data/maps/Route24/scripts.inc | 12 +- data/maps/Route25_SeaCottage/scripts.inc | 50 +- data/maps/Route5_SouthEntrance/scripts.inc | 12 +- data/maps/Route6_NorthEntrance/scripts.inc | 12 +- data/maps/Route7_EastEntrance/scripts.inc | 12 +- data/maps/Route8_WestEntrance/scripts.inc | 12 +- data/maps/SSAnne_2F_Corridor/scripts.inc | 94 +- data/maps/SSAnne_CaptainsOffice/scripts.inc | 6 +- data/maps/SSAnne_Exterior/scripts.inc | 38 +- data/maps/SaffronCity/scripts.inc | 2 +- data/maps/SaffronCity_Dojo/scripts.inc | 8 +- .../scripts.inc | 62 +- data/maps/SeafoamIslands_B3F/scripts.inc | 50 +- data/maps/SeafoamIslands_B4F/scripts.inc | 38 +- data/maps/SevenIsland_House_Room1/scripts.inc | 34 +- data/maps/SevenIsland_House_Room2/scripts.inc | 24 +- .../scripts.inc | 38 +- .../scripts.inc | 12 +- .../scripts.inc | 8 +- data/maps/SilphCo_11F/scripts.inc | 30 +- data/maps/SilphCo_7F/scripts.inc | 34 +- .../scripts.inc | 98 +- .../SixIsland_PokemonCenter_1F/scripts.inc | 24 +- data/maps/SixIsland_RuinValley/scripts.inc | 4 +- data/maps/ThreeIsland/scripts.inc | 88 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 14 +- .../ThreeIsland_DunsparceTunnel/scripts.inc | 2 +- .../TwoIsland_JoyfulGameCorner/scripts.inc | 48 +- data/maps/VermilionCity/scripts.inc | 8 +- .../VermilionCity_PokemonFanClub/scripts.inc | 8 +- data/maps/ViridianCity/scripts.inc | 18 +- data/maps/ViridianCity_House2/scripts.inc | 6 +- data/maps/ViridianCity_Mart/scripts.inc | 22 +- data/scripts/cable_club.inc | 42 +- data/scripts/field_moves.inc | 4 +- data/scripts/move_tutors.inc | 8 +- data/scripts/movement.inc | 82 + data/scripts/pkmn_center_nurse.inc | 8 +- include/constants/movement_commands.h | 188 +- src/vs_seeker.c | 22 +- 83 files changed, 3281 insertions(+), 3272 deletions(-) create mode 100644 data/scripts/movement.inc diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 8981f2eaa..c5178be3a 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -6,71 +6,71 @@ .endm enum_start 0 - create_movement step_00 - create_movement step_01 - create_movement step_02 - create_movement step_03 - create_movement slow_step_down - create_movement slow_step_up - create_movement slow_step_left - create_movement slow_step_right - create_movement step_down - create_movement step_up - create_movement step_left - create_movement step_right - create_movement fast_step_down - create_movement fast_step_up - create_movement fast_step_left - create_movement fast_step_right - create_movement step_10 - create_movement step_11 - create_movement step_12 - create_movement step_13 - create_movement step_14 - create_movement step_15 - create_movement step_16 - create_movement step_17 - create_movement step_18 - create_movement step_19 - create_movement step_1a - create_movement step_1b - create_movement step_1c - create_movement step_1d - create_movement step_1e - create_movement step_1f - create_movement step_20 - create_movement step_21 - create_movement step_22 - create_movement step_23 - create_movement step_24 - create_movement step_25 - create_movement step_26 - create_movement step_27 - create_movement step_28 - create_movement step_29 - create_movement step_2a - create_movement step_2b - create_movement step_2c - create_movement step_2d - create_movement step_2e - create_movement step_2f - create_movement step_30 - create_movement step_31 - create_movement step_32 - create_movement step_33 - create_movement step_34 - create_movement step_35 - create_movement step_36 - create_movement step_37 - create_movement step_38 - create_movement step_39 - create_movement step_3a - create_movement step_3b - create_movement step_3c - create_movement step_3d - create_movement step_3e - create_movement step_3f - create_movement step_40 + create_movement face_down + create_movement face_up + create_movement face_left + create_movement face_right + create_movement face_down_2 @ TODO: distinction between this and above set + create_movement face_up_2 + create_movement face_left_2 + create_movement face_right_2 + create_movement walk_slowest_down + create_movement walk_slowest_up + create_movement walk_slowest_left + create_movement walk_slowest_right + create_movement walk_slow_down + create_movement walk_slow_up + create_movement walk_slow_left + create_movement walk_slow_right + create_movement walk_down + create_movement walk_up + create_movement walk_left + create_movement walk_right + create_movement jump_2_down + create_movement jump_2_up + create_movement jump_2_left + create_movement jump_2_right + create_movement delay_1 + create_movement delay_2 + create_movement delay_4 + create_movement delay_8 + create_movement delay_16 + create_movement walk_fast_down + create_movement walk_fast_up + create_movement walk_fast_left + create_movement walk_fast_right + create_movement walk_in_place_slow_down + create_movement walk_in_place_slow_up + create_movement walk_in_place_slow_left + create_movement walk_in_place_slow_right + create_movement walk_in_place_down + create_movement walk_in_place_up + create_movement walk_in_place_left + create_movement walk_in_place_right + create_movement walk_in_place_fast_down + create_movement walk_in_place_fast_up + create_movement walk_in_place_fast_left + create_movement walk_in_place_fast_right + create_movement walk_in_place_fastest_down + create_movement walk_in_place_fastest_up + create_movement walk_in_place_fastest_left + create_movement walk_in_place_fastest_right + create_movement ride_water_current_down + create_movement ride_water_current_up + create_movement ride_water_current_left + create_movement ride_water_current_right + create_movement walk_fastest_down + create_movement walk_fastest_up + create_movement walk_fastest_left + create_movement walk_fastest_right + create_movement slide_down + create_movement slide_up + create_movement slide_left + create_movement slide_right + create_movement player_run_down + create_movement player_run_up + create_movement player_run_left + create_movement player_run_right create_movement step_41 create_movement step_42 create_movement step_43 @@ -80,38 +80,38 @@ create_movement step_47 create_movement step_48 create_movement step_49 - create_movement step_4a - create_movement step_4b - create_movement step_4c - create_movement step_4d - create_movement step_4e - create_movement step_4f - create_movement step_50 - create_movement step_51 - create_movement step_52 - create_movement step_53 - create_movement step_54 - create_movement step_55 - create_movement step_56 - create_movement step_57 - create_movement step_58 - create_movement step_59 - create_movement step_5a - create_movement step_5b + create_movement face_player + create_movement face_away_player + create_movement lock_facing_direction + create_movement unlock_facing_direction + create_movement jump_down + create_movement jump_up + create_movement jump_left + create_movement jump_right + create_movement jump_in_place_down + create_movement jump_in_place_up + create_movement jump_in_place_left + create_movement jump_in_place_right + create_movement jump_in_place_down_up + create_movement jump_in_place_up_down + create_movement jump_in_place_left_right + create_movement jump_in_place_right_left + create_movement face_original_direction + create_movement nurse_joy_bow create_movement step_5c create_movement step_5d - create_movement step_5e - create_movement step_5f + create_movement disable_anim + create_movement restore_anim create_movement set_invisible - create_movement step_61 - create_movement step_62 - create_movement step_63 - create_movement step_64 - create_movement step_65 + create_movement set_visible + create_movement emote_exclamation_mark + create_movement emote_question_mark + create_movement emote_x + create_movement emote_double_exclamation_mark create_movement step_66 create_movement step_67 - create_movement step_68 - create_movement step_69 + create_movement rock_smash_break + create_movement cut_tree enum_start 0x91 create_movement step_91 diff --git a/data/event_scripts.s b/data/event_scripts.s index 21049f296..10b6ae676 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2050,7 +2050,7 @@ EventScript_1A74F2:: @ 81A74F2 return EventScript_1A7506:: @ 81A7506 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75FE + applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 waitmovement 0 playse SE_DOOR call EventScript_1A7538 @@ -2059,7 +2059,7 @@ EventScript_1A7506:: @ 81A7506 return EventScript_1A751F:: @ 81A751F - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75F3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5 waitmovement 0 setflag FLAG_TEMP_2 playse SE_KI_GASYAN @@ -2083,7 +2083,7 @@ EventScript_1A754B:: @ 81A754B end EventScript_1A7563:: @ 81A7563 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75FE + applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 4, 654, 1 @@ -2107,91 +2107,14 @@ EventScript_1A759C:: @ 81A759C return Movement_1A75D3:: @ 81A75D3 - step_11 + walk_up step_end EventScript_1A75D5:: @ 81A75D5 special Special_PokemonLeagueLightingEffect return -Movement_1A75D9:: @ 81A75D9 - step_63 - step_end - -Movement_1A75DB:: @ 81A75DB - step_62 - step_end - -Movement_1A75DD:: @ 81A75DD - step_1c - step_1c - step_1c - step_end - -Movement_1A75E1:: @ 81A75E1 - step_4a - step_end - -Movement_1A75E3:: @ 81A75E3 - step_4b - step_end - -Movement_1A75E5:: @ 81A75E5 - step_5a - step_end - -Movement_1A75E7:: @ 81A75E7 - step_2f - step_end - -Movement_1A75E9:: @ 81A75E9 - step_2e - step_end - -Movement_1A75EB:: @ 81A75EB - step_30 - step_end - -Movement_1A75ED:: @ 81A75ED - step_2d - step_end - -Movement_1A75EF:: @ 81A75EF - step_03 - step_end - -Movement_1A75F1:: @ 81A75F1 - step_00 - step_end - -Movement_1A75F3:: @ 81A75F3 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end - -Movement_1A75F9:: @ 81A75F9 - step_11 - step_11 - step_11 - step_11 - step_end - -Movement_1A75FE:: @ 81A75FE - step_1c - step_1c - step_end - -Movement_1A7601:: @ 81A7601 - step_11 - step_end - -Movement_1A7603:: @ 81A7603 - step_11 - step_11 - step_end + .include "data/scripts/movement.inc" gUnknown_81A7606:: @ 81A7606 msgbox gUnknown_81C0DB0, MSGBOX_SIGN @@ -2326,12 +2249,12 @@ gUnknown_81A7702:: @ 81A7702 end EventScript_1A774D:: @ 81A774D - applymovement VAR_0x8008, Movement_1A75F1 + applymovement VAR_0x8008, Movement_FaceDown waitmovement 0 playse SE_PIN - applymovement VAR_0x8008, Movement_1A75DB + applymovement VAR_0x8008, Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, Movement_1A75DD + applymovement VAR_0x8008, Movement_Delay48 waitmovement 0 msgbox Text_1A62D3 setflag FLAG_SYS_MYSTERY_GIFT_ENABLED @@ -2348,7 +2271,7 @@ EventScript_1A778A:: @ 81A778A end EventScript_1A778C:: @ 81A778C - applymovement VAR_0x8008, Movement_1A75F1 + applymovement VAR_0x8008, Movement_FaceDown waitmovement 0 msgbox Text_1A6265 releaseall @@ -2509,7 +2432,7 @@ EventScript_1A795F:: @ 81A795F EventScript_1A796E:: @ 81A796E textcolor 0 - applymovement VAR_0x8009, Movement_1A75E7 + applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft waitmovement 0 switch VAR_0x4001 case 1, EventScript_1A79D8 @@ -2576,7 +2499,7 @@ EventScript_1A7A50:: @ 81A7A50 msgbox Text_1A5776 closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 - applymovement VAR_0x8009, Movement_1A75ED + applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown waitmovement 0 releaseall end @@ -2589,7 +2512,7 @@ EventScript_1A7A77:: @ 81A7A77 closemessage waitse applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 - applymovement VAR_0x8009, Movement_1A75ED + applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown waitmovement 0 releaseall end @@ -2611,7 +2534,7 @@ EventScript_1A7AA8:: @ 81A7AA8 end Movement_1A7AB7:: @ 81A7AB7 - step_10 + walk_down step_end EventScript_1A7AB9:: @ 81A7AB9 @@ -2853,16 +2776,16 @@ EventScript_1A8025:: @ 81A8025 EventScript_1A80FE:: @ 81A80FE lockall - applymovement VAR_0x8004, Movement_1A75E7 + applymovement VAR_0x8004, Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 - applymovement VAR_0x8004, Movement_1A75E9 + applymovement VAR_0x8004, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 - applymovement VAR_0x8004, Movement_1A75EB + applymovement VAR_0x8004, Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - applymovement VAR_0x8004, Movement_1A75ED + applymovement VAR_0x8004, Movement_WalkInPlaceFastestDown waitmovement 0 delay 20 releaseall @@ -3682,7 +3605,7 @@ EventScript_1A8DCF:: @ 81A8DCF EventScript_MomHeal:: @ 81A8DD8 lockall textcolor 1 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Text_1A5FDF call EventScript_FadeOut_Heal_FadeIn @@ -3893,14 +3816,14 @@ EventScript_1A90F6:: @ 81A90F6 EventScript_1A9108:: @ 81A9108 closemessage - applymovement 6, Movement_1A75E5 + applymovement 6, Movement_FaceOriginalDirection applymovement OBJ_EVENT_ID_PLAYER, Movement_1A911C waitmovement 0 releaseall end Movement_1A911C:: @ 81A911C - step_11 + walk_up step_end EventScript_1A911E:: @ 81A911E @@ -4231,12 +4154,12 @@ FourIsland_House2_EventScript_1B2938:: @ 81B2938 EventScript_1B2951:: @ 81B2951 setflag FLAG_MET_STICKER_LADY msgbox gUnknown_81B1EB3 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 goto_if eq, EventScript_1B2B8E @@ -4248,7 +4171,7 @@ EventScript_1B2993:: @ 81B2993 end EventScript_1B2994:: @ 81B2994 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 special sub_8110AB4 compare VAR_RESULT, 2 @@ -5331,9 +5254,9 @@ EventScript_1C508F:: EventScript_1C50C2: setvar VAR_0x8004, 19 special sub_815D9E8 - applymovement 3, Movement_1A75DB + applymovement 3, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_1A75DD + applymovement 3, Movement_Delay48 waitmovement 0 setvar VAR_0x400E, 1 applymovement 3, Movement_1C5541 @@ -5373,9 +5296,9 @@ EventScript_1C515C:: @ 81C515C EventScript_1C5182: setvar VAR_0x8004, 19 special sub_815D9E8 - applymovement 4, Movement_1A75DB + applymovement 4, Movement_ExclamationMark waitmovement 0 - applymovement 4, Movement_1A75DD + applymovement 4, Movement_Delay48 waitmovement 0 applymovement 4, Movement_1C5546 waitmovement 0 @@ -5384,9 +5307,9 @@ EventScript_1C5182: EventScript_1C51AD:: @ 81C51AD setvar VAR_0x8004, 19 special sub_815D9E8 - applymovement 2, Movement_1A75DB + applymovement 2, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_1A75DD + applymovement 2, Movement_Delay48 waitmovement 0 applymovement 2, Movement_1C5549 waitmovement 0 @@ -5395,9 +5318,9 @@ EventScript_1C51AD:: @ 81C51AD EventScript_1C51D8:: @ 81C51D8 setvar VAR_0x8004, 19 special sub_815D9E8 - applymovement 3, Movement_1A75DB + applymovement 3, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_1A75DD + applymovement 3, Movement_Delay48 waitmovement 0 applymovement 3, Movement_1C5542 waitmovement 0 @@ -5592,9 +5515,9 @@ SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 - applymovement 2, Movement_1A75DB + applymovement 2, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_1A75DD + applymovement 2, Movement_Delay48 goto EventScript_1C551B SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA @@ -5612,9 +5535,9 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 - applymovement 5, Movement_1A75DB + applymovement 5, Movement_ExclamationMark waitmovement 0 - applymovement 5, Movement_1A75DD + applymovement 5, Movement_Delay48 EventScript_1C551B: waitmovement 0 setvar VAR_0x400F, 1 @@ -5631,33 +5554,33 @@ EventScript_1C5528:: @ 81C5528 end Movement_1C5541: - step_12 + walk_left Movement_1C5542:: @ 81C5542 - step_12 - step_12 + walk_left + walk_left Movement_1C5544: - step_12 + walk_left step_end Movement_1C5546:: @ 81C5546 - step_11 - step_11 + walk_up + walk_up step_end Movement_1C5549:: @ 81C5549 - step_10 - step_10 + walk_down + walk_down step_end Movement_1C554C:: @ 81C554C - step_13 + walk_right Movement_1C554D: - step_11 - step_00 + walk_up + face_down step_end Movement_1C5550:: @ 81C5550 - step_00 + face_down step_end EventScript_1C5550:: @ 81C5552 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 3598526ce..582d33d57 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -118,11 +118,11 @@ EventScript_165348:: @ 8165348 end Movement_165353:: @ 8165353 - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_slowest_down + walk_slowest_down + walk_slowest_down + walk_slowest_down + walk_slowest_down + walk_slowest_down + walk_slowest_down step_end diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index 6c8aea741..ba8a9fa51 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -33,7 +33,7 @@ CeladonCity_EventScript_166CC5:: @ 8166CC5 faceplayer msgbox gUnknown_818001B closemessage - applymovement 2, Movement_1A75E5 + applymovement 2, Movement_FaceOriginalDirection waitmovement 0 release end @@ -46,7 +46,7 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC msgbox gUnknown_8180075 closemessage waitmoncry - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index d71aa6e3d..aa2740e3c 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -114,7 +114,7 @@ CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA EventScript_16C7CA:: @ 816C7CA closemessage - applymovement VAR_LAST_TALKED, Movement_1A75E5 + applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection waitmovement 0 release end @@ -453,23 +453,23 @@ EventScript_16CB3F:: @ 816CB3F return Movement_16CB4A:: @ 816CB4A - step_10 - step_13 - step_13 - step_11 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_right + walk_right + walk_up + walk_right + walk_right + walk_right + walk_right step_end Movement_16CB53:: @ 816CB53 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 675a9a558..b31b09ec2 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -97,75 +97,75 @@ EventScript_1665B5:: @ 81665B5 return Movement_1665C7:: @ 81665C7 - step_1c - step_1b - step_30 - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_down step_end Movement_1665CD:: @ 81665CD - step_1c - step_1b - step_2f - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end Movement_1665D3:: @ 81665D3 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_1665D9:: @ 81665D9 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1c - step_1c - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1665EA:: @ 81665EA - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1c - step_1c - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1665FB:: @ 81665FB - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end CeruleanCity_EventScript_166603:: @ 8166603 @@ -207,9 +207,9 @@ EventScript_166677:: @ 8166677 CeruleanCity_EventScript_166683:: @ 8166683 lockall setvar VAR_0x4001, 0 - applymovement 2, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 goto EventScript_1666C3 end @@ -217,9 +217,9 @@ CeruleanCity_EventScript_166683:: @ 8166683 CeruleanCity_EventScript_1666A3:: @ 81666A3 lockall setvar VAR_0x4001, 1 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 goto EventScript_1666C3 end @@ -238,7 +238,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7 faceplayer msgbox gUnknown_817F0F1 closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -274,7 +274,7 @@ CeruleanCity_EventScript_166738:: @ 8166738 faceplayer msgbox gUnknown_817F2CF closemessage - applymovement 11, Movement_1A75E5 + applymovement 11, Movement_FaceOriginalDirection waitmovement 0 release end @@ -292,7 +292,7 @@ CeruleanCity_EventScript_16674F:: @ 816674F waitmessage delay 40 playse SE_PIN - applymovement 5, Movement_1A75D9 + applymovement 5, Movement_QuestionMark waitmovement 0 delay 30 compare VAR_0x8008, 0 diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index 174bf6a7c..a720d9098 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -49,7 +49,7 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89 end EventScript_CeruleanCity_House4_NewsNotSpread:: @ 816ADAF - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_8192CD5 release @@ -74,7 +74,7 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9 end EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_8192EC5 release @@ -82,11 +82,11 @@ EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 return diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index ea7fde438..8c7e882d0 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -82,12 +82,12 @@ EventScript_166FA0:: @ 8166FA0 end Movement_166FC6:: @ 8166FC6 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end EventScript_166FCD:: @ 8166FCD @@ -98,9 +98,9 @@ EventScript_166FCD:: @ 8166FCD checkflag FLAG_TEMP_2 call_if TRUE, EventScript_16703D playse SE_PIN - applymovement 3, Movement_1A75DB + applymovement 3, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_1A75DD + applymovement 3, Movement_Delay48 waitmovement 0 checkflag FLAG_TEMP_2 call_if FALSE, EventScript_167048 @@ -115,12 +115,12 @@ EventScript_166FCD:: @ 8166FCD end EventScript_167032:: @ 8167032 - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_16703D:: @ 816703D - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -132,7 +132,7 @@ EventScript_167048:: @ 8167048 EventScript_167053:: @ 8167053 applymovement 3, Movement_1671A6 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -162,13 +162,13 @@ EventScript_1670A0:: @ 81670A0 return Movement_1670AB:: @ 81670AB - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end EventScript_1670B3:: @ 81670B3 @@ -184,19 +184,19 @@ EventScript_1670B3:: @ 81670B3 return Movement_1670DB:: @ 81670DB - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end Movement_1670DE:: @ 81670DE - step_1c - step_12 - step_2e + delay_16 + walk_left + walk_in_place_fastest_up step_end Movement_1670E2:: @ 81670E2 - step_11 - step_1a + walk_up + delay_4 set_invisible step_end @@ -254,79 +254,79 @@ EventScript_167183:: @ 8167183 return Movement_167195:: @ 8167195 - step_1c - step_1c - step_1f - step_1f - step_12 - step_left - step_left + delay_16 + delay_16 + walk_fast_left + walk_fast_left + walk_left + walk_slowest_left + walk_slowest_left step_end Movement_16719D:: @ 816719D - step_13 - step_10 - step_10 - step_13 - step_1a + walk_right + walk_down + walk_down + walk_right + delay_4 set_invisible step_end Movement_1671A4:: @ 81671A4 - step_11 + walk_up step_end Movement_1671A6:: @ 81671A6 - step_12 - step_12 - step_12 + walk_left + walk_left + walk_left step_end Movement_1671AA:: @ 81671AA - step_1c - step_1c - step_1b - step_30 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right step_end Movement_1671AF:: @ 81671AF - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_1671B6:: @ 81671B6 - step_13 - step_1a + walk_right + delay_4 set_invisible step_end Movement_1671BA:: @ 81671BA - step_10 - step_13 - step_10 - step_10 - step_30 - step_1a - step_13 - step_1a + walk_down + walk_right + walk_down + walk_down + walk_in_place_fastest_right + delay_4 + walk_right + delay_4 set_invisible step_end Movement_1671C4:: @ 81671C4 - step_13 - step_1a - step_13 - step_1a + walk_right + delay_4 + walk_right + delay_4 set_invisible step_end CinnabarIsland_EventScript_1671CA:: @ 81671CA lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 msgbox gUnknown_8180B20 @@ -337,7 +337,7 @@ CinnabarIsland_EventScript_1671CA:: @ 81671CA end Movement_1671ED:: @ 81671ED - step_10 + walk_down step_end CinnabarIsland_EventScript_1671EF:: @ 81671EF diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 6264b5f50..9b1c42a45 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -289,24 +289,24 @@ EventScript_16DC7A:: @ 816DC7A end EventScript_16DCB4:: @ 816DCB4 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 1, Movement_16DCD8 waitmovement 0 return EventScript_16DCC6:: @ 816DCC6 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 1, Movement_16DCDB waitmovement 0 return Movement_16DCD8:: @ 816DCD8 - step_12 - step_12 + walk_left + walk_left step_end Movement_16DCDB:: @ 816DCDB - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD @@ -380,21 +380,21 @@ EventScript_16DD9D:: @ 816DD9D return Movement_16DDAF:: @ 816DDAF - step_11 - step_11 - step_12 + walk_up + walk_up + walk_left step_end Movement_16DDB3:: @ 816DDB3 - step_11 - step_11 - step_2f + walk_up + walk_up + walk_in_place_fastest_left step_end Movement_16DDB7:: @ 816DDB7 - step_1c - step_1c - step_30 + delay_16 + delay_16 + walk_in_place_fastest_right step_end CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB @@ -456,24 +456,24 @@ EventScript_16DE2F:: @ 816DE2F end EventScript_16DE69:: @ 816DE69 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 4, Movement_16DE8D waitmovement 0 return EventScript_16DE7B:: @ 816DE7B - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 4, Movement_16DE90 waitmovement 0 return Movement_16DE8D:: @ 816DE8D - step_12 - step_12 + walk_left + walk_left step_end Movement_16DE90:: @ 816DE90 - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92 @@ -535,24 +535,24 @@ EventScript_16DF06:: @ 816DF06 end EventScript_16DF40:: @ 816DF40 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 5, Movement_16DF64 waitmovement 0 return EventScript_16DF52:: @ 816DF52 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 5, Movement_16DF67 waitmovement 0 return Movement_16DF64:: @ 816DF64 - step_12 - step_12 + walk_left + walk_left step_end Movement_16DF67:: @ 816DF67 - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69 @@ -614,24 +614,24 @@ EventScript_16DFDD:: @ 816DFDD end EventScript_16E017:: @ 816E017 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 6, Movement_16E03B waitmovement 0 return EventScript_16E029:: @ 816E029 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 6, Movement_16E03E waitmovement 0 return Movement_16E03B:: @ 816E03B - step_12 - step_12 + walk_left + walk_left step_end Movement_16E03E:: @ 816E03E - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16E040:: @ 816E040 @@ -693,24 +693,24 @@ EventScript_16E0B4:: @ 816E0B4 end EventScript_16E0EE:: @ 816E0EE - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 7, Movement_16E112 waitmovement 0 return EventScript_16E100:: @ 816E100 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 7, Movement_16E115 waitmovement 0 return Movement_16E112:: @ 816E112 - step_12 - step_12 + walk_left + walk_left step_end Movement_16E115:: @ 816E115 - step_12 + walk_left step_end EventScript_16E117:: @ 816E117 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index c7f786221..def1c9e63 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -77,68 +77,68 @@ EventScript_16E9A5:: @ 816E9A5 end Movement_16E9AF:: @ 816E9AF - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_1b + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + delay_8 set_invisible step_end Movement_16E9B9:: @ 816E9B9 - step_10 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_1c - step_10 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + delay_16 + walk_down step_end Movement_16E9C3:: @ 816E9C3 - step_11 - step_12 - step_12 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_1b + walk_up + walk_left + walk_left + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + delay_8 set_invisible step_end Movement_16E9CF:: @ 816E9CF - step_1c - step_1c - step_1c - step_02 - step_1c - step_12 - step_12 - step_12 - step_10 - step_10 - step_1b - step_10 - step_1b + delay_16 + delay_16 + delay_16 + face_left + delay_16 + walk_left + walk_left + walk_left + walk_down + walk_down + delay_8 + walk_down + delay_8 set_invisible step_end Movement_16E9DE:: @ 816E9DE - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_1c - step_10 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + delay_16 + walk_down step_end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 4d115868c..54dc63546 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -51,16 +51,16 @@ EventScript_164CB6:: @ 8164CB6 end Movement_164CC0:: @ 8164CC0 - step_12 - step_1c - step_13 - step_1c - step_2e - step_1c - step_2d + walk_left + delay_16 + walk_right + delay_16 + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_down step_end Movement_164CC8:: @ 8164CC8 - step_10 - step_10 + walk_down + walk_down step_end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 8268e207f..5bc9fbeea 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -9,11 +9,11 @@ FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 goto_if TRUE, EventScript_168A22 msgbox gUnknown_818B02E closemessage - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 delay 45 msgbox gUnknown_818B03C - applymovement 1, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_818B05E release @@ -61,10 +61,10 @@ EventScript_168A9B:: @ 8168A9B removeitem ITEM_LEMONADE, 1 msgbox gUnknown_818B13E closemessage - applymovement 1, Movement_1A75EB + applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 delay 45 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 textcolor 0 msgbox gUnknown_818B171 @@ -77,7 +77,7 @@ EventScript_168A9B:: @ 8168A9B EventScript_168AE8:: @ 8168AE8 msgbox gUnknown_818B219 - applymovement 1, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR return diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 85b89604d..c60348e8b 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -20,7 +20,7 @@ EventScript_168808:: @ 8168808 textcolor 1 msgbox gUnknown_818A7DB closemessage - applymovement 8, Movement_1A75E9 + applymovement 8, Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 39, 8 waitdooranim @@ -35,7 +35,7 @@ EventScript_168808:: @ 8168808 end Movement_168841:: @ 8168841 - step_11 + walk_up set_invisible step_end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index d35680360..bc4807028 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -45,7 +45,7 @@ EventScript_171F34:: @ 8171F34 waitmovement 0 textcolor 0 msgbox gUnknown_81A450B - applymovement 1, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 1 msgbox gUnknown_81A4521 @@ -71,25 +71,25 @@ EventScript_171F34:: @ 8171F34 end EventScript_171FCD:: @ 8171FCD - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown applymovement 2, Movement_17204D waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_171FE9:: @ 8171FE9 applymovement 2, Movement_172055 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_171FFE:: @ 8171FFE - applymovement 1, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestLeft applymovement 2, Movement_172059 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -114,34 +114,34 @@ EventScript_172043:: @ 8172043 end Movement_17204D:: @ 817204D - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_30 + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end Movement_172055:: @ 8172055 - step_12 - step_12 - step_2d + walk_left + walk_left + walk_in_place_fastest_down step_end Movement_172059:: @ 8172059 - step_12 - step_12 - step_12 - step_10 + walk_left + walk_left + walk_left + walk_down step_end Movement_17205E:: @ 817205E - step_11 + walk_up step_end Movement_172060:: @ 8172060 - step_25 + walk_in_place_down step_end FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 2546df203..7ef19e499 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -36,7 +36,7 @@ FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78 FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 lockall - applymovement 4, Movement_1A75E7 + applymovement 4, Movement_WalkInPlaceFastestLeft waitmovement 0 setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 releaseall @@ -95,7 +95,7 @@ EventScript_16402F:: @ 816402F end EventScript_164065:: @ 8164065 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -143,7 +143,7 @@ EventScript_1640A2:: @ 81640A2 EventScript_16412E:: @ 816412E compare VAR_0x8004, 27 goto_if eq, EventScript_1A77A9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -158,27 +158,27 @@ EventScript_16414F:: @ 816414F return EventScript_16415A:: @ 816415A - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_164165:: @ 8164165 - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_164170:: @ 8164170 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 return Movement_16417B:: @ 816417B - step_13 - step_13 - step_2e + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_16417F:: @ 816417F - step_13 - step_2e + walk_right + walk_in_place_fastest_up step_end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 4f472100f..074e92f3f 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -29,12 +29,12 @@ FourIsland_OnFrame:: @ 8167CE2 EventScript_167CEC:: @ 8167CEC lockall textcolor 0 - applymovement 10, Movement_1A75ED + applymovement 10, Movement_WalkInPlaceFastestDown waitmovement 0 playbgm MUS_RIVAL1, 0 - applymovement 10, Movement_1A75DB + applymovement 10, Movement_ExclamationMark waitmovement 0 - applymovement 10, Movement_1A75DD + applymovement 10, Movement_Delay48 waitmovement 0 delay 25 applymovement 10, Movement_167D49 @@ -53,21 +53,21 @@ EventScript_167CEC:: @ 8167CEC end Movement_167D49:: @ 8167D49 - step_13 - step_13 - step_10 - step_10 + walk_right + walk_right + walk_down + walk_down step_end Movement_167D4E:: @ 8167D4E - step_1c - step_1a - step_10 + delay_16 + delay_4 + walk_down step_end Movement_167D52:: @ 8167D52 - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end FourIsland_EventScript_167D55:: @ 8167D55 diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 3fb3eb91e..a7bb1bade 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -21,19 +21,19 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 msgbox gUnknown_817B0B9 closemessage playse SE_PIN - applymovement 3, Movement_1A75DB + applymovement 3, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 3, Movement_1A75DD + applymovement 3, Movement_Delay48 waitmovement 0 textcolor 1 msgbox gUnknown_817B109 closemessage - applymovement 3, Movement_1A75EB + applymovement 3, Movement_WalkInPlaceFastestRight waitmovement 0 delay 18 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 delay 35 applymovement 4, Movement_163F11 @@ -77,7 +77,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 delay 50 applymovement 3, Movement_163F23 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 textcolor 1 msgbox gUnknown_817B457 @@ -88,103 +88,103 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 end Movement_163EDD:: @ 8163EDD - step_11 - step_11 - step_13 - step_11 + walk_up + walk_up + walk_right + walk_up step_end Movement_163EE2:: @ 8163EE2 - step_1c - step_2f - step_1c - step_1c - step_2d + delay_16 + walk_in_place_fastest_left + delay_16 + delay_16 + walk_in_place_fastest_down step_end Movement_163EE8:: @ 8163EE8 - step_25 + walk_in_place_down step_end gUnknown_163EEA:: @ 8163EEA - step_4c - step_13 - step_4d + lock_facing_direction + walk_right + unlock_facing_direction step_end Movement_163EEE:: @ 8163EEE - step_29 + walk_in_place_fast_down step_end Movement_163EF0:: @ 8163EF0 - step_13 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_right + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_163EFA:: @ 8163EFA - step_1c - step_12 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + delay_16 + walk_left + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_163F05:: @ 8163F05 - step_1c - step_10 - step_1c - step_10 - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d + delay_16 + walk_down + delay_16 + walk_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_163F11:: @ 8163F11 - step_1c - step_1b - step_30 + delay_16 + delay_8 + walk_in_place_fastest_right step_end Movement_163F15:: @ 8163F15 - step_12 - step_12 + walk_left + walk_left step_end Movement_163F18:: @ 8163F18 - step_12 - step_11 + walk_left + walk_up step_end Movement_163F1B:: @ 8163F1B - step_26 + walk_in_place_up step_end Movement_163F1D:: @ 8163F1D - step_1b - step_30 - step_1c - step_1c - step_2d + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_down step_end Movement_163F23:: @ 8163F23 - step_13 + walk_right step_end FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 57def4833..18dcf65fa 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -161,25 +161,25 @@ EventScript_171B67:: @ 8171B67 end Movement_171B71:: @ 8171B71 - step_1c - step_1c - step_03 - step_1c - step_1c - step_02 - step_1c - step_1c - step_01 - step_up + delay_16 + delay_16 + face_right + delay_16 + delay_16 + face_left + delay_16 + delay_16 + face_up + walk_slowest_up set_invisible - step_1c - step_1c - step_1c - step_1c - step_1c - step_00 - step_61 - step_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_down + set_visible + walk_slowest_down step_end EventScript_171B85:: @ 8171B85 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 0f0a80566..8d248b5d0 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -59,22 +59,22 @@ EventScript_16D345:: @ 816D345 end Movement_16D362:: @ 816D362 - step_10 - step_10 + walk_down + walk_down step_end Movement_16D365:: @ 816D365 - step_11 + walk_up step_end Movement_16D367:: @ 816D367 - step_10 - step_10 + walk_down + walk_down step_end Movement_16D36A:: @ 816D36A - step_10 - step_1b + walk_down + delay_8 step_end FuchsiaCity_SafariZone_Entrance_EventScript_16D36D:: @ 816D36D @@ -98,7 +98,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385 EventScript_16D391:: @ 816D391 textcolor 0 msgbox gUnknown_8197C6B - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO @@ -176,24 +176,24 @@ EventScript_16D49A:: @ 816D49A end Movement_16D4AA:: @ 816D4AA - step_10 + walk_down step_end Movement_16D4AC:: @ 816D4AC - step_11 - step_11 + walk_up + walk_up step_end Movement_16D4AF:: @ 816D4AF - step_11 - step_12 - step_11 + walk_up + walk_left + walk_up step_end Movement_16D4B3:: @ 816D4B3 - step_11 - step_13 - step_11 + walk_up + walk_right + walk_up step_end FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 99f5005c8..a24aa524a 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -83,103 +83,103 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264 end Movement_167311:: @ 8167311 - step_3d - step_3d - step_3d - step_3d - step_3d - step_3d + player_run_down + player_run_down + player_run_down + player_run_down + player_run_down + player_run_down step_end Movement_167318:: @ 8167318 - step_10 - step_10 + walk_down + walk_down step_end Movement_16731B:: @ 816731B - step_1c - step_1a - step_2d + delay_16 + delay_4 + walk_in_place_fastest_down step_end Movement_16731F:: @ 816731F - step_1b - step_30 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2d + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down step_end Movement_16732E:: @ 816732E - step_13 - step_1c - step_10 - step_10 - step_1c - step_1c + walk_right + delay_16 + walk_down + walk_down + delay_16 + delay_16 step_end Movement_167335:: @ 8167335 - step_2d + walk_in_place_fastest_down step_end Movement_167337:: @ 8167337 - step_03 - step_4c - step_12 - step_4d + face_right + lock_facing_direction + walk_left + unlock_facing_direction step_end Movement_16733C:: @ 816733C - step_2e + walk_in_place_fastest_up step_end Movement_16733E:: @ 816733E - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_167346:: @ 8167346 - step_1d + walk_fast_down step_end Movement_167348:: @ 8167348 - step_2f - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2d - step_1c - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_in_place_fastest_left + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down + delay_16 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_16735D:: @ 816735D - step_10 + walk_down step_end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index b43644467..44ca7e479 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -39,7 +39,7 @@ EventScript_16399E:: @ 816399E end EventScript_1639A8:: @ 81639A8 - applymovement 2, Movement_1A75E1 + applymovement 2, Movement_FacePlayer waitmovement 0 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA06 @@ -69,7 +69,7 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 goto_if eq, EventScript_163A25 msgbox gUnknown_817A88C closemessage - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end @@ -96,18 +96,18 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E message Text_17A8EE waitmessage playse SE_PIN - applymovement 3, Movement_1A75D9 + applymovement 3, Movement_QuestionMark waitmovement 0 waitbuttonpress msgbox gUnknown_817A970 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 2, Movement_1A75DB + applymovement 2, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_1A75DD + applymovement 2, Movement_Delay48 waitmovement 0 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 call EventScript_163960 msgbox gUnknown_817A9E1 diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 99360a55a..3d2e317e2 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -14,7 +14,7 @@ EventScript_1606A9:: @ 81606A9 MtMoon_B2F_EventScript_1606B0:: @ 81606B0 lockall - applymovement 3, Movement_1A75EB + applymovement 3, Movement_WalkInPlaceFastestRight waitmovement 0 call EventScript_1606DD releaseall @@ -80,10 +80,10 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B end Movement_16077A:: @ 816077A - step_13 - step_11 - step_11 - step_11 + walk_right + walk_up + walk_up + walk_up step_end MtMoon_B2F_EventScript_16077F:: @ 816077F @@ -117,9 +117,9 @@ EventScript_1607DE:: @ 81607DE end Movement_1607E0:: @ 81607E0 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end MtMoon_B2F_EventScript_1607E4:: @ 81607E4 diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 09d6cdc38..f881628e2 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -96,35 +96,35 @@ EventScript_1650C2:: @ 81650C2 end Movement_1650CD:: @ 81650CD - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end Movement_1650D1:: @ 81650D1 - step_1c - step_1c - step_10 - step_10 - step_10 + delay_16 + delay_16 + walk_down + walk_down + walk_down step_end Movement_1650D7:: @ 81650D7 - step_10 - step_10 - step_10 - step_10 - step_10 - step_25 - step_1c - step_1c + walk_down + walk_down + walk_down + walk_down + walk_down + walk_in_place_down + delay_16 + delay_16 step_end Movement_1650E0:: @ 81650E0 - step_1c - step_1c - step_25 - step_25 - step_25 - step_25 + delay_16 + delay_16 + walk_in_place_down + walk_in_place_down + walk_in_place_down + walk_in_place_down step_end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index bddc46721..3e6f39413 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -36,47 +36,47 @@ EventScript_16749D:: @ 816749D end Movement_1674F4:: @ 81674F4 - step_11 - step_11 - step_11 - step_11 - step_11 - step_13 - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_167501:: @ 8167501 - step_11 - step_11 + walk_up + walk_up set_invisible step_end Movement_167505:: @ 8167505 - step_11 + walk_up step_end Movement_167507:: @ 8167507 - step_11 - step_11 - step_11 - step_11 - step_13 - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_167514:: @ 8167514 - step_11 + walk_up set_invisible step_end diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 744445bc5..fb6e9286e 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -27,9 +27,9 @@ EventScript_17139C:: @ 817139C end Movement_1713B9:: @ 81713B9 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end OneIsland_Harbor_EventScript_1713BD:: @ 81713BD diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 717f2c2cd..d2a049acb 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -65,48 +65,48 @@ EventScript_170CB1:: @ 8170CB1 applymovement 2, Movement_170E86 waitmovement 0 msgbox gUnknown_81A0CDE - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN - applymovement 3, Movement_1A75DB + applymovement 3, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 3, Movement_1A75DD + applymovement 3, Movement_Delay48 waitmovement 0 msgbox gUnknown_81A0CF7 msgbox gUnknown_81A0D27 - applymovement 2, Movement_1A75ED - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A0D72 - applymovement 2, Movement_1A75EB + applymovement 2, Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 checkflag FLAG_SYS_GAME_CLEAR call_if TRUE, EventScript_170E34 checkflag FLAG_SYS_GAME_CLEAR call_if FALSE, EventScript_170E3D - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A0E17 msgbox gUnknown_81A0E90 - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox gUnknown_81A0ECC closemessage - applymovement 2, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A0F40 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A0FB1 giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 additem ITEM_METEORITE, 1 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A1113 additem ITEM_TRI_PASS, 1 @@ -119,9 +119,9 @@ EventScript_170CB1:: @ 8170CB1 setflag FLAG_SYS_SEVII_MAP_123 msgbox gUnknown_81A1230 closemessage - applymovement 2, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_SYS_PC_STORAGE_DISABLED setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 @@ -153,34 +153,34 @@ EventScript_170E58:: @ 8170E58 return Movement_170E7D:: @ 8170E7D - step_11 - step_11 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_170E86:: @ 8170E86 - step_11 - step_13 - step_13 - step_13 - step_13 - step_13 - step_11 - step_30 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_in_place_fastest_right step_end Movement_170E8F:: @ 8170E8F - step_11 + walk_up step_end Movement_170E91:: @ 8170E91 - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 @@ -199,7 +199,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D end EventScript_170EB1:: @ 8170EB1 - applymovement 2, Movement_1A75E1 + applymovement 2, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A128C release @@ -227,7 +227,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 goto_if eq, EventScript_171134 msgbox gUnknown_81A1321 closemessage - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end @@ -289,7 +289,7 @@ EventScript_170FA5:: @ 8170FA5 call EventScript_170C36 special DrawWholeMapView msgbox gUnknown_81A1D59 - applymovement 3, Movement_1A75E1 + applymovement 3, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A1D7D special sub_810B82C @@ -321,7 +321,7 @@ EventScript_171044:: @ 8171044 call EventScript_170C22 special DrawWholeMapView delay 30 - applymovement 3, Movement_1A75E1 + applymovement 3, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO compare VAR_RESULT, 0 @@ -363,10 +363,10 @@ EventScript_1710F2:: @ 81710F2 EventScript_1710FC:: @ 81710FC msgbox gUnknown_81A169B - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A1723 - applymovement 3, Movement_1A75E1 + applymovement 3, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A17DF setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 1 @@ -380,17 +380,17 @@ EventScript_171134:: @ 8171134 end Movement_17113E:: @ 817113E - step_26 - step_1b - step_26 + walk_in_place_up + delay_8 + walk_in_place_up step_end Movement_171142:: @ 8171142 - step_2e - step_26 - step_1c - step_26 - step_26 + walk_in_place_fastest_up + walk_in_place_up + delay_16 + walk_in_place_up + walk_in_place_up step_end OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148 @@ -462,7 +462,7 @@ OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE EventScript_1711DA:: @ 81711DA textcolor 0 playse SE_PIN - applymovement 2, Movement_1A75DB + applymovement 2, Movement_ExclamationMark waitmovement 0 msgbox gUnknown_81A13B8 closemessage @@ -476,30 +476,30 @@ EventScript_1711DA:: @ 81711DA call_if eq, EventScript_171305 delay 10 msgbox gUnknown_81A13CB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A1431 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A1470 msgbox gUnknown_81A14E1 closemessage - applymovement 2, Movement_1A75E7 + applymovement 2, Movement_WalkInPlaceFastestLeft waitmovement 0 delay 10 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 delay 15 msgbox gUnknown_81A14FB closemessage - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 delay 15 - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A1574 closemessage @@ -538,53 +538,53 @@ EventScript_171305:: @ 8171305 return Movement_171310:: @ 8171310 - step_13 - step_10 - step_30 + walk_right + walk_down + walk_in_place_fastest_right step_end Movement_171314:: @ 8171314 - step_13 + walk_right step_end Movement_171316:: @ 8171316 - step_13 - step_11 - step_30 + walk_right + walk_up + walk_in_place_fastest_right step_end Movement_17131A:: @ 817131A - step_13 - step_11 - step_11 - step_30 + walk_right + walk_up + walk_up + walk_in_place_fastest_right step_end Movement_17131F:: @ 817131F - step_1c - step_1c - step_1a - step_2f + delay_16 + delay_16 + delay_4 + walk_in_place_fastest_left step_end Movement_171324:: @ 8171324 - step_29 + walk_in_place_fast_down step_end Movement_171326:: @ 8171326 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_17132D:: @ 817132D - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down step_end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index ad3241af2..50681f724 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -102,73 +102,73 @@ EventScript_1655A1:: @ 81655A1 end Movement_1655AF:: @ 81655AF - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_1655BE:: @ 81655BE - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end Movement_1655CC:: @ 81655CC - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_1655DD:: @ 81655DD - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end PalletTown_EventScript_1655ED:: @ 81655ED @@ -192,10 +192,10 @@ EventScript_165605:: @ 8165605 waitmessage delay 85 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75DB + applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark waitmovement 0 delay 30 addobject 3 @@ -251,124 +251,124 @@ EventScript_1656E0:: @ 81656E0 return Movement_1656F2:: @ 81656F2 - step_11 - step_11 - step_13 - step_11 - step_11 - step_13 - step_11 - step_11 + walk_up + walk_up + walk_right + walk_up + walk_up + walk_right + walk_up + walk_up step_end Movement_1656FB:: @ 81656FB - step_13 - step_11 - step_11 - step_13 - step_11 - step_11 - step_13 - step_11 - step_11 + walk_right + walk_up + walk_up + walk_right + walk_up + walk_up + walk_right + walk_up + walk_up step_end Movement_165705:: @ 8165705 - step_10 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_165719:: @ 8165719 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_16572E:: @ 816572E - step_11 + walk_up set_invisible step_end Movement_165731:: @ 8165731 - step_10 - step_10 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end Movement_165744:: @ 8165744 - step_10 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end Movement_165758:: @ 8165758 - step_13 - step_11 + walk_right + walk_up set_invisible step_end @@ -383,12 +383,12 @@ PalletTown_EventScript_16575C:: @ 816575C checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_165801 msgbox gUnknown_81B1C8B - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_81B1C9F closemessage @@ -412,34 +412,34 @@ EventScript_1657E2:: @ 81657E2 return EventScript_1657ED:: @ 81657ED - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_817D7C8 release end EventScript_165801:: @ 8165801 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81B1CAF release end EventScript_165815:: @ 8165815 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81B1CEC release end Movement_165829:: @ 8165829 - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end Movement_16582C:: @ 816582C - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end PalletTown_EventScript_16582F:: @ 816582F @@ -474,8 +474,8 @@ PalletTown_EventScript_16586B:: @ 816586B PalletTown_EventScript_16587B:: @ 816587B lockall - applymovement 1, Movement_1A75EB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 call EventScript_165894 releaseall @@ -498,7 +498,7 @@ EventScript_165894:: @ 8165894 return EventScript_1658C2:: @ 81658C2 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 call EventScript_165894 release diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 4df205d11..6a6354a1a 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -34,7 +34,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 goto_if ge, EventScript_168DAF msgbox gUnknown_818D58C closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -145,12 +145,12 @@ EventScript_168EF6:: @ 8168EF6 checkitemspace ITEM_TOWN_MAP, 1 compare VAR_RESULT, 0 goto_if eq, EventScript_168F4F - applymovement 1, Movement_1A75EB + applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 removeobject 2 setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 delay 15 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 delay 12 additem ITEM_TOWN_MAP, 1 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 0ea8cf4c6..538ef9234 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -12,7 +12,7 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 compare VAR_RESULT, 1 call_if eq, EventScript_168C41 closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index a94ad9a90..70fd7304f 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -147,7 +147,7 @@ EventScript_169194:: @ 8169194 setobjectxyperm 8, 6, 10 addobject 8 playbgm MUS_RIVAL1, 0 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 applymovement 8, Movement_169B9D waitmovement 0 @@ -157,18 +157,18 @@ EventScript_1691BB:: @ 81691BB setobjectxyperm 8, 6, 10 addobject 8 playbgm MUS_RIVAL1, 0 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 8, Movement_169B9D waitmovement 0 return EventScript_1691DB:: @ 81691DB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_1691E6:: @ 81691E6 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -196,19 +196,19 @@ EventScript_169227:: @ 8169227 return Movement_169232:: @ 8169232 - step_11 - step_12 - step_2e - step_1c - step_1a + walk_up + walk_left + walk_in_place_fastest_up + delay_16 + delay_4 step_end Movement_169238:: @ 8169238 - step_12 - step_12 - step_11 - step_1c - step_1a + walk_left + walk_left + walk_up + delay_16 + delay_4 step_end EventScript_16923E:: @ 816923E @@ -222,7 +222,7 @@ EventScript_16923E:: @ 816923E clearflag FLAG_HIDE_OAK_IN_HIS_LAB applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7 waitmovement 0 - applymovement 8, Movement_1A75E9 + applymovement 8, Movement_WalkInPlaceFastestUp waitmovement 0 clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm SE_STOP @@ -242,34 +242,34 @@ EventScript_16923E:: @ 816923E end Movement_1692B0:: @ 81692B0 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1692B7:: @ 81692B7 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1692C0:: @ 81692C0 - step_26 - step_26 + walk_in_place_up + walk_in_place_up step_end PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3 lockall textcolor 0 - applymovement 4, Movement_1A75F1 + applymovement 4, Movement_FaceDown waitmovement 0 msgbox gUnknown_818E177 closemessage @@ -279,7 +279,7 @@ PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3 end Movement_1692E5:: @ 81692E5 - step_11 + walk_up step_end PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7 @@ -303,13 +303,13 @@ PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF EventScript_16930B:: @ 816930B textcolor 0 playbgm MUS_RIVAL1, 0 - applymovement 8, Movement_1A75ED + applymovement 8, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_818DDA4 closemessage - applymovement 4, Movement_1A75F1 + applymovement 4, Movement_FaceDown waitmovement 0 compare VAR_STARTER_MON, 0 goto_if eq, EventScript_1693D2 @@ -352,27 +352,27 @@ EventScript_1693AC:: @ 81693AC end Movement_1693C0:: @ 81693C0 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_1693C7:: @ 81693C7 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_1693CD:: @ 81693CD - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_down + walk_down step_end EventScript_1693D2:: @ 81693D2 @@ -408,30 +408,30 @@ EventScript_169424:: @ 8169424 end Movement_169438:: @ 8169438 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_169440:: @ 8169440 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_169447:: @ 8169447 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_down + walk_down step_end EventScript_16944D:: @ 816944D @@ -467,24 +467,24 @@ EventScript_16949F:: @ 816949F end Movement_1694B3:: @ 81694B3 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_1694B9:: @ 81694B9 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_down + walk_down step_end Movement_1694BE:: @ 81694BE - step_12 - step_10 - step_10 + walk_left + walk_down + walk_down step_end EventScript_1694C2:: @ 81694C2 @@ -525,50 +525,50 @@ EventScript_169528:: @ 8169528 return Movement_16953A:: @ 816953A - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1b + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 step_end Movement_169542:: @ 8169542 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1b + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 step_end Movement_16954A:: @ 816954A - step_13 - step_10 - step_10 - step_10 - step_12 - step_10 - step_10 - step_1b + walk_right + walk_down + walk_down + walk_down + walk_left + walk_down + walk_down + delay_8 step_end Movement_169553:: @ 8169553 - step_1c - step_1b - step_30 - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_down step_end Movement_169559:: @ 8169559 - step_1c - step_1b - step_2f - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F @@ -658,9 +658,9 @@ EventScript_16961E:: @ 816961E closemessage delay 30 playse SE_PIN - applymovement 4, Movement_1A75DB + applymovement 4, Movement_ExclamationMark waitmovement 0 - applymovement 4, Movement_1A75DD + applymovement 4, Movement_Delay48 waitmovement 0 compare VAR_FACING, 1 call_if eq, EventScript_169ADD @@ -685,7 +685,7 @@ EventScript_16961E:: @ 816961E delay 40 msgbox gUnknown_818E5C5 closemessage - applymovement 4, Movement_1A75E9 + applymovement 4, Movement_WalkInPlaceFastestUp waitmovement 0 removeobject 9 delay 10 @@ -767,19 +767,19 @@ EventScript_16986D:: @ 816986D return Movement_169878:: @ 8169878 - step_1c - step_1b - step_30 + delay_16 + delay_8 + walk_in_place_fastest_right step_end Movement_16987C:: @ 816987C - step_13 - step_10 + walk_right + walk_down step_end Movement_16987F:: @ 816987F - step_10 - step_13 + walk_down + walk_right step_end EventScript_169882:: @ 8169882 @@ -806,30 +806,30 @@ EventScript_1698B8:: @ 81698B8 return Movement_1698C3:: @ 81698C3 - step_1c - step_1b - step_2e + delay_16 + delay_8 + walk_in_place_fastest_up step_end Movement_1698C7:: @ 81698C7 - step_1c - step_1b - step_2f + delay_16 + delay_8 + walk_in_place_fastest_left step_end Movement_1698CB:: @ 81698CB - step_11 - step_12 - step_1c - step_2d + walk_up + walk_left + delay_16 + walk_in_place_fastest_down step_end Movement_1698D0:: @ 81698D0 - step_12 - step_12 - step_11 - step_1c - step_30 + walk_left + walk_left + walk_up + delay_16 + walk_in_place_fastest_right step_end EventScript_1698D6:: @ 81698D6 @@ -864,7 +864,7 @@ EventScript_169913:: @ 8169913 call_if eq, EventScript_16997A compare VAR_FACING, 3 call_if eq, EventScript_169985 - applymovement 4, Movement_1A75E1 + applymovement 4, Movement_FacePlayer waitmovement 0 closemessage delay 70 @@ -894,77 +894,77 @@ EventScript_169985:: @ 8169985 return Movement_169990:: @ 8169990 - step_25 - step_29 - step_25 - step_25 - step_29 - step_25 + walk_in_place_down + walk_in_place_fast_down + walk_in_place_down + walk_in_place_down + walk_in_place_fast_down + walk_in_place_down step_end Movement_169997:: @ 8169997 - step_26 - step_2a - step_26 - step_26 - step_2a - step_26 + walk_in_place_up + walk_in_place_fast_up + walk_in_place_up + walk_in_place_up + walk_in_place_fast_up + walk_in_place_up step_end Movement_16999E:: @ 816999E - step_27 - step_2b - step_27 - step_27 - step_2b - step_27 + walk_in_place_left + walk_in_place_fast_left + walk_in_place_left + walk_in_place_left + walk_in_place_fast_left + walk_in_place_left step_end Movement_1699A5:: @ 81699A5 - step_28 - step_2c - step_28 - step_28 - step_2c - step_28 + walk_in_place_right + walk_in_place_fast_right + walk_in_place_right + walk_in_place_right + walk_in_place_fast_right + walk_in_place_right step_end Movement_1699AC:: @ 81699AC - step_12 - step_2d - step_1b - step_30 - step_1b - step_2e - step_1b - step_2f - step_1b - step_2d - step_1b - step_13 - step_13 - step_2e - step_1b - step_2f - step_1b - step_2d - step_1b - step_30 - step_1b - step_2e - step_1b - step_12 + walk_left + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_down + delay_8 + walk_right + walk_right + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up + delay_8 + walk_left step_end Movement_1699C5: - step_11 - step_10 - step_10 - step_25 - step_11 - step_1c - step_1c - step_1c + walk_up + walk_down + walk_down + walk_in_place_down + walk_up + delay_16 + delay_16 + delay_16 step_end EventScript_1699CE:: @ 81699CE @@ -1033,7 +1033,7 @@ EventScript_169A82:: @ 8169A82 EventScript_169A9E:: @ 8169A9E setobjectxyperm 8, 6, 10 addobject 8 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 applymovement 8, Movement_169B9D waitmovement 0 @@ -1042,52 +1042,52 @@ EventScript_169A9E:: @ 8169A9E EventScript_169AC1:: @ 8169AC1 setobjectxyperm 8, 6, 10 addobject 8 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 8, Movement_169B9D waitmovement 0 return EventScript_169ADD:: @ 8169ADD - applymovement 4, Movement_1A75E1 + applymovement 4, Movement_FacePlayer waitmovement 0 delay 15 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_169AF5:: @ 8169AF5 - applymovement 4, Movement_1A75E1 + applymovement 4, Movement_FacePlayer waitmovement 0 delay 15 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 - applymovement 4, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement 4, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_169B14:: @ 8169B14 - applymovement 4, Movement_1A75E1 + applymovement 4, Movement_FacePlayer waitmovement 0 delay 15 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB - applymovement 4, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement 4, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_169B33:: @ 8169B33 - applymovement 8, Movement_1A75E1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement 8, Movement_FacePlayer + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_169B45:: @ 8169B45 - applymovement 8, Movement_1A75E9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement 8, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_169B57:: @ 8169B57 - applymovement 8, Movement_1A75E1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement 8, Movement_FacePlayer + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -1103,42 +1103,42 @@ EventScript_169B7B:: @ 8169B7B return EventScript_169B86:: @ 8169B86 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return Movement_169B91:: @ 8169B91 - step_1a - step_2d + delay_4 + walk_in_place_fastest_down step_end Movement_169B94:: @ 8169B94 - step_2d - step_1c - step_1c - step_1c - step_1c - step_1c - step_1b - step_2f + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left step_end Movement_169B9D:: @ 8169B9D - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_169BA4:: @ 8169BA4 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_0x4001 @@ -1162,7 +1162,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB end EventScript_169BE1:: @ 8169BE1 - applymovement 4, Movement_1A75EF + applymovement 4, Movement_FaceRight waitmovement 0 drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 @@ -1279,31 +1279,31 @@ EventScript_169D5C:: @ 8169D5C return Movement_RivalWalksToCharmander:: @ 8169D62 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_11 + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end Movement_RivalWalksToBulbasaur:: @ 8169D6B - step_10 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_down + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_RivalWalksToSquirtle:: @ 8169D72 - step_10 - step_13 - step_13 - step_13 - step_2e + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index c46ee9fdd..5e2d42c18 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -53,367 +53,367 @@ EventScript_165C19:: @ 8165C19 return Movement_165C3C:: @ 8165C3C - step_1c - step_1c - step_1a - step_2d + delay_16 + delay_16 + delay_4 + walk_in_place_fastest_down step_end Movement_165C41:: @ 8165C41 - step_10 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_165C80:: @ 8165C80 - step_1c + delay_16 step_end Movement_165C82:: @ 8165C82 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right step_end Movement_165CAF:: @ 8165CAF - step_1c + delay_16 step_end Movement_165CB1:: @ 8165CB1 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right step_end Movement_165CDE:: @ 8165CDE - step_10 - step_12 - step_2e - step_26 + walk_down + walk_left + walk_in_place_fastest_up + walk_in_place_up step_end Movement_165CE3:: @ 8165CE3 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_165D23:: @ 8165D23 - step_28 + walk_in_place_right step_end Movement_165D25:: @ 8165D25 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_165D53:: @ 8165D53 - step_25 + walk_in_place_down step_end Movement_165D55:: @ 8165D55 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_165D83:: @ 8165D83 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PewterCity_EventScript_165D8E:: @ 8165D8E @@ -494,534 +494,534 @@ EventScript_165E5E:: @ 8165E5E return Movement_165E7A:: @ 8165E7A - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_165EB9:: @ 8165EB9 - step_11 - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_165EF9:: @ 8165EF9 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_165F3A:: @ 8165F3A - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right step_end Movement_165F6C:: @ 8165F6C - step_12 - step_10 - step_30 - step_28 + walk_left + walk_down + walk_in_place_fastest_right + walk_in_place_right step_end Movement_165F71:: @ 8165F71 - step_10 - step_25 + walk_down + walk_in_place_down step_end Movement_165F74:: @ 8165F74 - step_10 - step_10 - step_25 + walk_down + walk_down + walk_in_place_down step_end Movement_165F78:: @ 8165F78 - step_10 - step_10 - step_13 - step_10 - step_13 - step_28 + walk_down + walk_down + walk_right + walk_down + walk_right + walk_in_place_right step_end Movement_165F7F:: @ 8165F7F - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_165FBF:: @ 8165FBF - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_166000:: @ 8166000 - step_11 - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_166042:: @ 8166042 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_left step_end PewterCity_EventScript_166075:: @ 8166075 @@ -1087,256 +1087,256 @@ EventScript_166136:: @ 8166136 end Movement_166140:: @ 8166140 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 + walk_in_place_fastest_up step_end Movement_16615C:: @ 816615C - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_166177:: @ 8166177 - step_1c - step_1c - step_12 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e + delay_16 + delay_16 + walk_left + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 + walk_in_place_fastest_up step_end Movement_166193:: @ 8166193 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_1661AE:: @ 81661AE - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 + walk_in_place_fastest_up step_end Movement_1661CA:: @ 81661CA - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_1661E5:: @ 81661E5 - step_13 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e + walk_right + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 + walk_in_place_fastest_up step_end Movement_166201:: @ 8166201 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_16621C:: @ 816621C - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end PewterCity_EventScript_16622B:: @ 816622B @@ -1424,9 +1424,9 @@ EventScript_1662DE:: @ 81662DE call_if eq, EventScript_1663CA waitse playse SE_PIN - applymovement 7, Movement_1A75DB + applymovement 7, Movement_ExclamationMark waitmovement 0 - applymovement 7, Movement_1A75DD + applymovement 7, Movement_Delay48 waitmovement 0 msgbox gUnknown_817E902 compare VAR_0x4001, 0 @@ -1469,7 +1469,7 @@ EventScript_1662DE:: @ 81662DE return EventScript_1663CA:: @ 81663CA - applymovement 7, Movement_1A75ED + applymovement 7, Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -1480,7 +1480,7 @@ EventScript_1663D5:: @ 81663D5 EventScript_1663DA:: @ 81663DA closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -1488,7 +1488,7 @@ EventScript_1663E6:: @ 81663E6 closemessage applymovement 7, Movement_16643E waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -1496,7 +1496,7 @@ EventScript_1663FC:: @ 81663FC closemessage applymovement 7, Movement_166441 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -1521,66 +1521,66 @@ EventScript_166433:: @ 8166433 return Movement_16643E:: @ 816643E - step_1a - step_10 + delay_4 + walk_down step_end Movement_166441:: @ 8166441 - step_1a - step_10 - step_10 + delay_4 + walk_down + walk_down step_end Movement_166445:: @ 8166445 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Movement_166450:: @ 8166450 - step_12 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Movement_16645B:: @ 816645B - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Movement_166465:: @ 8166465 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Movement_16646F:: @ 816646F - step_27 + walk_in_place_left step_end diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index 3be582ab3..cbd49c57a 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -16,7 +16,7 @@ PewterCity_House1_EventScript_16A736:: @ 816A736 lock faceplayer call EventScript_16A749 - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 89bf1c69b..7dc341fb6 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -24,14 +24,14 @@ EventScript_16A348:: @ 816A348 EventScript_16A367:: @ 816A367 msgbox gUnknown_81905B1 - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end EventScript_16A37B:: @ 816A37B msgbox gUnknown_8190627 - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -39,7 +39,7 @@ EventScript_16A37B:: @ 816A37B PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F lockall setvar VAR_0x4001, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 end @@ -47,7 +47,7 @@ PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 lockall setvar VAR_0x4001, 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 end @@ -55,7 +55,7 @@ PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB lockall setvar VAR_0x4001, 2 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 end @@ -120,25 +120,25 @@ EventScript_16A476:: @ 816A476 end Movement_16A48E:: @ 816A48E - step_10 + walk_down step_end Movement_16A490:: @ 816A490 - step_13 - step_13 - step_1b - step_28 + walk_right + walk_right + delay_8 + walk_in_place_right step_end Movement_16A495:: @ 816A495 - step_13 - step_1b - step_28 + walk_right + delay_8 + walk_in_place_right step_end Movement_16A499:: @ 816A499 - step_1b - step_28 + delay_8 + walk_in_place_right step_end PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 2d110a257..c31000e50 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -115,16 +115,16 @@ EventScript_1627B0:: @ 81627B0 end EventScript_1627EF:: @ 81627EF - applymovement 1, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_1627FA:: @ 81627FA - applymovement 1, Movement_1A75EB + applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 return EventScript_162805:: @ 8162805 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index f2e81e955..567053a90 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -90,12 +90,12 @@ EventScript_162B76:: @ 8162B76 specialvar VAR_RESULT, ScrSpecial_GetStarter getspeciesname 0, VAR_RESULT msgbox gUnknown_8178FCF - applymovement 2, Movement_1A75EB - applymovement 1, Movement_1A75E7 + applymovement 2, Movement_WalkInPlaceFastestRight + applymovement 1, Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox gUnknown_817908F closemessage - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 delay 20 msgbox gUnknown_81791A3 @@ -166,82 +166,82 @@ EventScript_162CFC:: @ 8162CFC return Movement_162D07:: @ 8162D07 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_162D12:: @ 8162D12 - step_1c - step_12 - step_11 - step_11 - step_11 - step_13 - step_11 - step_11 - step_11 - step_11 - step_1b + delay_16 + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + delay_8 set_invisible step_end Movement_162D1F:: @ 8162D1F - step_1b - step_2d - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2f + delay_8 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end Movement_162D2A:: @ 8162D2A - step_1c - step_1c - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_11 - step_11 - step_2d - step_1c + delay_16 + delay_16 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_in_place_fastest_down + delay_16 step_end Movement_162D37:: @ 8162D37 - step_11 - step_11 - step_13 - step_11 - step_11 - step_11 - step_11 - step_1b + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + delay_8 set_invisible step_end Movement_162D41:: @ 8162D41 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2f + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 00ccd17f6..abc93f6c3 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -20,14 +20,14 @@ EventScript_162D70:: @ 8162D70 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_162DCD waitmovement 0 - applymovement 1, Movement_1A75E7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement 1, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 delay 18 msgbox gUnknown_817922F closemessage - applymovement 1, Movement_1A75E9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 dofieldeffect 62 @@ -43,12 +43,12 @@ EventScript_162D70:: @ 8162D70 end Movement_162DCD:: @ 8162DCD - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 252c7082d..6bed6e4c3 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -62,40 +62,40 @@ EventScript_1629A8:: @ 81629A8 return Movement_1629F1:: @ 81629F1 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 @@ -164,11 +164,11 @@ EventScript_162AD1:: @ 8162AD1 return Movement_162ADC:: @ 8162ADC - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end Movement_162ADF:: @ 8162ADF - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index d115cc7b0..5b9ea13d2 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -24,9 +24,9 @@ EventScript_1632A7:: @ 81632A7 call_if eq, EventScript_163339 compare VAR_0x4001, 1 call_if eq, EventScript_16334B - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 @@ -52,14 +52,14 @@ EventScript_1632A7:: @ 81632A7 end EventScript_163339:: @ 8163339 - applymovement 1, Movement_1A75EB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_16334B:: @ 816334B - applymovement 1, Movement_1A75ED - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -86,23 +86,23 @@ EventScript_163389:: @ 8163389 return Movement_163394:: @ 8163394 - step_10 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_30 + walk_down + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end Movement_16339D:: @ 816339D - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_30 + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index ed39ce452..42c419d8e 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -32,7 +32,7 @@ EventScript_1634F5:: @ 81634F5 end Movement_163512:: @ 8163512 - step_11 + walk_up step_end PokemonTower_6F_EventScript_163514:: @ 8163514 diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 5a91f843e..73a22762d 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -61,45 +61,45 @@ EventScript_163616:: @ 8163616 end Movement_16361B:: @ 816361B - step_10 - step_13 - step_10 - step_10 - step_10 - step_13 - step_10 - step_10 + walk_down + walk_right + walk_down + walk_down + walk_down + walk_right + walk_down + walk_down step_end Movement_163624:: @ 8163624 - step_10 - step_10 - step_10 - step_10 - step_13 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_right + walk_down + walk_down step_end Movement_16362C:: @ 816362C - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_163633:: @ 8163633 - step_13 - step_10 - step_10 - step_10 - step_10 - step_13 - step_10 - step_10 - step_2f + walk_right + walk_down + walk_down + walk_down + walk_down + walk_right + walk_down + walk_down + walk_in_place_fastest_left step_end PokemonTower_7F_EventScript_16363D:: @ 816363D @@ -139,33 +139,33 @@ EventScript_1636B9:: @ 81636B9 end Movement_1636BE:: @ 81636BE - step_10 - step_10 - step_10 - step_12 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_left + walk_down + walk_down + walk_down step_end Movement_1636C6:: @ 81636C6 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_1636CD:: @ 81636CD - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end PokemonTower_7F_EventScript_1636D6:: @ 81636D6 @@ -208,31 +208,31 @@ EventScript_16374A:: @ 816374A end Movement_16374C:: @ 816374C - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_down step_end Movement_163754:: @ 8163754 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_16375B:: @ 816375B - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index ee14ee9c4..5c87fadab 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -50,7 +50,7 @@ EventScript_170220:: @ 8170220 textcolor 0 msgbox gUnknown_819F9CC closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 compare VAR_0x8008, 1 @@ -89,29 +89,29 @@ EventScript_17029A:: @ 817029A return Movement_1702A5:: @ 81702A5 - step_11 + walk_up step_end Movement_1702A7:: @ 81702A7 - step_11 - step_11 + walk_up + walk_up step_end Movement_1702AA:: @ 81702AA - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end Movement_1702AE:: @ 81702AE - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up step_end Movement_1702B3:: @ 81702B3 - step_13 + walk_right step_end Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 4a9e76f3c..d4582a73e 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -50,7 +50,7 @@ EventScript_1703D6:: @ 81703D6 textcolor 0 msgbox gUnknown_819FD60 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 compare VAR_0x8008, 1 @@ -89,27 +89,27 @@ EventScript_170450:: @ 8170450 return Movement_17045B:: @ 817045B - step_11 + walk_up step_end Movement_17045D:: @ 817045D - step_11 - step_11 + walk_up + walk_up step_end Movement_170460:: @ 8170460 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end Movement_170464:: @ 8170464 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up step_end Movement_170469:: @ 8170469 - step_13 + walk_right step_end diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 3453c7f24..dc72a7a1c 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -95,76 +95,76 @@ EventScript_1683A5:: @ 81683A5 return Movement_1683B0:: @ 8 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_1683B8:: @ 81683B8 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_1683C5:: @ 81683C5 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_1683D1:: @ 81683D1 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_1683D9:: @ 81683D9 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2d + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end Movement_1683E3:: @ 81683E3 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1b - step_2e + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_up step_end Route22_EventScript_1683ED:: @ 81683ED @@ -247,13 +247,13 @@ EventScript_1684CF:: @ 81684CF return Movement_1684DA:: @ 81684DA - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route22_EventScript_1684E2:: @ 81684E2 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 2d41467ac..831b1f1d1 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -42,7 +42,7 @@ EventScript_168678:: @ 8168678 call_if eq, EventScript_1686FD compare VAR_0x4001, 1 call_if eq, EventScript_168708 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 @@ -71,7 +71,7 @@ EventScript_1686FD:: @ 81686FD return EventScript_168708:: @ 8168708 - applymovement 1, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -91,14 +91,14 @@ EventScript_168733:: @ 8168733 return Movement_16873E:: @ 816873E - step_12 + walk_left step_end Movement_168740:: @ 8168740 - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end Movement_168743:: @ 8168743 - step_10 + walk_down step_end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 0b559b463..6bcfb08cc 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -139,20 +139,20 @@ EventScript_1706C8:: @ 81706C8 end Movement_1706D2:: @ 81706D2 - step_11 - step_11 + walk_up + walk_up step_end Movement_1706D5:: @ 81706D5 - step_13 - step_11 - step_11 - step_12 - step_2e + walk_right + walk_up + walk_up + walk_left + walk_in_place_fastest_up step_end Movement_1706DB:: @ 81706DB - step_11 + walk_up step_end Route25_SeaCottage_EventScript_1706DD:: @ 81706DD @@ -225,19 +225,19 @@ EventScript_1707B6:: @ 81707B6 return Movement_1707BE:: @ 81707BE - step_11 - step_11 - step_13 - step_13 + walk_up + walk_up + walk_right + walk_right step_end Movement_1707C3:: @ 81707C3 - step_1c - step_1c - step_10 - step_10 - step_12 - step_12 + delay_16 + delay_16 + walk_down + walk_down + walk_left + walk_left step_end EventScript_1707CA:: @ 81707CA @@ -299,14 +299,14 @@ EventScript_17087F:: @ 817087F end Movement_170881:: @ 8170881 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down step_end Movement_170888:: @ 8170888 - step_10 + walk_down step_end diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 11077850d..d61bbd99c 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -25,7 +25,7 @@ Route5_SouthEntrance_EventScript_16F922:: @ 816F922 EventScript_16F92E:: @ 816F92E textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 checkflag FLAG_GOT_TEA goto_if TRUE, EventScript_16F958 @@ -71,18 +71,18 @@ EventScript_16F9B2:: @ 816F9B2 return Movement_16F9BD:: @ 816F9BD - step_12 + walk_left step_end Movement_16F9BF:: @ 816F9BF - step_12 - step_12 + walk_left + walk_left step_end Movement_16F9C2:: @ 816F9C2 - step_27 + walk_in_place_left step_end Movement_16F9C4:: @ 816F9C4 - step_11 + walk_up step_end diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index ebc1ec6ff..4a7fe8f38 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -25,7 +25,7 @@ Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 EventScript_16F9F4:: @ 816F9F4 textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 checkflag FLAG_GOT_TEA goto_if TRUE, EventScript_16FA1E @@ -71,18 +71,18 @@ EventScript_16FA78:: @ 816FA78 return Movement_16FA83:: @ 816FA83 - step_13 - step_13 + walk_right + walk_right step_end Movement_16FA86:: @ 816FA86 - step_13 + walk_right step_end Movement_16FA88:: @ 816FA88 - step_28 + walk_in_place_right step_end Movement_16FA8A:: @ 816FA8A - step_10 + walk_down step_end diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 662b0f503..a3b8f0412 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -25,7 +25,7 @@ Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF EventScript_16FABB:: @ 816FABB textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 checkflag FLAG_GOT_TEA goto_if TRUE, EventScript_16FAE5 @@ -71,18 +71,18 @@ EventScript_16FB3F:: @ 816FB3F return Movement_16FB4A:: @ 816FB4A - step_11 + walk_up step_end Movement_16FB4C:: @ 816FB4C - step_11 - step_11 + walk_up + walk_up step_end Movement_16FB4F:: @ 816FB4F - step_26 + walk_in_place_up step_end Movement_16FB51:: @ 816FB51 - step_12 + walk_left step_end diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 52f18565a..dfff0bc4f 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -25,7 +25,7 @@ Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 EventScript_16FB81:: @ 816FB81 textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 checkflag FLAG_GOT_TEA goto_if TRUE, EventScript_16FBAB @@ -81,18 +81,18 @@ EventScript_16FC1B:: @ 816FC1B return Movement_16FC26:: @ 816FC26 - step_11 + walk_up step_end Movement_16FC28:: @ 816FC28 - step_11 - step_11 + walk_up + walk_up step_end Movement_16FC2B:: @ 816FC2B - step_26 + walk_in_place_up step_end Movement_16FC2D:: @ 816FC2D - step_13 + walk_right step_end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index a6ebf1f5c..723a6d048 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -32,7 +32,7 @@ EventScript_160903:: @ 8160903 playbgm MUS_RIVAL1, 0 addobject 1 delay 10 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 delay 20 compare VAR_0x4001, 0 @@ -110,73 +110,73 @@ EventScript_160A13:: @ 8160A13 return Movement_160A1E:: @ 8160A1E - step_1c - step_1c - step_1c - step_1c - step_2f + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end Movement_160A24:: @ 8160A24 - step_1c - step_1c - step_1c - step_1c - step_2f + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end Movement_160A2A:: @ 8160A2A - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down step_end Movement_160A2E:: @ 8160A2E - step_10 - step_10 - step_10 - step_10 - step_30 + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end Movement_160A34:: @ 8160A34 - step_10 - step_10 - step_10 - step_10 - step_13 - step_1a + walk_down + walk_down + walk_down + walk_down + walk_right + delay_4 step_end Movement_160A3B:: @ 8160A3B - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_160A44:: @ 8160A44 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_160A4C:: @ 8160A4C - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54 diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 114ba084a..562e3b3a6 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -13,7 +13,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A waitfanfare call EventScript_1A6675 delay 50 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81736A6 additem ITEM_HM01, 1 @@ -27,13 +27,13 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A EventScript_160BA0:: @ 8160BA0 msgbox gUnknown_81738C3 closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end EventScript_160BB5:: @ 8160BB5 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_8173831 release diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index e2dd3418a..9a9327acb 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -38,30 +38,30 @@ EventScript_1608A1:: @ 81608A1 return EventScript_1608AC:: @ 81608AC - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return Movement_1608B7:: @ 81608B7 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1608C1:: @ 81608C1 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 1fdc73973..f4cf94274 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -44,7 +44,7 @@ SaffronCity_EventScript_1673B9:: @ 81673B9 lock checkflag FLAG_RESCUED_MR_FUJI goto_if TRUE, EventScript_1673D7 - applymovement 6, Movement_1A75E1 + applymovement 6, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81812CA release diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 5790fce0f..37856f0fd 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -4,7 +4,7 @@ SaffronCity_Dojo_MapScripts:: @ 816EBDB SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_1A75E7 + applymovement 5, Movement_WalkInPlaceFastestLeft waitmovement 0 releaseall end @@ -12,7 +12,7 @@ SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_1A75EB + applymovement 5, Movement_WalkInPlaceFastestRight waitmovement 0 releaseall end @@ -24,7 +24,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_0x4001, SPECIES_HITMONLEE - applymovement 5, Movement_1A75E9 + applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 msgbox gUnknown_819B44E, MSGBOX_YESNO @@ -47,7 +47,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_0x4001, SPECIES_HITMONCHAN - applymovement 5, Movement_1A75E9 + applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 msgbox gUnknown_819B49E, MSGBOX_YESNO diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 75a7b0a96..006f62023 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -10,18 +10,18 @@ SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA EventScript_16F0D4:: @ 816F0D4 lockall textcolor 1 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_819C22B closemessage applymovement 1, Movement_16F124 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_819C235 setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 @@ -29,45 +29,45 @@ EventScript_16F0D4:: @ 816F0D4 end Movement_16F124:: @ 816F124 - step_1c - step_1b - step_10 - step_1c - step_10 - step_1b - step_12 + delay_16 + delay_8 + walk_down + delay_16 + walk_down + delay_8 + walk_left step_end Movement_16F12C:: @ 816F12C - step_1b - step_2d - step_10 - step_10 - step_10 - step_12 - step_12 + delay_8 + walk_in_place_fastest_down + walk_down + walk_down + walk_down + walk_left + walk_left step_end Movement_16F134:: @ 816F134 - step_1f - step_1f - step_1d - step_1d - step_1f - step_1d + walk_fast_left + walk_fast_left + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down step_end Movement_16F13B:: @ 816F13B - step_10 - step_30 + walk_down + walk_in_place_fastest_right step_end Movement_16F13E:: @ 816F13E - step_55 - step_1e - step_1e - step_20 - step_2d + jump_in_place_right + walk_fast_up + walk_fast_up + walk_fast_right + walk_in_place_fastest_down step_end SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 778d65e84..931eb21cf 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -72,32 +72,32 @@ EventScript_16300C:: @ 816300C end Movement_163013:: @ 8163013 - step_1d - step_1d - step_1d - step_1d - step_20 - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_163021:: @ 8163021 - step_1d - step_1d - step_1d - step_1d - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index f91329333..25bd70e68 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -87,9 +87,9 @@ EventScript_16310B:: @ 816310B end Movement_16311D:: @ 816311D - step_1e - step_1e - step_1e + walk_fast_up + walk_fast_up + walk_fast_up step_end EventScript_163121:: @ 8163121 @@ -131,24 +131,24 @@ EventScript_163185:: @ 8163185 end Movement_16318C:: @ 816318C - step_11 - step_11 - step_11 - step_13 - step_13 - step_13 - step_13 - step_11 + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up step_end Movement_163195:: @ 8163195 - step_11 - step_11 - step_11 - step_13 - step_13 - step_13 - step_11 + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_up step_end SeafoamIslands_B4F_EventScript_16319D:: @ 816319D @@ -159,7 +159,7 @@ SeafoamIslands_B4F_EventScript_16319D:: @ 816319D end Movement_1631AA:: @ 81631AA - step_11 + walk_up step_end SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index a992dbaa5..2778ae66d 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -37,7 +37,7 @@ EventScript_1708E9:: @ 1708E9 applymovement 1, Movement_170955 waitmovement 0 moveobjectoffscreen 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 call_if eq, EventScript_170938 @@ -63,12 +63,12 @@ EventScript_17094A:: @ 817094A return Movement_170953:: @ 8170953 - step_10 + walk_down step_end Movement_170955:: @ 8170955 - step_13 - step_2d + walk_right + walk_in_place_fastest_down step_end SevenIsland_House_Room1_EventScript_170958:: @ 8170958 @@ -151,31 +151,31 @@ EventScript_170A51:: @ 8170A51 return Movement_170A63:: @ 8170A63 - step_1c - step_11 - step_11 + delay_16 + walk_up + walk_up step_end Movement_170A67:: @ 8170A67 - step_1c - step_13 - step_11 + delay_16 + walk_right + walk_up step_end Movement_170A6B:: @ 8170A6B - step_1c - step_12 - step_11 + delay_16 + walk_left + walk_up step_end Movement_170A6F:: @ 8170A6F - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end Movement_170A72:: @ 8170A72 - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index d964a40d0..461e4fe45 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -59,19 +59,19 @@ EventScript_170B17:: @ 8170B17 return Movement_170B22:: @ 8170B22 - step_10 - step_10 - step_10 - step_13 - step_13 + walk_down + walk_down + walk_down + walk_right + walk_right step_end Movement_170B28:: @ 8170B28 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_1b + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 step_end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index be25411b2..5685358cd 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -10,7 +10,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 waitmovement 0 fadedefaultbgm delay 30 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A4D72 textcolor 3 @@ -35,12 +35,12 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 end EventScript_172206:: @ 8172206 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_172211:: @ 8172211 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A4D72 release @@ -53,22 +53,22 @@ EventScript_172225:: @ 8172225 end Movement_172231:: @ 8172231 - step_25 - step_1c - step_25 - step_1c - step_25 - step_1c - step_25 - step_1c - step_30 - step_1a - step_2e - step_1a - step_2f - step_1a - step_2d - step_1a + walk_in_place_down + delay_16 + walk_in_place_down + delay_16 + walk_in_place_down + delay_16 + walk_in_place_down + delay_16 + walk_in_place_fastest_right + delay_4 + walk_in_place_fastest_up + delay_4 + walk_in_place_fastest_left + delay_4 + walk_in_place_fastest_down + delay_4 step_end SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index a919ffd44..396d9a4ef 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -72,10 +72,10 @@ EventScript_164BD8:: @ 8164BD8 return Movement_164BE5:: @ 8164BE5 - step_2d - step_1c - step_10 - step_13 - step_13 - step_10 + walk_in_place_fastest_down + delay_16 + walk_down + walk_right + walk_right + walk_down step_end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 07745b021..353b9dd9f 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -61,8 +61,8 @@ EventScript_1648C8:: @ 81648C8 end Movement_1648EA:: @ 81648EA - step_10 - step_10 + walk_down + walk_down step_end EventScript_1648ED:: @ 81648ED @@ -212,11 +212,11 @@ EventScript_164ABF:: @ 8164ABF end Movement_164AD4:: @ 8164AD4 - step_03 + face_right step_end Movement_164AD6:: @ 8164AD6 - step_10 + walk_down step_end SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 2fb8dc01d..384e04b54 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -67,7 +67,7 @@ EventScript_161E9F:: @ 8161E9F EventScript_161EA0:: @ 8161EA0 textcolor 0 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 msgbox gUnknown_8177108 @@ -103,26 +103,26 @@ EventScript_161F12:: @ 8161F12 return Movement_161F1D:: @ 8161F1D - step_10 - step_10 - step_10 - step_10 - step_2f + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end Movement_161F23:: @ 8161F23 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down step_end Movement_161F27:: @ 8161F27 - step_1c - step_1c - step_1c - step_1b - step_1a - step_30 + delay_16 + delay_16 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_right step_end EventScript_161F2E:: @ 8161F2E diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 72aa159dc..99a77ed9f 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -40,10 +40,10 @@ EventScript_1619D3:: @ 81619D3 EventScript_1619D4:: @ 81619D4 textcolor 0 playbgm MUS_RIVAL1, 0 - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED - applymovement 1, Movement_1A75DD + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_8176710 compare VAR_0x4001, 0 @@ -105,26 +105,26 @@ EventScript_161AAC:: @ 8161AAC return Movement_161AB7:: @ 8161AB7 - step_11 + walk_up step_end Movement_161AB9:: @ 8161AB9 - step_13 - step_13 - step_13 - step_11 - step_1c + walk_right + walk_right + walk_right + walk_up + delay_16 step_end Movement_161ABF:: @ 8161ABF - step_12 - step_11 - step_11 - step_13 - step_13 - step_13 - step_13 - step_1c + walk_left + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + delay_16 step_end SilphCo_7F_EventScript_161AC8:: @ 8161AC8 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 6642b4d85..41bd9f235 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -76,22 +76,22 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 end EventScript_1642F9:: @ 81642F9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_164304:: @ 8164304 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_16430F:: @ 816430F - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_16431A:: @ 816431A - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -118,28 +118,28 @@ EventScript_164346:: @ 8164346 EventScript_164351:: @ 8164351 applymovement 2, Movement_1643F5 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_164366:: @ 8164366 applymovement 2, Movement_1643F5 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_16437B:: @ 816437B applymovement 2, Movement_1643F7 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return EventScript_164390:: @ 8164390 applymovement 2, Movement_1643F7 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -168,71 +168,71 @@ EventScript_1643DB:: @ 81643DB return Movement_1643ED:: @ 81643ED - step_11 - step_11 - step_30 + walk_up + walk_up + walk_in_place_fastest_right step_end Movement_1643F1:: @ 81643F1 - step_13 - step_13 - step_2e + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_1643F5:: @ 81643F5 - step_13 + walk_right step_end Movement_1643F7:: @ 81643F7 - step_11 + walk_up step_end Movement_1643F9:: @ 81643F9 - step_1e - step_20 - step_20 - step_20 - step_1d - step_20 - step_20 + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_right + walk_fast_right step_end Movement_164401:: @ 8164401 - step_1d - step_20 - step_20 - step_20 - step_1e - step_20 - step_20 + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_right + walk_fast_right step_end Movement_164409:: @ 8164409 - step_20 - step_20 - step_20 - step_20 - step_1e + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up step_end Movement_16440F:: @ 816440F - step_00 - step_5e - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_5f + face_down + disable_anim + slide_down + slide_down + slide_down + slide_down + slide_down + slide_down + slide_down + slide_down + slide_down + restore_anim step_end Movement_16441C:: @ 816441C - step_1c - step_30 + delay_16 + walk_in_place_fastest_right step_end SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 211fa2805..55d5e1a16 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -21,12 +21,12 @@ SixIsland_PokemonCenter_1F_OnFrame:: @ 8171D8D EventScript_171D97:: @ 8171D97 lockall textcolor 0 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 playbgm MUS_RIVAL1, 0 - applymovement 2, Movement_1A75DB + applymovement 2, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_1A75DD + applymovement 2, Movement_Delay48 waitmovement 0 delay 25 applymovement 2, Movement_171DF9 @@ -46,21 +46,21 @@ EventScript_171D97:: @ 8171D97 end Movement_171DF9:: @ 8171DF9 - step_13 - step_13 - step_10 - step_10 + walk_right + walk_right + walk_down + walk_down step_end Movement_171DFE:: @ 8171DFE - step_1c - step_1a - step_10 + delay_16 + delay_4 + walk_down step_end Movement_171E02:: @ 8171E02 - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 40950d560..9878f172a 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -14,10 +14,10 @@ EventScript_168B63:: @ 8168B63 SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D lock msgbox gUnknown_818BD47 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_818BD7A - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 401283235..0fd043847 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -38,14 +38,14 @@ ThreeIsland_EventScript_1677E5:: @ 81677E5 end EventScript_167806:: @ 8167806 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81827F1 release end EventScript_16781A:: @ 816781A - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 @@ -101,22 +101,22 @@ EventScript_16786F:: @ 816786F return EventScript_167931:: @ 8167931 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_16793C:: @ 816793C - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_167947:: @ 8167947 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_167952:: @ 8167952 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -144,7 +144,7 @@ ThreeIsland_EventScript_167989:: @ 8167989 end EventScript_1679A1:: @ 81679A1 - applymovement 2, Movement_1A75E1 + applymovement 2, Movement_FacePlayer waitmovement 0 msgbox gUnknown_8182823 release @@ -173,11 +173,11 @@ ThreeIsland_EventScript_1679B5:: @ 81679B5 end Movement_167A19:: @ 8167A19 - step_27 + walk_in_place_left step_end Movement_167A1B:: @ 8167A1B - step_28 + walk_in_place_right step_end ThreeIsland_EventScript_167A1D:: @ 8167A1D @@ -212,12 +212,12 @@ ThreeIsland_EventScript_167A4D:: @ 8167A4D EventScript_167A59:: @ 8167A59 textcolor 0 - applymovement 5, Movement_1A75ED + applymovement 5, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 5, Movement_1A75DB + applymovement 5, Movement_ExclamationMark waitmovement 0 - applymovement 5, Movement_1A75DD + applymovement 5, Movement_Delay48 waitmovement 0 applymovement 5, Movement_167C57 waitmovement 0 @@ -248,10 +248,10 @@ EventScript_167A59:: @ 8167A59 msgbox gUnknown_8182582 setvar VAR_LAST_TALKED, 4 trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_3, 0, Text_1825D4 - applymovement 4, Movement_1A75E7 + applymovement 4, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 6, Movement_1A75ED - applymovement 8, Movement_1A75ED + applymovement 6, Movement_WalkInPlaceFastestDown + applymovement 8, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81825E2 closemessage @@ -286,33 +286,33 @@ EventScript_167A59:: @ 8167A59 end EventScript_167BC6:: @ 8167BC6 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 3, Movement_167C5E waitmovement 0 return EventScript_167BD8:: @ 8167BD8 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 3, Movement_167C62 waitmovement 0 return EventScript_167BEA:: @ 8167BEA - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 3, Movement_167C64 applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 waitmovement 0 return EventScript_167C03:: @ 8167C03 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 applymovement 3, Movement_167C6C waitmovement 0 return EventScript_167C1C:: @ 8167C1C - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 applymovement 3, Movement_167C71 waitmovement 0 @@ -330,57 +330,57 @@ EventScript_167C35:: @ 8167C35 end Movement_167C55:: @ 8167C55 - step_10 + walk_down step_end Movement_167C57:: @ 8167C57 - step_10 + walk_down step_end Movement_167C59:: @ 8167C59 - step_11 - step_2f + walk_up + walk_in_place_fastest_left step_end Movement_167C5C:: @ 8167C5C - step_25 + walk_in_place_down step_end Movement_167C5E:: @ 8167C5E - step_10 - step_12 - step_2d + walk_down + walk_left + walk_in_place_fastest_down step_end Movement_167C62:: @ 8167C62 - step_10 + walk_down step_end Movement_167C64:: @ 8167C64 - step_10 - step_10 - step_30 + walk_down + walk_down + walk_in_place_fastest_right step_end Movement_167C68:: @ 8167C68 - step_1c - step_1c - step_2f + delay_16 + delay_16 + walk_in_place_fastest_left step_end Movement_167C6C:: @ 8167C6C - step_10 - step_10 - step_13 - step_30 + walk_down + walk_down + walk_right + walk_in_place_fastest_right step_end Movement_167C71:: @ 8167C71 - step_10 - step_10 - step_13 - step_13 - step_30 + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_right step_end ThreeIsland_EventScript_167C77:: @ 8167C77 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 2ed197683..b1bb6fb7f 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -12,7 +12,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 faceplayer msgbox gUnknown_817ADD6 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 applymovement 1, Movement_163D22 waitmovement 0 @@ -26,7 +26,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 setwildbattle SPECIES_HYPNO, 30, ITEM_NONE dowildbattle special sub_8112364 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY @@ -49,11 +49,11 @@ EventScript_163D19:: @ 8163D19 return Movement_163D22:: @ 8163D22 - step_2f - step_1c - step_30 - step_1b - step_2f + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_left step_end ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index e4c890add..ba3922f9f 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -31,7 +31,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 goto_if eq, EventScript_164D90 msgbox gUnknown_817D13B closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 8f717d71c..07577f92b 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -40,7 +40,7 @@ EventScript_171435:: @ 8171435 special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_81A2931 closemessage - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 releaseall @@ -53,16 +53,16 @@ EventScript_17145F:: @ 817145F waitmovement 0 msgbox gUnknown_81A2408 closemessage - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 applymovement 1, Movement_171527 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_81A2465 closemessage @@ -75,12 +75,12 @@ EventScript_17145F:: @ 817145F applymovement 2, Movement_17152F waitmovement 0 msgbox gUnknown_81A259A - applymovement 2, Movement_1A75EB + applymovement 2, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_81A2658 msgbox gUnknown_81A26D5 closemessage - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_KAIDAN removeobject 2 @@ -94,32 +94,32 @@ EventScript_17145F:: @ 817145F end Movement_171520:: @ 8171520 - step_12 - step_13 - step_13 - step_1b - step_2e - step_1c + walk_left + walk_right + walk_right + delay_8 + walk_in_place_fastest_up + delay_16 step_end Movement_171527:: @ 8171527 - step_10 - step_10 - step_10 - step_2f + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end Movement_17152C:: @ 817152C - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end Movement_17152F:: @ 817152F - step_2f - step_1b - step_30 - step_1b - step_2e + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up step_end TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 9b7e2fb63..7c18e34d7 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -16,8 +16,8 @@ EventScript_1668F1:: @ 81668F1 end Movement_166903:: @ 8166903 - step_11 - step_11 + walk_up + walk_up step_end VermilionCity_OnTransition:: @ 8166906 @@ -206,8 +206,8 @@ VermilionCity_EventScript_166B98:: @ 8166B98 EventScript_166BA0:: @ 8166BA0 textcolor 0 - applymovement 6, Movement_1A75E7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement 6, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 compare VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if eq, EventScript_166BED diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index bb6e7e041..03e82d3d7 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -57,7 +57,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 goto_if TRUE, EventScript_16B54B msgbox gUnknown_81944CC closemessage - applymovement 5, Movement_1A75E5 + applymovement 5, Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_TEMP_2 release @@ -66,7 +66,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 EventScript_16B54B:: @ 816B54B msgbox gUnknown_8194518 closemessage - applymovement 5, Movement_1A75E5 + applymovement 5, Movement_FaceOriginalDirection waitmovement 0 clearflag FLAG_TEMP_3 release @@ -79,7 +79,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 goto_if TRUE, EventScript_16B586 msgbox gUnknown_819446F closemessage - applymovement 6, Movement_1A75E5 + applymovement 6, Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_TEMP_3 release @@ -88,7 +88,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 EventScript_16B586:: @ 816B586 msgbox gUnknown_819449C closemessage - applymovement 6, Movement_1A75E5 + applymovement 6, Movement_FaceOriginalDirection waitmovement 0 clearflag FLAG_TEMP_2 release diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 31744f8b3..c661ad19b 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -49,7 +49,7 @@ EventScript_165931:: @ 8165931 ViridianCity_EventScript_16596D:: @ 816596D lockall textcolor 3 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 msgbox gUnknown_817E2F5 @@ -60,7 +60,7 @@ ViridianCity_EventScript_16596D:: @ 816596D end Movement_165992:: @ 8165992 - step_14 + jump_2_down step_end ViridianCity_EventScript_165994:: @ 8165994 @@ -94,7 +94,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA goto_if eq, EventScript_1659EC msgbox gUnknown_817DB39 closemessage - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end @@ -194,7 +194,7 @@ ViridianCity_EventScript_165AC4:: @ 8165AC4 EventScript_165ADB:: @ 8165ADB msgbox gUnknown_817DC4E closemessage - applymovement 5, Movement_1A75E5 + applymovement 5, Movement_FaceOriginalDirection waitmovement 0 release end @@ -214,15 +214,15 @@ ViridianCity_EventScript_165AF6:: @ 8165AF6 end Movement_165B0E:: @ 8165B0E - step_10 + walk_down step_end ViridianCity_EventScript_165B10:: @ 8165B10 lockall textcolor 0 - applymovement 4, Movement_1A75E7 + applymovement 4, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 call EventScript_165B4C release @@ -231,9 +231,9 @@ ViridianCity_EventScript_165B10:: @ 8165B10 ViridianCity_EventScript_165B2E:: @ 8165B2E lockall textcolor 0 - applymovement 4, Movement_1A75EB + applymovement 4, Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 call EventScript_165B4C release diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 8a777331e..406bfd7a0 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -6,7 +6,7 @@ ViridianCity_House2_EventScript_16A07D:: @ 816A07D faceplayer msgbox gUnknown_818FC00 closemessage - applymovement 2, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -16,7 +16,7 @@ ViridianCity_House2_EventScript_16A094:: @ 816A094 faceplayer msgbox gUnknown_818FC2B closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -36,7 +36,7 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB compare VAR_RESULT, 0 goto_if eq, EventScript_16A11B msgbox gUnknown_818FE5C - applymovement 2, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 1 msgbox gUnknown_818FF28 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 0a54173ad..665bbe118 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -20,7 +20,7 @@ ViridianCity_Mart_OnFrame:: @ 816A1FB EventScript_16A205:: @ 816A205 lockall textcolor 0 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_819021A closemessage @@ -36,19 +36,19 @@ EventScript_16A205:: @ 816A205 end Movement_16A25C:: @ 816A25C - step_11 - step_11 - step_11 - step_11 - step_2f + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_left step_end Movement_16A262:: @ 816A262 - step_1c - step_1c - step_1c - step_1c - step_30 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_right step_end ViridianCity_Mart_EventScript_16A268:: @ 816A268 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e3b5c4806..53869703e 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -195,7 +195,7 @@ CableClub_EventScript_PlayerExitLinkRoom:: @ 81BB40A CableClub_EventScript_Tutorial:: @ 81BB415 lockall textcolor 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81BD898 closemessage @@ -208,8 +208,8 @@ CableClub_EventScript_Tutorial:: @ 81BB415 end Movement_1BB447:: @ 81BB447 - step_11 - step_11 + walk_up + walk_up step_end EventScript_1BB44A:: @ 81BB44A @@ -556,51 +556,51 @@ EventScript_1BB881:: @ 81BB881 end Movement_1BB88B:: @ 81BB88B - step_00 + face_down step_end Movement_1BB88D:: @ 81BB88D - step_03 + face_right step_end Movement_1BB88F:: @ 81BB88F - step_02 + face_left step_end Movement_1BB891:: @ 81BB891 - step_10 - step_10 + walk_down + walk_down step_end Movement_1BB894:: @ 81BB894 - step_13 - step_11 - step_11 + walk_right + walk_up + walk_up step_end Movement_1BB898:: @ 81BB898 - step_12 - step_11 - step_11 + walk_left + walk_up + walk_up step_end Movement_1BB89C:: @ 81BB89C - step_11 + walk_up step_end Movement_1BB89E:: @ 81BB89E - step_02 + face_left step_end Movement_1BB8A0:: @ 81BB8A0 - step_03 + face_right step_end Movement_1BB8A2:: @ 81BB8A2 - step_12 - step_11 - step_11 - step_11 + walk_left + walk_up + walk_up + walk_up step_end gUnknown_81BB8A7:: @ 81BB8A7 diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index d0729d900..89ef6d622 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -36,7 +36,7 @@ EventScript_1BDF76:: @ 81BDF76 end Movement_1BDF85:: @ 81BDF85 - step_69 + cut_tree step_end EventScript_1BDF87:: @ 81BDF87 @@ -107,7 +107,7 @@ EventScript_1BE08D:: @ 81BE08D end Movement_1BE08F:: @ 81BE08F - step_68 + rock_smash_break step_end EventScript_1BE091:: @ 81BE091 diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index b0bf1dba4..d25a694be 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -582,17 +582,17 @@ EventScript_1C4F37:: @ 81C4F37 return Movement_1C4F4C:: @ 81C4F4C - step_52 + jump_in_place_down step_end Movement_1C4F4E:: @ 81C4F4E - step_53 + jump_in_place_up step_end Movement_1C4F50:: @ 81C4F50 - step_54 + jump_in_place_left step_end Movement_1C4F52:: @ 81C4F52 - step_55 + jump_in_place_right step_end diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc new file mode 100644 index 000000000..6a411d811 --- /dev/null +++ b/data/scripts/movement.inc @@ -0,0 +1,82 @@ +Movement_QuestionMark:: @ 81A75D9 + emote_question_mark + step_end + +Movement_ExclamationMark:: @ 81A75DB + emote_exclamation_mark + step_end + +Movement_Delay48:: @ 81A75DD + delay_16 + delay_16 + delay_16 + step_end + +Movement_FacePlayer:: @ 81A75E1 + face_player + step_end + +@ Unused +Movement_FaceAwayPlayer:: @ 81A75E3 + face_away_player + step_end + +Movement_FaceOriginalDirection:: @ 81A75E5 + face_original_direction + step_end + +Movement_WalkInPlaceFastestLeft:: @ 81A75E7 + walk_in_place_fastest_left + step_end + +Movement_WalkInPlaceFastestUp:: @ 81A75E9 + walk_in_place_fastest_up + step_end + +Movement_WalkInPlaceFastestRight:: @ 81A75EB + walk_in_place_fastest_right + step_end + +Movement_WalkInPlaceFastestDown:: @ 81A75ED + walk_in_place_fastest_down + step_end + +Movement_FaceRight:: @ 81A75EF + face_right + step_end + +Movement_FaceDown:: @ 81A75F1 + face_down + step_end + +Movement_WalkUp5:: @ 81A75F3 + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +@ Unused +Movement_WalkUp4:: @ 81A75F9 + walk_up + walk_up + walk_up + walk_up + step_end + +Movement_Delay32:: @ 81A75FE + delay_16 + delay_16 + step_end + +@ Unused +Movement_WalkUp:: @ 81A7601 + walk_up + step_end + +@ Unused +Movement_WalkUp2:: @ 81A7603 + walk_up + walk_up + step_end diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index adf709ee3..bad257087 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -21,11 +21,11 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 81A65B8 end EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE - applymovement VAR_LAST_TALKED, Movement_1A75E7 + applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_LAST_TALKED, Movement_1A75ED + applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown waitmovement 0 special sp000_heal_pokemon return @@ -67,6 +67,6 @@ EventScript_PkmnCenterNurse_Goodbye:: @ 81A6663 return Movement_1A666C:: @ 81A666C - step_5b - step_1a + nurse_joy_bow + delay_4 step_end diff --git a/include/constants/movement_commands.h b/include/constants/movement_commands.h index 3e61cbc14..0f90405dd 100644 --- a/include/constants/movement_commands.h +++ b/include/constants/movement_commands.h @@ -3,71 +3,71 @@ enum { - step_00, - step_01, - step_02, - step_03, - slow_step_down, - slow_step_up, - slow_step_left, - slow_step_right, - step_down, - step_up, - step_left, - step_right, - fast_step_down, - fast_step_up, - fast_step_left, - fast_step_right, - step_10, - step_11, - step_12, - step_13, - step_14, - step_15, - step_16, - step_17, - step_18, - step_19, - step_1a, - step_1b, - step_1c, - step_1d, - step_1e, - step_1f, - step_20, - step_21, - step_22, - step_23, - step_24, - step_25, - step_26, - step_27, - step_28, - step_29, - step_2a, - step_2b, - step_2c, - step_2d, - step_2e, - step_2f, - step_30, - step_31, - step_32, - step_33, - step_34, - step_35, - step_36, - step_37, - step_38, - step_39, - step_3a, - step_3b, - step_3c, - step_3d, - step_3e, - step_3f, - step_40, + face_down, + face_up, + face_left, + face_right, + face_down_2, + face_up_2, + face_left_2, + face_right_2, + walk_slowest_down, + walk_slowest_up, + walk_slowest_left, + walk_slowest_right, + walk_slow_down, + walk_slow_up, + walk_slow_left, + walk_slow_right, + walk_down, + walk_up, + walk_left, + walk_right, + jump_2_down, + jump_2_up, + jump_2_left, + jump_2_right, + delay_1, + delay_2, + delay_4, + delay_8, + delay_16, + walk_fast_down, + walk_fast_up, + walk_fast_left, + walk_fast_right, + walk_in_place_slow_down, + walk_in_place_slow_up, + walk_in_place_slow_left, + walk_in_place_slow_right, + walk_in_place_down, + walk_in_place_up, + walk_in_place_left, + walk_in_place_right, + walk_in_place_fast_down, + walk_in_place_fast_up, + walk_in_place_fast_left, + walk_in_place_fast_right, + walk_in_place_fastest_down, + walk_in_place_fastest_up, + walk_in_place_fastest_left, + walk_in_place_fastest_right, + ride_water_current_down, + ride_water_current_up, + ride_water_current_left, + ride_water_current_right, + walk_fastest_down, + walk_fastest_up, + walk_fastest_left, + walk_fastest_right, + slide_down, + slide_up, + slide_left, + slide_right, + player_run_down, + player_run_up, + player_run_left, + player_run_right, step_41, step_42, step_43, @@ -77,34 +77,38 @@ enum step_47, step_48, step_49, - step_4a, - step_4b, - step_4c, - step_4d, - step_4e, - step_4f, - step_50, - step_51, - step_52, - step_53, - step_54, - step_55, - step_56, - step_57, - step_58, - step_59, - step_5a, - step_5b, - step_5c, - step_5d, - step_5e, - step_5f, + face_player, + face_away_player, + lock_facing_direction, + unlock_facing_direction, + jump_down, + jump_up, + jump_left, + jump_right, + jump_in_place_down, + jump_in_place_up, + jump_in_place_left, + jump_in_place_right, + jump_in_place_down_up, + jump_in_place_up_down, + jump_in_place_left_right, + jump_in_place_right_left, + face_original_direction, + nurse_joy_bow, + enable_jump_landing_ground_effect, + disable_jump_landing_ground_effect, + disable_anim, + restore_anim, set_invisible, - step_61, - step_62, - step_63, - step_64, - step_65, + set_visible, + emote_exclamation_mark, + emote_question_mark, + emote_x, + emote_double_exclamation_mark, + step_66, + step_67, + rock_smash_break, + cut_tree, step_91 = 0x91, step_92, diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 46a0649d7..8478e2114 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -547,25 +547,25 @@ static const VsSeekerData sVsSeekerData[] = { }; static const u8 gUnknown_8453F5C[] = { - step_1c, - step_1c, - step_1c, + delay_16, + delay_16, + delay_16, step_end }; static const u8 gUnknown_8453F60[] = { - step_62, + emote_exclamation_mark, step_end }; static const u8 sMovementScript_TrainerNoRematch[] = { - step_64, + emote_x, step_end }; -static const u8 gUnknown_8453F64[] = { - step_2d, - step_65, +static const u8 sMovementScript_TrainerRematch[] = { + walk_in_place_fastest_down, + emote_double_exclamation_mark, step_end }; @@ -963,7 +963,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) { gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[vsSeekerIdx].localId] = r7; npc_coords_shift_still(&gObjectEvents[sVsSeeker->trainerInfo[vsSeekerIdx].objectEventId]); - StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F64); + StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerRematch); sVsSeeker->trainerIdxArray[sVsSeeker->numRematchableTrainers] = r8; sVsSeeker->runningBehaviourEtcArray[sVsSeeker->numRematchableTrainers] = GetRunningBehaviorFromGraphicsId(sVsSeeker->trainerInfo[vsSeekerIdx].graphicsId); sVsSeeker->numRematchableTrainers++; @@ -1127,7 +1127,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) "\tbl npc_coords_shift_still\n" "\tldr r0, [r6]\n" "\tadds r0, r5\n" - "\tldr r1, _0810CB60 @ =gUnknown_8453F64\n" + "\tldr r1, _0810CB60 @ =sMovementScript_TrainerRematch\n" "\tbl StartTrainerObjectMovementScript\n" "\tldr r2, [r6]\n" "\tmov r3, r10\n" @@ -1197,7 +1197,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) "_0810CB54: .4byte gSaveBlock1Ptr\n" "_0810CB58: .4byte 0x0000063a\n" "_0810CB5C: .4byte gObjectEvents\n" - "_0810CB60: .4byte gUnknown_8453F64\n" + "_0810CB60: .4byte sMovementScript_TrainerRematch\n" "_0810CB64: .4byte 0x00000431\n" "_0810CB68: .4byte sVsSeeker\n" "_0810CB6C: .4byte 0x00000801\n" From a40c63fe4896ccd76f6f63bdbd940de8cc946fae Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 9 Jan 2020 13:25:10 -0500 Subject: [PATCH 07/20] Use dir constants --- data/maps/CeladonCity_GameCorner/scripts.inc | 4 +- .../scripts.inc | 6 +- .../FiveIsland_ResortGorgeous/scripts.inc | 2 +- .../scripts.inc | 8 +- .../FiveIsland_RocketWarehouse/scripts.inc | 2 +- data/maps/OneIsland_Harbor/scripts.inc | 2 +- data/maps/PalletTown/scripts.inc | 4 +- .../PalletTown_PlayersHouse_1F/scripts.inc | 2 +- .../PalletTown_PlayersHouse_2F/scripts.inc | 2 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 96 +++++++++---------- data/maps/PewterCity/scripts.inc | 10 +- data/maps/PewterCity_Museum_1F/scripts.inc | 6 +- .../PokemonLeague_AgathasRoom/scripts.inc | 2 +- .../maps/PokemonLeague_BrunosRoom/scripts.inc | 18 ++-- .../PokemonLeague_ChampionsRoom/scripts.inc | 2 +- .../maps/PokemonLeague_HallOfFame/scripts.inc | 2 +- .../maps/PokemonLeague_LancesRoom/scripts.inc | 2 +- .../PokemonLeague_LoreleisRoom/scripts.inc | 2 +- data/maps/Route25_SeaCottage/scripts.inc | 8 +- data/maps/SeafoamIslands_B4F/scripts.inc | 2 +- data/maps/SevenIsland_House_Room1/scripts.inc | 6 +- .../scripts.inc | 2 +- .../scripts.inc | 40 ++++---- .../TwoIsland_JoyfulGameCorner/scripts.inc | 2 +- data/scripts/cable_club.inc | 2 +- data/scripts/move_tutors.inc | 8 +- include/constants/global.h | 8 +- include/global.fieldmap.h | 9 -- 28 files changed, 128 insertions(+), 131 deletions(-) diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index aa2740e3c..d107b3330 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -434,9 +434,9 @@ CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16CB34 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if ne, EventScript_16CB3F removeobject 11 release diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index def1c9e63..ba6ab7d60 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -39,11 +39,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_16E96F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16E981 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index c60348e8b..4a8b01c27 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF .2byte 0 EventScript_1687F9:: @ 81687F9 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index bc4807028..87b7cda7b 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -52,13 +52,13 @@ EventScript_171F34:: @ 8171F34 textcolor 0 msgbox gUnknown_81A4566 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_171FCD - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_171FE9 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_171FFE - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 7ef19e499..0050e2f93 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -112,7 +112,7 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection - compare VAR_RESULT, 2 + compare VAR_RESULT, DIR_NORTH call_if eq, EventScript_16412E msgbox gUnknown_817B7AE closemessage diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index fb6e9286e..3fb0928db 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -8,7 +8,7 @@ OneIsland_Harbor_OnWarp:: @ 8171383 .2byte 0 EventScript_17138D:: @ 817138D - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end OneIsland_Harbor_OnFrame:: @ 8171392 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 50681f724..4feb30355 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -392,9 +392,9 @@ PalletTown_EventScript_16575C:: @ 816575C waitmovement 0 msgbox gUnknown_81B1C9F closemessage - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_1657D7 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if ne, EventScript_1657E2 moveobjectoffscreen 1 setflag FLAG_TEMP_2 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 538ef9234..999cd7dbb 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -35,7 +35,7 @@ EventScript_168C4A:: @ 8168C4A PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH goto_if eq, EventScript_168C78 msgbox gUnknown_818D4F9 releaseall diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index c51fdcd61..acd6e8c77 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -17,7 +17,7 @@ PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE .2byte 0 EventScript_168CC8:: @ 8168CC8 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 70fd7304f..a4988a1c2 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -40,7 +40,7 @@ PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1 .2byte 0 EventScript_168FEB:: @ 8168FEB - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 @@ -50,7 +50,7 @@ PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 EventScript_169002:: @ 8169002 lockall - setvar VAR_FACING, 2 + setvar VAR_FACING, DIR_NORTH textcolor 0 applymovement 4, Movement_1692B0 waitmovement 0 @@ -66,32 +66,32 @@ EventScript_169002:: @ 8169002 EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169174 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1691BB - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169194 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1691DB - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1691F1 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1691FC - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169215 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169227 addobject 9 addobject 10 @@ -101,13 +101,13 @@ EventScript_169035:: @ 8169035 removeobject 9 removeobject 10 delay 30 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169845 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169850 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16985B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16986D textcolor 3 playfanfare MUS_FAN5 @@ -120,13 +120,13 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818F1DB closemessage playbgm MUS_RIVAL2, 0 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169B69 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169B7B - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169B7B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm @@ -645,13 +645,13 @@ EventScript_16961E:: @ 816961E playbgm MUS_RIVAL1, 0 msgbox gUnknown_818DE8D closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169A82 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169AC1 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169A9E - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 @@ -662,23 +662,23 @@ EventScript_16961E:: @ 816961E waitmovement 0 applymovement 4, Movement_Delay48 waitmovement 0 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169ADD - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169B14 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169AF5 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169B86 msgbox gUnknown_818E508 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169882 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_16988D - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_1698A6 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_1698B8 msgbox gUnknown_818E536 closemessage @@ -691,13 +691,13 @@ EventScript_16961E:: @ 816961E delay 10 removeobject 10 delay 25 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169845 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169850 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16985B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16986D delay 10 textcolor 3 @@ -716,24 +716,24 @@ EventScript_16961E:: @ 816961E famechecker FAMECHECKER_OAK, 1 msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169B33 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169B45 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169B57 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169B69 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169B7B - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169B7B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm @@ -856,13 +856,13 @@ EventScript_169913:: @ 8169913 delay 40 message Text_1A7291 waitmessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169964 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_16996F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16997A - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169985 applymovement 4, Movement_FacePlayer waitmovement 0 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 5e2d42c18..7b5d4c2fe 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -13,7 +13,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage @@ -1038,13 +1038,13 @@ PewterCity_EventScript_16607E:: @ 816607E closemessage delay 10 playbgm MUS_ANNAI, 0 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1660EE - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_166100 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_166112 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_166124 msgbox gUnknown_817E5AC closemessage diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 7dc341fb6..8c9e56390 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -4,11 +4,11 @@ PewterCity_Museum_1F_MapScripts:: @ 816A31A PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B lock faceplayer - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST goto_if eq, EventScript_16A348 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH goto_if eq, EventScript_16A348 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH goto_if eq, EventScript_16A348 msgbox gUnknown_8190539 release diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 721396149..dcb002b5d 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -30,7 +30,7 @@ PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 .2byte 0 EventScript_16285B:: @ 816285B - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index c31000e50..0eeb407c9 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -30,7 +30,7 @@ PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 .2byte 0 EventScript_1626D0:: @ 81626D0 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5 @@ -87,13 +87,13 @@ EventScript_16276E:: @ 816276E EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1627FA - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1627EF - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_162805 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_162805 release end @@ -103,13 +103,13 @@ EventScript_1627B0:: @ 81627B0 call EventScript_1A7506 msgbox gUnknown_8178420 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1627FA - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1627EF - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_162805 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_162805 release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 567053a90..63c370711 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -45,7 +45,7 @@ PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D .2byte 0 EventScript_162B67:: @ 8162B67 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index abc93f6c3..960b8cbb1 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -8,7 +8,7 @@ PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 .2byte 0 EventScript_162D61:: @ 8162D61 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 6bed6e4c3..257875ea2 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -30,7 +30,7 @@ PokemonLeague_LancesRoom_OnWarp:: @ 816296E .2byte 0 EventScript_162978:: @ 8162978 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_LancesRoom_OnFrame:: @ 816297D diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 3475b0f97..27550f51f 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -35,7 +35,7 @@ PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 .2byte 0 EventScript_1625C0:: @ 81625C0 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5 diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 6bcfb08cc..3b41eac68 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -50,13 +50,13 @@ EventScript_17059C:: @ 817059C msgbox gUnknown_819FFD3 closemessage delay 10 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_17062A - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_170635 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_170635 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_170635 opendoor 10, 3 waitdooranim diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 25bd70e68..70b33cf35 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -69,7 +69,7 @@ SeafoamIslands_B4F_OnWarp:: @ 81630E7 .2byte 0 EventScript_1630F1:: @ 81630F1 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH special Special_ForcePlayerToStartSurfing end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 2778ae66d..fd358401f 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -108,11 +108,11 @@ EventScript_170987:: @ 8170987 special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_170A2D - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_170A3F - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 5685358cd..63ce3fb65 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -20,7 +20,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if ne, EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 41bd9f235..4c7b28205 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -16,13 +16,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 applymovement 2, Movement_16440F waitmovement 0 playse SE_W070 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_16430F - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_16430F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16431A - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 @@ -30,43 +30,43 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 setvar VAR_0x8007, 3 special Special_ShakeScreen delay 60 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_164325 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_164330 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16433B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_164351 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_164366 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16437B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_164390 removeobject 1 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1642F9 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1642F9 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_164304 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_164304 msgbox gUnknown_817BDD4 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1643A5 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1643B7 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_1643C9 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_1643DB playse SE_KAIDAN delay 35 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 07577f92b..6ad841ea4 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -23,7 +23,7 @@ TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404 .2byte 0 EventScript_171416:: @ 8171416 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 53869703e..e702b9a13 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -38,7 +38,7 @@ CableClub_OnWarp:: @ 81BB1ED EventScript_CheckTurnAttendant:: @ 81BB227 compare VAR_0x8007, 0 goto_if eq, EventScript_CheckTurnAttendantEnd - turnobject VAR_0x8007, 3 + turnobject VAR_0x8007, DIR_WEST EventScript_CheckTurnAttendantEnd: end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index d25a694be..211c2a935 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -478,13 +478,13 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F26 copyvar VAR_0x8009, VAR_0x8005 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1C4EF0 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1C4EFB - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_1C4F06 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_1C4F11 msgbox Text_1A4751, MSGBOX_YESNO compare VAR_RESULT, NO diff --git a/include/constants/global.h b/include/constants/global.h index 4a4c83c62..c11945ed8 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -58,6 +58,12 @@ #define NUM_BAG_POCKETS 5 #define PARTY_SIZE 6 -#define MULTI_PARTY_SIZE PARTY_SIZE / 2 +#define MULTI_PARTY_SIZE (PARTY_SIZE / 2) + +#define DIR_NONE 0 +#define DIR_SOUTH 1 +#define DIR_NORTH 2 +#define DIR_WEST 3 +#define DIR_EAST 4 #endif //GUARD_CONSTANTS_GLOBAL_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index e567c6d5f..4402d5042 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -267,15 +267,6 @@ enum ACRO_BIKE_STATE6, }; -enum -{ - DIR_NONE, - DIR_SOUTH, - DIR_NORTH, - DIR_WEST, - DIR_EAST, -}; - enum { COLLISION_LEDGE_JUMP = 6 From d071f055041d551b33fafac01e6bbe28aaee746f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 9 Jan 2020 13:25:10 -0500 Subject: [PATCH 08/20] Split more files from event_scripts.s --- asm/field_control_avatar.s | 8 +- data/event_scripts.s | 1584 +---------------- .../scripts.inc | 4 +- .../scripts.inc | 2 +- .../scripts.inc | 4 +- data/maps/CeruleanCity_Mart/scripts.inc | 2 +- data/maps/CinnabarIsland_Mart/scripts.inc | 2 +- data/maps/FourIsland_Mart/scripts.inc | 2 +- data/maps/FuchsiaCity_Mart/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/LavenderTown_Mart/scripts.inc | 2 +- data/maps/OneIsland_PokemonCenter_1F/text.inc | 2 +- data/maps/PewterCity_Mart/scripts.inc | 2 +- data/maps/SaffronCity_Mart/scripts.inc | 2 +- data/maps/SevenIsland_Mart/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/SixIsland_Mart/scripts.inc | 2 +- data/maps/ThreeIsland_Mart/scripts.inc | 2 +- data/maps/TwoIsland/scripts.inc | 2 +- data/maps/VermilionCity_Mart/scripts.inc | 2 +- data/maps/ViridianCity_Mart/scripts.inc | 2 +- data/scripts/obtain_item.inc | 248 +++ data/scripts/pc.inc | 108 ++ data/scripts/silphco_doors.inc | 585 ++++++ data/scripts/test.inc | 27 + data/text/braille.inc | 116 ++ data/text/new_game_intro.inc | 234 +++ data/text/obtain_item.inc | 47 + data/text/poke_dude.inc | 155 ++ data/text/save.inc | 26 + include/event_scripts.h | 1 + include/strings.h | 2 +- src/script_menu.c | 2 +- 33 files changed, 1594 insertions(+), 1591 deletions(-) create mode 100644 data/scripts/obtain_item.inc create mode 100644 data/scripts/pc.inc create mode 100644 data/scripts/silphco_doors.inc create mode 100644 data/scripts/test.inc create mode 100644 data/text/braille.inc create mode 100644 data/text/new_game_intro.inc create mode 100644 data/text/obtain_item.inc create mode 100644 data/text/poke_dude.inc create mode 100644 data/text/save.inc diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 3e76d76e2..a2f09c15a 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -801,7 +801,7 @@ _0806CEB8: ldr r0, _0806CED8 @ =gUnknown_8168CE4 cmp r4, r0 beq _0806CECA - ldr r0, _0806CEDC @ =gUnknown_81A6955 + ldr r0, _0806CEDC @ =EventScript_PC cmp r4, r0 beq _0806CECA movs r0, 0x5 @@ -816,7 +816,7 @@ _0806CED2: bx r1 .align 2, 0 _0806CED8: .4byte gUnknown_8168CE4 -_0806CEDC: .4byte gUnknown_81A6955 +_0806CEDC: .4byte EventScript_PC thumb_func_end sub_806CEA0 thumb_func_start TryGetScriptOnPressingA @@ -1219,11 +1219,11 @@ sub_806D1F0: @ 806D1F0 lsrs r0, 24 cmp r0, 0x1 bne _0806D218 - ldr r0, _0806D214 @ =gUnknown_81A6955 + ldr r0, _0806D214 @ =EventScript_PC b _0806D53E .align 2, 0 _0806D210: .4byte gSpecialVar_Facing -_0806D214: .4byte gUnknown_81A6955 +_0806D214: .4byte EventScript_PC _0806D218: adds r0, r4, 0 bl MetatileBehavior_IsRegionMap diff --git a/data/event_scripts.s b/data/event_scripts.s index 10b6ae676..1796bc138 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -860,19 +860,19 @@ Text_WeHopeToSeeYouAgain2:: @ 81A505B Text_BootedUpPC:: @ 81A5075 .string "{PLAYER} booted up the PC.$" -gUnknown_81A508A:: @ 81A508A +Text_AccessWhichPC:: @ 81A508A .string "Which PC should be accessed?$" -Text_1A50A7:: @ 81A50A7 +Text_AccessedSomeonesPC:: @ 81A50A7 .string "Accessed Someone's PC.$" -Text_1A50BE:: @ 81A50BE +Text_OpenedPkmnStorage:: @ 81A50BE .string "POKéMON Storage System opened.$" -Text_1A50DD:: @ 81A50DD +Text_AccessedPlayersPC:: @ 81A50DD .string "Accessed {PLAYER}'s PC.$" -Text_1A50EF:: @ 81A50EF +Text_AccessedBillsPC:: @ 81A50EF .string "Accessed BILL's PC.$" Text_1A5103:: @ 81A5103 @@ -898,53 +898,7 @@ Text_1A51D0:: @ 81A51D0 .string "{PLAYER}{KUN}, welcome!\p" .string "What can I do for you?$" -Text_ObtainedTheX:: @ 81A51F6 - .string "Obtained the {STR_VAR_2}!$" - -Text_BagIsFull:: @ 81A5207 - .string "The BAG is full…$" - -Text_PutItemAway:: @ 81A5218 - .string "{PLAYER} put the {STR_VAR_2}\n" - .string "in the {STR_VAR_3}.$" - -Text_FoundOneItem:: @ 81A5231 - .string "{PLAYER} found one {STR_VAR_2}!$" - -Text_TooBadBagFull:: @ 81A5242 - .string "Too bad!\n" - .string "The BAG is full…$" - -Text_FoundXCoins:: @ 81A525C - .string "{PLAYER} found\n" - .string "{STR_VAR_1} {STR_VAR_2}!$" - -Text_PutCoinsAwayInCoinCase:: @ 81A526C - .string "{PLAYER} put the COINS away in\n" - .string "the COIN CASE.$" - -Text_CoinCaseIsFull:: @ 81A5294 - .string "Too bad!\n" - .string "The COIN CASE is full…$" - -Text_NothingToPutThemIn:: @ 81A52B4 - .string "Too bad!\n" - .string "There's nothing to put them in…$" - -Text_FoundXItems:: @ 81A52DD - .string "{PLAYER} found\n" - .string "{STR_VAR_1} {STR_VAR_2}(s)!$" - -Text_1A52F0:: @ 81A52F0 - .string "Obtained the {STR_VAR_2}!$" - -Text_1A5301:: @ 81A5301 - .string "Too bad! There's no room left for\n" - .string "another {STR_VAR_2}…$" - -gUnknown_81A532F:: @ 81A532F - .string "The {STR_VAR_2} was transferred\n" - .string "to the PC.$" + .include "data/text/obtain_item.inc" Text_1A5351:: @ 81A5351 .string "じゅんびちゅうです！$" @@ -1091,16 +1045,16 @@ Text_ItNeedsCardKey:: @ 81A5BAD .string "No!\n" .string "It needs a CARD KEY!$" -Text_1A5BC6:: @ 81A5BC6 +Text_AccessedProfOaksPC:: @ 81A5BC6 .string "Accessed PROF. OAK's PC…\p" .string "Accessed the POKéDEX Rating\n" .string "System…$" -Text_1A5C03:: @ 81A5C03 +Text_HavePokedexRated:: @ 81A5C03 .string "Would you like to have your\n" .string "POKéDEX rated?$" -Text_1A5C2E:: @ 81A5C2E +Text_ClosedLinkToProfOaksPC:: @ 81A5C2E .string "Closed link to PROF. OAK's PC.$" Text_1A5C4D:: @ 81A5C4D @@ -1223,11 +1177,11 @@ Text_1A61E5:: @ 81A61E5 .string "POKéMON!\p" .string "{PLAYER} whited out!$" -Text_1A6211:: @ 81A6211 +Text_MayIHelpYou:: @ 81A6211 .string "Hi, there!\n" .string "May I help you?$" -Text_1A622C:: @ 81A622C +Text_FillOutQuestionnaire:: @ 81A622C .string "There is a questionnaire.\n" .string "Would you like to fill it out?$" @@ -1372,364 +1326,8 @@ EventScript_1A6551:: @ 81A6551 return .include "data/scripts/pkmn_center_nurse.inc" - -EventScript_1A666F:: @ 81A666F - copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID - return - -EventScript_1A6675:: @ 81A6675 - copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS - return - -Std_ObtainItem:: @ 81A667B - copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID - textcolor 3 - additem VAR_0x8000, VAR_0x8001 - copyvar VAR_0x8007, VAR_RESULT - call EventScript_1A6697 - copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS - return - -EventScript_1A6697:: @ 81A6697 - bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 - checkitemtype VAR_0x8000 - call EventScript_1A66BC - compare VAR_0x8007, 1 - call_if eq, EventScript_1A6749 - compare VAR_0x8007, 0 - call_if eq, EventScript_1A675E - return - -EventScript_1A66BC:: @ 81A66BC - switch VAR_RESULT - case POCKET_ITEMS, EventScript_1A66F9 - case POCKET_KEY_ITEMS, EventScript_1A6709 - case POCKET_POKE_BALLS, EventScript_1A6719 - case POCKET_TM_CASE, EventScript_1A6729 - case POCKET_BERRY_POUCH, EventScript_1A6739 - end - -EventScript_1A66F9:: @ 81A66F9 - getstdstring 2, 24 - compare VAR_0x8007, 1 - call_if eq, EventScript_1A6764 - return - -EventScript_1A6709:: @ 81A6709 - getstdstring 2, 25 - compare VAR_0x8007, 1 - call_if eq, EventScript_1A6764 - return - -EventScript_1A6719:: @ 81A6719 - getstdstring 2, 26 - compare VAR_0x8007, 1 - call_if eq, EventScript_1A6764 - return - -EventScript_1A6729:: @ 81A6729 - getstdstring 2, 27 - compare VAR_0x8007, 1 - call_if eq, EventScript_1A6768 - return - -EventScript_1A6739:: @ 81A6739 - getstdstring 2, 28 - compare VAR_0x8007, 1 - call_if eq, EventScript_1A6764 - return - -EventScript_1A6749:: @ 81A6749 - message Text_ObtainedTheX - waitfanfare - waitmessage - msgbox Text_PutItemAway - setvar VAR_RESULT, 1 - return - -EventScript_1A675E:: @ 81A675E - setvar VAR_RESULT, 0 - return - -EventScript_1A6764:: @ 81A6764 - playfanfare MUS_FANFA1 - return - -EventScript_1A6768:: @ 81A6768 - playfanfare MUS_FANFA1 - return - -Std_ObtainDecoration:: @ 81A676C - adddecor VAR_0x8000 - copyvar VAR_0x8007, VAR_RESULT - call EventScript_1A677A - return - -EventScript_1A677A:: @ 81A677A - getdecorname 1, VAR_0x8000 - compare VAR_0x8007, 1 - call_if eq, EventScript_1A6795 - compare VAR_0x8007, 0 - call_if eq, EventScript_1A67AD - return - -EventScript_1A6795:: @ 81A6795 - playfanfare MUS_FANFA4 - message Text_1A52F0 - waitfanfare - waitmessage - msgbox gUnknown_81A532F - setvar VAR_RESULT, 1 - return - -EventScript_1A67AD:: @ 81A67AD - setvar VAR_RESULT, 0 - return - -Std_FindItem:: @ 81A67B3 - lock - faceplayer - waitse - copyvar VAR_0x8004, VAR_0x8000 - copyvar VAR_0x8005, VAR_0x8001 - checkitemspace VAR_0x8000, VAR_0x8001 - copyvar VAR_0x8007, VAR_RESULT - getitemname 1, VAR_0x8000 - checkitemtype VAR_0x8000 - call EventScript_1A66BC - compare VAR_0x8007, 1 - call_if eq, EventScript_1A67EE - compare VAR_0x8007, 0 - call_if eq, EventScript_1A682D - release - return - -EventScript_1A67EE:: @ 81A67EE - removeobject VAR_LAST_TALKED - additem VAR_0x8004, VAR_0x8005 - specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName - copyvar VAR_0x8008, VAR_RESULT - compare VAR_0x8008, 1 - call_if eq, EventScript_1A6821 - compare VAR_0x8008, 0 - call_if eq, EventScript_1A6827 - waitfanfare - waitmessage - msgbox Text_PutItemAway - return - -EventScript_1A6821:: @ 81A6821 - message Text_1A63E8 - return - -EventScript_1A6827:: @ 81A6827 - message Text_FoundOneItem - return - -EventScript_1A682D:: @ 81A682D - msgbox Text_ObtainedTheX - msgbox Text_TooBadBagFull - setvar VAR_RESULT, 0 - return - -EventScript_PickUpHiddenItem:: @ 81A6843 - lockall - textcolor 3 - waitse - compare VAR_0x8005, 0 - goto_if eq, EventScript_PickUpHiddenCoins - call EventScript_GiveItem - compare VAR_0x8007, 1 - goto_if eq, EventScript_ItemInPocketMessage - compare VAR_0x8007, 0 - goto_if eq, EventScript_BagIsFullMessage - end - -EventScript_GiveItem:: - additem VAR_0x8005, VAR_0x8006 - copyvar VAR_0x8007, VAR_RESULT - getitemname 1, VAR_0x8005 - checkitemtype VAR_0x8005 - call EventScript_1A66BC - return - -EventScript_ItemInPocketMessage:: - compare VAR_0x8006, 1 - call_if eq, EventScript_FoundSingleItemMessage - compare VAR_0x8006, 1 - call_if ne, EventScript_FoundMultipleItemsMessage - waitfanfare - waitmessage - msgbox Text_PutItemAway - special Special_SetHiddenItemFlag - releaseall - end - -EventScript_FoundSingleItemMessage:: - message Text_FoundOneItem - return - -EventScript_FoundCoinsMessage:: - getnumberstring 0, VAR_0x8006 - message Text_FoundXCoins - return - -EventScript_FoundMultipleItemsMessage:: - getnumberstring 0, VAR_0x8006 - message Text_FoundXItems - return - -EventScript_BagIsFullMessage:: - msgbox Text_FoundOneItem - msgbox Text_TooBadBagFull - setvar VAR_RESULT, 0 - releaseall - end - -EventScript_PickUpHiddenCoins:: - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_HiddenCoinsButNoCoinCase - checkcoins VAR_RESULT - specialvar VAR_RESULT, Special_CheckAddCoins - compare VAR_RESULT, 0 - goto_if eq, EventScript_HiddenCoinsButTheCoinCaseIsFull - givecoins VAR_0x8006 - getstdstring 1, 0x17 - call EventScript_1A6764 - call EventScript_FoundCoinsMessage - waitfanfare - waitmessage - msgbox Text_PutCoinsAwayInCoinCase - special Special_SetHiddenItemFlag - releaseall - end - -EventScript_HiddenCoinsButTheCoinCaseIsFull:: - getnumberstring 0, VAR_0x8006 - getstdstring 1, 0x17 - msgbox Text_FoundXCoins - msgbox Text_CoinCaseIsFull - setvar VAR_RESULT, 0 - releaseall - end - -EventScript_HiddenCoinsButNoCoinCase:: - getnumberstring 0, VAR_0x8006 - getstdstring 1, 0x17 - msgbox Text_FoundXCoins - msgbox Text_NothingToPutThemIn - setvar VAR_RESULT, 0 - releaseall - end - -gUnknown_81A6955:: @ 81A6955 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - lockall - checkflag FLAG_SYS_PC_STORAGE_DISABLED - goto_if TRUE, EventScript_1A698E - setvar VAR_0x8004, 27 - special Special_SetSomeVariable - setvar VAR_0x8004, 0 - special Special_AnimatePcTurnOn - playse SE_PC_ON - msgbox Text_BootedUpPC - goto EventScript_1A6998 - end - -EventScript_1A698E:: @ 81A698E - msgbox Text_1A1390 - releaseall - end - -EventScript_1A6998:: @ 81A6998 - message gUnknown_81A508A - waitmessage - special ScrSpecial_CreatePCMenu - waitstate - goto EventScript_1A69A8 - end - -EventScript_1A69A8:: @ 81A69A8 - switch VAR_RESULT - case 0, EventScript_1A6A05 - case 1, EventScript_1A69F0 - case 2, EventScript_1A6A7A - case 3, EventScript_1A6A56 - case 4, EventScript_1A6A46 - case SCR_MENU_CANCEL, EventScript_1A6A46 - end - -EventScript_1A69F0:: @ 81A69F0 - playse SE_PC_LOGIN - msgbox Text_1A50DD - special PlayerPC - waitstate - goto EventScript_1A6998 - end - -EventScript_1A6A05:: @ 81A6A05 - playse SE_PC_LOGIN - checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if FALSE, EventScript_1A6A34 - checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if TRUE, EventScript_1A6A3D - msgbox Text_1A50BE - special ShowPokemonStorageSystem - waitstate - setvar VAR_0x8004, 27 - special Special_SetSomeVariable - goto EventScript_1A6998 - end - -EventScript_1A6A34:: @ 81A6A34 - msgbox Text_1A50A7 - return - -EventScript_1A6A3D:: @ 81A6A3D - msgbox Text_1A50EF - return - -EventScript_1A6A46:: @ 81A6A46 - setvar VAR_0x8004, 0 - playse SE_PC_OFF - special Special_AnimatePcTurnOff - special sub_812B35C - releaseall - end - -EventScript_1A6A56:: @ 81A6A56 - checkflag FLAG_SYS_GAME_CLEAR - goto_if FALSE, EventScript_1A6A46 - playse SE_PC_LOGIN - setvar VAR_0x8004, 31 - special HelpSystem_BackupSomeVariable - special Special_SetSomeVariable - special HallOfFamePCBeginFade - waitstate - special HelpSystem_RestoreSomeVariable - goto EventScript_1A69A8 - end - -EventScript_1A6A7A:: @ 81A6A7A - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1A6A46 - playse SE_PC_LOGIN - msgbox Text_1A5BC6 - msgbox Text_1A5C03, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if eq, EventScript_1A6AB2 - setflag FLAG_OAKS_RATING_IS_VIA_PC - call EventScript_1A73E0 - clearflag FLAG_OAKS_RATING_IS_VIA_PC - goto EventScript_1A6AB2 - end - -EventScript_1A6AB2:: @ 81A6AB2 - msgbox Text_1A5C2E - goto EventScript_1A6998 - end + .include "data/scripts/obtain_item.inc" + .include "data/scripts/pc.inc" EventScript_1A6AC0:: @ 81A6AC0 fadescreen 1 @@ -2231,7 +1829,7 @@ gUnknown_81A76F9:: @ 81A76F9 gUnknown_81A7702:: @ 81A7702 lockall textcolor 3 - msgbox Text_1A622C, MSGBOX_YESNO + msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO compare VAR_RESULT, NO goto_if eq, EventScript_1A778A setvar VAR_0x8004, 14 @@ -2791,591 +2389,7 @@ EventScript_1A80FE:: @ 81A80FE releaseall end -EventScript_NeedCardKey:: @ 81A8135 - msgbox Text_ItNeedsCardKey - releaseall - end - -EventScript_DoorUnlocked:: @ 81A813F - msgbox Text_TheDoorIsOpen - releaseall - end - -EventScript_Close2FDoor1:: @ 81A8149 - setmetatile 5, 8, 944, 1 - setmetatile 6, 8, 945, 1 - setmetatile 5, 9, 952, 1 - setmetatile 6, 9, 953, 1 - setmetatile 6, 10, 821, 0 - return - -EventScript_Close2FDoor2:: @ 81A8177 - setmetatile 5, 15, 944, 1 - setmetatile 6, 15, 945, 1 - setmetatile 5, 16, 952, 1 - setmetatile 6, 16, 953, 1 - setmetatile 6, 17, 821, 0 - return - -EventScript_Close3FDoor1:: @ 81A81A5 - setmetatile 9, 11, 960, 1 - setmetatile 10, 11, 961, 1 - setmetatile 9, 12, 962, 1 - setmetatile 10, 12, 963, 1 - setmetatile 9, 13, 964, 1 - setmetatile 10, 13, 965, 1 - return - -EventScript_Close3FDoor2:: @ 81A81DC - setmetatile 20, 11, 960, 1 - setmetatile 21, 11, 961, 1 - setmetatile 20, 12, 962, 1 - setmetatile 21, 12, 963, 1 - setmetatile 20, 13, 964, 1 - setmetatile 21, 13, 965, 1 - return - -EventScript_Close4FDoor1:: @ 81A8213 - setmetatile 3, 16, 944, 1 - setmetatile 4, 16, 945, 1 - setmetatile 3, 17, 952, 1 - setmetatile 4, 17, 953, 1 - setmetatile 4, 18, 821, 0 - return - -EventScript_Close4FDoor2:: @ 81A8241 - setmetatile 14, 11, 944, 1 - setmetatile 15, 11, 945, 1 - setmetatile 14, 12, 952, 1 - setmetatile 15, 12, 953, 1 - setmetatile 15, 13, 821, 0 - return - -EventScript_Close5FDoor1:: @ 81A826F - setmetatile 7, 8, 960, 1 - setmetatile 8, 8, 961, 1 - setmetatile 7, 9, 962, 1 - setmetatile 8, 9, 963, 1 - setmetatile 7, 10, 964, 1 - setmetatile 8, 10, 965, 1 - return - -EventScript_Close5FDoor2:: @ 81A82A6 - setmetatile 7, 17, 960, 1 - setmetatile 8, 17, 961, 1 - setmetatile 7, 18, 962, 1 - setmetatile 8, 18, 963, 1 - setmetatile 7, 19, 964, 1 - setmetatile 8, 19, 965, 1 - return - -EventScript_Close5FDoor3:: @ 81A82DD - setmetatile 18, 12, 960, 1 - setmetatile 19, 12, 961, 1 - setmetatile 18, 13, 962, 1 - setmetatile 19, 13, 963, 1 - setmetatile 18, 14, 964, 1 - setmetatile 19, 14, 965, 1 - return - -EventScript_Close6FDoor:: @ 81A8314 - setmetatile 5, 14, 960, 1 - setmetatile 6, 14, 961, 1 - setmetatile 5, 15, 962, 1 - setmetatile 6, 15, 963, 1 - setmetatile 5, 16, 964, 1 - setmetatile 6, 16, 965, 1 - return - -EventScript_Close7FDoor1:: @ 81A834B - setmetatile 11, 8, 944, 1 - setmetatile 12, 8, 945, 1 - setmetatile 11, 9, 952, 1 - setmetatile 12, 9, 953, 1 - setmetatile 12, 10, 821, 0 - return - -EventScript_Close7FDoor2:: @ 81A8379 - setmetatile 24, 7, 944, 1 - setmetatile 25, 7, 945, 1 - setmetatile 24, 8, 952, 1 - setmetatile 25, 8, 953, 1 - setmetatile 25, 9, 821, 0 - return - -EventScript_Close7FDoor3:: @ 81A83A7 - setmetatile 25, 13, 944, 1 - setmetatile 26, 13, 945, 1 - setmetatile 25, 14, 952, 1 - setmetatile 26, 14, 953, 1 - setmetatile 26, 15, 821, 0 - return - -EventScript_Close8FDoor:: @ 81A83D5 - setmetatile 5, 9, 960, 1 - setmetatile 6, 9, 961, 1 - setmetatile 5, 10, 962, 1 - setmetatile 6, 10, 963, 1 - setmetatile 5, 11, 964, 1 - setmetatile 6, 11, 965, 1 - return - -EventScript_Close9FDoor1:: @ 81A840C - setmetatile 2, 9, 960, 1 - setmetatile 3, 9, 961, 1 - setmetatile 2, 10, 962, 1 - setmetatile 3, 10, 963, 1 - setmetatile 2, 11, 964, 1 - setmetatile 3, 11, 965, 1 - return - -EventScript_Close9FDoor2:: @ 81A8443 - setmetatile 12, 15, 960, 1 - setmetatile 13, 15, 961, 1 - setmetatile 12, 16, 962, 1 - setmetatile 13, 16, 963, 1 - setmetatile 12, 17, 964, 1 - setmetatile 13, 17, 965, 1 - return - -EventScript_Close9FDoor3:: @ 81A847A - setmetatile 21, 6, 944, 1 - setmetatile 22, 6, 945, 1 - setmetatile 21, 7, 952, 1 - setmetatile 22, 7, 953, 1 - setmetatile 22, 8, 821, 0 - return - -EventScript_Close9FDoor4:: @ 81A84A8 - setmetatile 21, 12, 944, 1 - setmetatile 22, 12, 945, 1 - setmetatile 21, 13, 952, 1 - setmetatile 22, 13, 953, 1 - setmetatile 22, 14, 821, 0 - return - -EventScript_Close10FDoor:: @ 81A84D6 - setmetatile 12, 11, 944, 1 - setmetatile 13, 11, 945, 1 - setmetatile 12, 12, 952, 1 - setmetatile 13, 12, 953, 1 - setmetatile 13, 13, 821, 0 - return - -EventScript_Close11FDoor:: @ 81A8504 - setmetatile 5, 16, 944, 1 - setmetatile 6, 16, 945, 1 - setmetatile 5, 17, 952, 1 - setmetatile 6, 17, 953, 1 - setmetatile 6, 18, 821, 0 - return - -EventScript_Open2FDoor1:: @ 81A8532 - setmetatile 5, 8, 821, 0 - setmetatile 6, 8, 820, 0 - setmetatile 5, 9, 821, 0 - setmetatile 6, 9, 820, 0 - setmetatile 6, 10, 820, 0 - return - -EventScript_Open2FDoor2:: @ 81A8560 - setmetatile 5, 15, 821, 0 - setmetatile 6, 15, 820, 0 - setmetatile 5, 16, 821, 0 - setmetatile 6, 16, 820, 0 - setmetatile 6, 17, 820, 0 - return - -EventScript_Open3FDoor1:: @ 81A858E - setmetatile 9, 11, 839, 1 - setmetatile 10, 11, 838, 1 - setmetatile 9, 12, 821, 0 - setmetatile 10, 12, 821, 0 - setmetatile 9, 13, 825, 0 - setmetatile 10, 13, 826, 0 - return - -EventScript_Open3FDoor2:: @ 81A85C5 - setmetatile 20, 11, 839, 1 - setmetatile 21, 11, 838, 1 - setmetatile 20, 12, 821, 0 - setmetatile 21, 12, 821, 0 - setmetatile 20, 13, 825, 0 - setmetatile 21, 13, 826, 0 - return - -EventScript_Open4FDoor1:: @ 81A85FC - setmetatile 3, 16, 821, 0 - setmetatile 4, 16, 820, 0 - setmetatile 3, 17, 821, 0 - setmetatile 4, 17, 820, 0 - setmetatile 4, 18, 820, 0 - return - -EventScript_Open4FDoor2:: @ 81A862A - setmetatile 14, 11, 821, 0 - setmetatile 15, 11, 820, 0 - setmetatile 14, 12, 821, 0 - setmetatile 15, 12, 820, 0 - setmetatile 15, 13, 820, 0 - return - -EventScript_Open5FDoor1:: @ 81A8658 - setmetatile 7, 8, 839, 1 - setmetatile 8, 8, 838, 1 - setmetatile 7, 9, 821, 0 - setmetatile 8, 9, 821, 0 - setmetatile 7, 10, 825, 0 - setmetatile 8, 10, 826, 0 - return - -EventScript_Open5FDoor2:: @ 81A868F - setmetatile 7, 17, 839, 1 - setmetatile 8, 17, 838, 1 - setmetatile 7, 18, 821, 0 - setmetatile 8, 18, 821, 0 - setmetatile 7, 19, 825, 0 - setmetatile 8, 19, 826, 0 - return - -EventScript_Open5FDoor3:: @ 81A86C6 - setmetatile 18, 12, 839, 1 - setmetatile 19, 12, 838, 1 - setmetatile 18, 13, 821, 0 - setmetatile 19, 13, 821, 0 - setmetatile 18, 14, 825, 0 - setmetatile 19, 14, 826, 0 - return - -EventScript_Open6FDoor:: @ 81A86FD - setmetatile 5, 14, 839, 1 - setmetatile 6, 14, 838, 1 - setmetatile 5, 15, 821, 0 - setmetatile 6, 15, 821, 0 - setmetatile 5, 16, 825, 0 - setmetatile 6, 16, 826, 0 - return - -EventScript_Open7FDoor1:: @ 81A8734 - setmetatile 11, 8, 821, 0 - setmetatile 12, 8, 820, 0 - setmetatile 11, 9, 821, 0 - setmetatile 12, 9, 820, 0 - setmetatile 12, 10, 820, 0 - return - -EventScript_Open7FDoor2:: @ 81A8762 - setmetatile 24, 7, 821, 0 - setmetatile 25, 7, 820, 0 - setmetatile 24, 8, 821, 0 - setmetatile 25, 8, 820, 0 - setmetatile 25, 9, 820, 0 - return - -EventScript_Open7FDoor3:: @ 81A8790 - setmetatile 25, 13, 821, 0 - setmetatile 26, 13, 820, 0 - setmetatile 25, 14, 821, 0 - setmetatile 26, 14, 820, 0 - setmetatile 26, 15, 820, 0 - return - -EventScript_Open8FDoor:: @ 81A87BE - setmetatile 5, 9, 839, 1 - setmetatile 6, 9, 838, 1 - setmetatile 5, 10, 821, 0 - setmetatile 6, 10, 821, 0 - setmetatile 5, 11, 825, 0 - setmetatile 6, 11, 826, 0 - return - -EventScript_Open9FDoor1:: @ 81A87F5 - setmetatile 2, 9, 839, 1 - setmetatile 3, 9, 838, 1 - setmetatile 2, 10, 821, 0 - setmetatile 3, 10, 821, 0 - setmetatile 2, 11, 825, 0 - setmetatile 3, 11, 826, 0 - return - -EventScript_Open9FDoor2:: @ 81A882C - setmetatile 12, 15, 839, 1 - setmetatile 13, 15, 838, 1 - setmetatile 12, 16, 821, 0 - setmetatile 13, 16, 821, 0 - setmetatile 12, 17, 825, 0 - setmetatile 13, 17, 826, 0 - return - -EventScript_Open9FDoor3:: @ 81A8863 - setmetatile 21, 6, 821, 0 - setmetatile 22, 6, 820, 0 - setmetatile 21, 7, 821, 0 - setmetatile 22, 7, 820, 0 - setmetatile 22, 8, 820, 0 - return - -EventScript_Open9FDoor4:: @ 81A8891 - setmetatile 21, 12, 821, 0 - setmetatile 22, 12, 820, 0 - setmetatile 21, 13, 821, 0 - setmetatile 22, 13, 820, 0 - setmetatile 22, 14, 820, 0 - return - -EventScript_Open10FDoor:: @ 81A88BF - setmetatile 12, 11, 821, 0 - setmetatile 13, 11, 820, 0 - setmetatile 12, 12, 821, 0 - setmetatile 13, 12, 820, 0 - setmetatile 13, 13, 820, 0 - return - -EventScript_Open11FDoor:: @ 81A88ED - setmetatile 5, 16, 821, 0 - setmetatile 6, 16, 820, 0 - setmetatile 5, 17, 821, 0 - setmetatile 6, 17, 820, 0 - setmetatile 6, 18, 820, 0 - return - -SilphCo_2F_EventScript_Door1:: @ 81A891B - lockall - setvar VAR_0x4001, 1 - setvar VAR_0x8004, 634 - checkflag FLAG_SILPH_2F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_2F_EventScript_Door2:: @ 81A8935 - lockall - setvar VAR_0x4001, 2 - setvar VAR_0x8004, 635 - checkflag FLAG_SILPH_2F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_3F_EventScript_Door1:: @ 81A894F - lockall - setvar VAR_0x4001, 3 - setvar VAR_0x8004, 636 - checkflag FLAG_SILPH_3F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_3F_EventScript_Door2:: @ 81A8969 - lockall - setvar VAR_0x4001, 4 - setvar VAR_0x8004, 637 - checkflag FLAG_SILPH_3F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_4F_EventScript_Door1:: @ 81A8983 - lockall - setvar VAR_0x4001, 5 - setvar VAR_0x8004, 638 - checkflag FLAG_SILPH_4F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_4F_EventScript_Door2:: @ 81A899D - lockall - setvar VAR_0x4001, 6 - setvar VAR_0x8004, 639 - checkflag FLAG_SILPH_4F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_5F_EventScript_Door1:: @ 81A89B7 - lockall - setvar VAR_0x4001, 7 - setvar VAR_0x8004, 640 - checkflag FLAG_SILPH_5F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_5F_EventScript_Door2:: @ 81A89D1 - lockall - setvar VAR_0x4001, 8 - setvar VAR_0x8004, 641 - checkflag FLAG_SILPH_5F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_5F_EventScript_Door3:: @ 81A89EB - lockall - setvar VAR_0x4001, 9 - setvar VAR_0x8004, 642 - checkflag FLAG_SILPH_5F_DOOR_3 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_6F_EventScript_Door:: @ 81A8A05 - lockall - setvar VAR_0x4001, 10 - setvar VAR_0x8004, 643 - checkflag FLAG_SILPH_6F_DOOR - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_7F_EventScript_Door1:: @ 81A8A1F - lockall - setvar VAR_0x4001, 11 - setvar VAR_0x8004, 644 - checkflag FLAG_SILPH_7F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_7F_EventScript_Door2:: @ 81A8A39 - lockall - setvar VAR_0x4001, 12 - setvar VAR_0x8004, 645 - checkflag FLAG_SILPH_7F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_7F_EventScript_Door3:: @ 81A8A53 - lockall - setvar VAR_0x4001, 13 - setvar VAR_0x8004, 646 - checkflag FLAG_SILPH_7F_DOOR_3 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_8F_EventScript_Door:: @ 81A8A6D - lockall - setvar VAR_0x4001, 14 - setvar VAR_0x8004, 647 - checkflag FLAG_SILPH_8F_DOOR - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_9F_EventScript_Door1:: @ 81A8A87 - lockall - setvar VAR_0x4001, 15 - setvar VAR_0x8004, 648 - checkflag FLAG_SILPH_9F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_9F_EventScript_Door2:: @ 81A8AA1 - lockall - setvar VAR_0x4001, 16 - setvar VAR_0x8004, 649 - checkflag FLAG_SILPH_9F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_9F_EventScript_Door3:: @ 81A8ABB - lockall - setvar VAR_0x4001, 17 - setvar VAR_0x8004, 650 - checkflag FLAG_SILPH_9F_DOOR_3 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_9F_EventScript_Door4:: @ 81A8AD5 - lockall - setvar VAR_0x4001, 18 - setvar VAR_0x8004, 651 - checkflag FLAG_SILPH_9F_DOOR_4 - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_10F_EventScript_Door:: @ 81A8AEF - lockall - setvar VAR_0x4001, 19 - setvar VAR_0x8004, 652 - checkflag FLAG_SILPH_10F_DOOR - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -SilphCo_11F_EventScript_Door:: @ 81A8B09 - lockall - setvar VAR_0x4001, 20 - setvar VAR_0x8004, 653 - checkflag FLAG_SILPH_11F_DOOR - goto_if TRUE, EventScript_DoorUnlocked - goto EventScript_TryUnlockDoor - end - -EventScript_TryUnlockDoor:: @ 81A8B23 - checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY - goto_if TRUE, EventScript_OpenDoor - goto EventScript_NeedCardKey - end - -EventScript_OpenDoor:: @ 81A8B32 - playfanfare MUS_FANFA1 - msgbox Text_CardKeyOpenedDoor - waitfanfare - compare VAR_0x4001, 1 - call_if eq, EventScript_Open2FDoor1 - compare VAR_0x4001, 2 - call_if eq, EventScript_Open2FDoor2 - compare VAR_0x4001, 3 - call_if eq, EventScript_Open3FDoor1 - compare VAR_0x4001, 4 - call_if eq, EventScript_Open3FDoor2 - compare VAR_0x4001, 5 - call_if eq, EventScript_Open4FDoor1 - compare VAR_0x4001, 6 - call_if eq, EventScript_Open4FDoor2 - compare VAR_0x4001, 7 - call_if eq, EventScript_Open5FDoor1 - compare VAR_0x4001, 8 - call_if eq, EventScript_Open5FDoor2 - compare VAR_0x4001, 9 - call_if eq, EventScript_Open5FDoor3 - compare VAR_0x4001, 10 - call_if eq, EventScript_Open6FDoor - compare VAR_0x4001, 11 - call_if eq, EventScript_Open7FDoor1 - compare VAR_0x4001, 12 - call_if eq, EventScript_Open7FDoor2 - compare VAR_0x4001, 13 - call_if eq, EventScript_Open7FDoor3 - compare VAR_0x4001, 14 - call_if eq, EventScript_Open8FDoor - compare VAR_0x4001, 15 - call_if eq, EventScript_Open9FDoor1 - compare VAR_0x4001, 16 - call_if eq, EventScript_Open9FDoor2 - compare VAR_0x4001, 17 - call_if eq, EventScript_Open9FDoor3 - compare VAR_0x4001, 18 - call_if eq, EventScript_Open9FDoor4 - compare VAR_0x4001, 19 - call_if eq, EventScript_Open10FDoor - compare VAR_0x4001, 20 - call_if eq, EventScript_Open11FDoor - waitse - playse SE_KI_GASYAN - special DrawWholeMapView - waitse - special Special_SetHiddenItemFlag - releaseall - end + .include "data/scripts/silphco_doors.inc" EventScript_1A8C27:: @ 81A8C27 countpokemon @@ -3940,123 +2954,7 @@ EventScript_1A927C:: @ 81A927C release end -gUnknown_81A9288:: @ 81A9288 - .braille "UP$" - -gUnknown_81A928B:: @ 81A928B - .braille "DOWN$" - -gUnknown_81A9290:: @ 81A9290 - .braille "RIGHT$" - -gUnknown_81A9296:: @ 81A9296 - .braille "LEFT$" - -gUnknown_81A929B:: @ 81A929B - .braille "CUT$" - -gUnknown_81A929F:: @ 81A929F - .braille "ABC$" - -gUnknown_81A92A3:: @ 81A92A3 - .braille "GHI$" - -gUnknown_81A92A7:: @ 81A92A7 - .braille "MNO$" - -gUnknown_81A92AB:: @ 81A92AB - .braille "TUV$" - -gUnknown_81A92AF:: @ 81A92AF - .braille "DEF$" - -gUnknown_81A92B3:: @ 81A92B3 - .braille "JKL$" - -gUnknown_81A92B7:: @ 81A92B7 - .braille "PQRS$" - -gUnknown_81A92BC:: @ 81A92BC - .braille "WXYZ$" - -gUnknown_81A92C1:: @ 81A92C1 - .braille ".$" - -gUnknown_81A92C3:: @ 81A92C3 - .braille ",$" - -gUnknown_81A92C5:: @ 81A92C5 - .braille "EVERYTHING$" - -gUnknown_81A92D0:: @ 81A92D0 - .braille "HAS MEANING$" - -gUnknown_81A92DC:: @ 81A92DC - .braille "EXISTENCE$" - -gUnknown_81A92E6:: @ 81A92E6 - .braille "HAS MEANING$" - -gUnknown_81A92F2:: @ 81A92F2 - .braille "BEING ALIVE$" - -gUnknown_81A92FE:: @ 81A92FE - .braille "HAS MEANING$" - -gUnknown_81A930A:: @ 81A930A - .braille "HAVE DREAMS$" - -gUnknown_81A9316:: @ 81A9316 - .braille "USE POWER.$" - -gUnknown_81A9321:: @ 81A9321 - .braille "LET THE TWO$" - -gUnknown_81A932D:: @ 81A932D - .braille "GLITTERING$" - -gUnknown_81A9338:: @ 81A9338 - .braille "STONES$" - -gUnknown_81A933F:: @ 81A933F - .braille "ONE IN RED$" - -gUnknown_81A934A:: @ 81A934A - .braille "ONE IN BLUE$" - -gUnknown_81A9356:: @ 81A9356 - .braille "CONNECT THE$" - -gUnknown_81A9362:: @ 81A9362 - .braille "PAST.$" - -gUnknown_81A9368:: @ 81A9368 - .braille "TWO FRIENDS$" - -gUnknown_81A9374:: @ 81A9374 - .braille "SHARING$" - -gUnknown_81A937C:: @ 81A937C - .braille "POWER OPEN$" - -gUnknown_81A9387:: @ 81A9387 - .braille "A WINDOW TO$" - -gUnknown_81A9393:: @ 81A9393 - .braille "A NEW WORLD$" - -gUnknown_81A939F:: @ 81A939F - .braille "THAT GLOWS.$" - -gUnknown_81A93AB:: @ 81A93AB - .braille "THE NEXT$" - -gUnknown_81A93B4:: @ 81A93B4 - .braille "WORLD WAITS$" - -gUnknown_81A93C0:: @ 81A93C0 - .braille "FOR YOU.$" - + .include "data/text/braille.inc" .include "data/scripts/trainers.inc" @ Test message! @@ -5583,449 +4481,7 @@ Movement_1C5550:: @ 81C5550 face_down step_end -EventScript_1C5550:: @ 81C5552 - msgbox Text_1C556D, MSGBOX_NPC - end - -EventScript_1C555B:: @ 81C555B - msgbox Text_1C558D, MSGBOX_SIGN - end - -EventScript_1C5564:: @ 81C5564 - msgbox Text_1C55A4, MSGBOX_SIGN - end - -Text_1C556D:: @ 81C556D - .string "テストよう　メッセージです！\n" - .string "ポケモンの　せかいへ　ようこそ！$" - -Text_1C558D:: @ 81C558D - .string "テストよう　メッセージです！\n" - .string "かんばん　です$" - -Text_1C55A4:: @ 81C55A4 - .string "テストよう　メッセージです！\n" - .string "ざひょう　チェックの　イベントです$" - - .align 2 -Text_1C55C8:: @ 81C55C8 - .string "$" - -gText_WouldYouLikeToSaveTheGame:: @ 81C55C9 - .string "Would you like to save the game?$" - -gText_AlreadySaveFile_WouldLikeToOverwrite:: @ 81C55EA - .string "There is already a saved file.\n" - .string "Is it okay to overwrite it?$" - -gText_SavingDontTurnOffThePower:: @ 81C5625 - .string "SAVING…\n" - .string "DON'T TURN OFF THE POWER.$" - -gText_PlayerSavedTheGame:: @ 81C5647 - .string "{PLAYER} saved the game.$" - -gUnknown_81C565A:: - .string "セーブに　しっぱい　しました‥$" - -gText_DifferentGameFile:: @ 81C566A - .string "WARNING!\p" - .string "There is a different game file that\n" - .string "is already saved.\p" - .string "If you save now, the other file's\n" - .string "adventure, including items and\l" - .string "POKéMON, will be entirely lost.\p" - .string "Are you sure you want to save now\n" - .string "and overwrite the other save file?$" - -gOtherText_NewName:: @ 81C574F - .string "NEW NAME$" - -gNameChoice_Green:: @ 81C5758 - .string "GREEN$" - -gNameChoice_Red:: @ 81C575E - .string "RED$" - -gNameChoice_Leaf:: @ 81C5762 - .string "LEAF$" - -gNameChoice_Fire:: @ 81C5767 - .string "FIRE$" - -gNameChoice_Gary:: @ 81C576C - .string "GARY$" - -gNameChoice_Kaz:: @ 81C5771 - .string "KAZ$" - -gNameChoice_Toru:: @ 81C5775 - .string "TORU$" - -gNameChoice_Ash:: @ 81C577A - .string "ASH$" - -gNameChoice_Kene:: @ 81C577E - .string "KENE$" - -gNameChoice_Geki:: @ 81C5783 - .string "GEKI$" - -gNameChoice_Jak:: @ 81C5788 - .string "JAK$" - -gNameChoice_Janne:: @ 81C578C - .string "JANNE$" - -gNameChoice_Jonn:: @ 81C5792 - .string "JONN$" - -gNameChoice_Kamon:: @ 81C5797 - .string "KAMON$" - -gNameChoice_Karl:: @ 81C579D - .string "KARL$" - -gNameChoice_Taylor:: @ 81C57A2 - .string "TAYLOR$" - -gNameChoice_Oscar:: @ 81C57A9 - .string "OSCAR$" - -gNameChoice_Hiro:: @ 81C57AF - .string "HIRO$" - -gNameChoice_Max:: @ 81C57B4 - .string "MAX$" - -gNameChoice_Jon:: @ 81C57B8 - .string "JON$" - -gNameChoice_Ralph:: @ 81C57BC - .string "RALPH$" - -gNameChoice_Kay:: @ 81C57C2 - .string "KAY$" - -gNameChoice_Tosh:: @ 81C57C6 - .string "TOSH$" - -gNameChoice_Roak:: @ 81C57CB - .string "ROAK$" - -gNameChoice_Omi:: @ 81C57D0 - .string "OMI$" - -gNameChoice_Jodi:: @ 81C57D4 - .string "JODI$" - -gNameChoice_Amanda:: @ 81C57D9 - .string "AMANDA$" - -gNameChoice_Hillary:: @ 81C57E0 - .string "HILLARY$" - -gNameChoice_Makey:: @ 81C57E8 - .string "MAKEY$" - -gNameChoice_Michi:: @ 81C57EE - .string "MICHI$" - -gNameChoice_Paula:: @ 81C57F4 - .string "PAULA$" - -gNameChoice_June:: @ 81C57FA - .string "JUNE$" - -gNameChoice_Cassie:: @ 81C57FF - .string "CASSIE$" - -gNameChoice_Rey:: @ 81C5806 - .string "REY$" - -gNameChoice_Seda:: @ 81C580A - .string "SEDA$" - -gNameChoice_Kiko:: @ 81C580F - .string "KIKO$" - -gNameChoice_Mina:: @ 81C5814 - .string "MINA$" - -gNameChoice_Norie:: @ 81C5819 - .string "NORIE$" - -gNameChoice_Sai:: @ 81C581F - .string "SAI$" - -gNameChoice_Momo:: @ 81C5823 - .string "MOMO$" - -gNameChoice_Suzi:: @ 81C5828 - .string "SUZI$" - -gNewGame_HelpDocs1:: @ 81C582D - .string "The various buttons will be explained in\n" - .string "the order of their importance.$" - -gNewGame_HelpDocs2:: @ 81C5875 - .string "Moves the main character.\n" - .string "Also used to choose various data\n" - .string "headings.$" - -gNewGame_HelpDocs3:: @ 81C58BA - .string "Used to confirm a choice, check\n" - .string "things, chat, and scroll text.$" - -gNewGame_HelpDocs4:: @ 81C58F9 - .string "Used to exit, cancel a choice,\n" - .string "and cancel a mode.$" - -gNewGame_HelpDocs5:: @ 81C592B - .string "Press this button to open the\n" - .string "MENU.$" - -gNewGame_HelpDocs6:: @ 81C594F - .string "Used to shift items and to use\n" - .string "a registered item.$" - -gNewGame_HelpDocs7:: @ 81C5981 - .string "If you need help playing the\n" - .string "game, or on how to do things,\n" - .string "press the L or R Button.$" - -gOakText_AskPlayerGender:: @ 81C59D5 - .string "Now tell me. Are you a boy?\n" - .string "Or are you a girl?$" - -gNewGameAdventureIntro1:: - .string "In the world which you are about to\n" - .string "enter, you will embark on a grand\n" - .string "adventure with you as the hero.\n" - .string "\n" - .string "Speak to people and check things\n" - .string "wherever you go, be it towns, roads,\n" - .string "or caves. Gather information and\n" - .string "hints from every source.$" - -gNewGameAdventureIntro2:: - .string "New paths will open to you by helping\n" - .string "people in need, overcoming challenges,\n" - .string "and solving mysteries.\n" - .string "\n" - .string "At times, you will be challenged by\n" - .string "others and attacked by wild creatures.\n" - .string "Be brave and keep pushing on.$" - -gNewGameAdventureIntro3:: - .string "Through your adventure, we hope\n" - .string "that you will interact with all sorts\n" - .string "of people and achieve personal growth.\n" - .string "That is our biggest objective.\n" - .string "\n" - .string "Press the A Button, and let your\n" - .string "adventure begin!$" - -gOakText_WelcomeToTheWorld:: @ 81C5C78 - .string "Hello, there!\n" - .string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n" - .string "as the POKéMON PROFESSOR.\p$" - -gOakText_WorldInhabited1:: @ 81C5D06 - .string "This world…$" - -gOakText_WorldInhabited2:: @ 81C5D12 - .string "…is inhabited far and wide by\n" - .string "creatures called POKéMON.\p$" - -gOakText_PetsBattlingStudy:: @ 81C5D4B - .string "For some people, POKéMON are pets.\n" - .string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$" - -gOakText_TellMeALittleAboutYourself:: @ 81C5DBD - .string "But first, tell me a little about\n" - .string "yourself.\p$" - -gOakText_AskPlayerName:: @ 81C5DEA - .string "Let's begin with your name.\n" - .string "What is it?\p$" - -gOakText_FinalizePlayerName:: @ 81C5E13 - .string "Right…\n" - .string "So your name is {PLAYER}.$" - -gOakText_IntroduceRival:: @ 81C5E2E - .string "This is my grandson.\pHe's been your rival since you both\n" - .string "were babies.\p…Erm, what was his name now?$" - -gOakText_AskRivalName:: @ 81C5E91 - .string "Your rival's name, what was it now?$" - -gOakText_ConfirmRivalName:: @ 81C5EB5 - .string "…Er, was it {RIVAL}?$" - -gOakText_RememberRivalName:: @ 81C5EC5 - .string "That's right! I remember now!\n" - .string "His name is {RIVAL}!\p$" - -gOakText_LegendAboutToUnfold:: @ 81C5EF4 - .string "{PLAYER}!\pYour very own POKéMON legend is\n" - .string "about to unfold!\pA world of dreams and adventures\n" - .string "with POKéMON awaits! Let's go!$" - -@ pokedude data -gUnknown_81C5F69:: - .string "POKé DUDE: The speedier of the\n" - .string "battlers gets to attack first.$" - -gUnknown_81C5FA7:: - .string "It looks like my RATTATA was\n" - .string "faster than the PIDGEY.$" - -gUnknown_81C5FDC:: - .string "The battlers take turns attacking\n" - .string "and reducing each other's HP.$" - -gUnknown_81C601C:: - .string "My RATTATA reduced the foe's HP\n" - .string "to zero, so it wins!\p" - - .string "The POKéMON that took part in the\n" - .string "battle get EXP. Points.\p" - - .string "When a POKéMON collects enough\n" - .string "EXP. Points, it levels up.\p" - - .string "Leveling up makes your POKéMON\n" - .string "stronger than before.$" - -gUnknown_81C60FA:: - .string "POKé DUDE: Uh-oh…\n" - .string "My RATTATA has been poisoned…\p" - - .string "If a POKéMON is poisoned, it loses\n" - .string "HP steadily.$" - -gUnknown_81C615A:: - .string "If a POKéMON develops a status\n" - .string "problem, heal it right away.$" - -gUnknown_81C6196:: - .string "Using an item on a POKéMON uses\n" - .string "up one turn, though.\p" - - .string "Now, it's the opponent's turn!$" - -gUnknown_81C61EA:: - .string "Yay!\n" - .string "We managed to win!$" - -gUnknown_81C6202:: - .string "POKé DUDE: The move BUBBLE is\n" - .string "a WATER-type attack.\p" - - .string "The targeted ODDISH is a\n" - .string "GRASS/POISON-type POKéMON.\p" - - .string "The WATER-type attack is absorbed\n" - .string "by the GRASS-type POKéMON…\p" - - .string "As a result, the move becomes not\n" - .string "very effective, and inflicts only\l" - .string "half the usual damage.$" - -gUnknown_81C6301:: - .string "Uh-oh, this is not good!\p" - - .string "The ABSORB attack you just saw\n" - .string "is a GRASS-type move.\p" - - .string "POLIWAG is a WATER-type POKéMON.\p" - - .string "So, ABSORB becomes super\n" - .string "effective, doubling the damage.$" - -gUnknown_81C63A9:: - .string "It's not going to be easy to win\n" - .string "with this matchup…\p" - - .string "Let's try shifting POKéMON!$" - -gUnknown_81C63F9:: - .string "Shifting POKéMON in and out uses\n" - .string "up one turn.\p" - - .string "Now, it's the opponent's turn.$" - -gUnknown_81C6446:: - .string "BUTTERFREE is a BUG/FLYING-type\n" - .string "POKéMON.\p" - - .string "Against this POKéMON, a GRASS-\n" - .string "type attack…\p" - - .string "…inflicts only half the usual\n" - .string "damage on a BUG-type POKéMON…\p" - - .string "…And, it also causes only half the\n" - .string "damage on a FLYING-type POKéMON.\p" - - .string "Therefore, BUTTERFREE, being a\n" - .string "BUG/FLYING POKéMON, only takes\l" - .string "one quarter of the usual damage.$" - -gUnknown_81C657A:: - .string "ODDISH is a GRASS/POISON-type\n" - .string "POKéMON.\p" - - .string "A FLYING- or PSYCHIC-type attack\n" - .string "is super effective against it.\p" - - .string "One of those types of attacks will\n" - .string "inflict double the usual damage.\p" - - .string "Okay, here we go!$" - -gUnknown_81C6637:: - .string "Yeah!\n" - .string "We won!$" - -gUnknown_81C6645:: - .string "POKé DUDE: When you're trying to\n" - .string "catch a POKéMON, don't throw any\l" - .string "POKé BALLS right away.\p" - - .string "First, you need to weaken it by\n" - .string "reducing its HP.$" - -gUnknown_81C66CF:: - .string "Okay, that should be good enough.\p" - - .string "But, if it's possible, it would be\n" - .string "best if the target has a status\l" - .string "problem.\p" - - .string "For instance, it would be easier\n" - .string "to catch if it were asleep or\l" - .string "paralyzed.$" - -gUnknown_81C6787:: - .string "This will make the POKéMON a lot\n" - .string "easier to catch!\p" - - .string "Oh, yes. If you paralyze a\n" - .string "POKéMON, you can't make it fall\l" - .string "asleep on top of paralysis.\p" - - .string "In other words, you can't double\n" - .string "up status problems, okay?$" - -gUnknown_81C684B:: - .string "Okay!\n" - .string "Let me throw my POKé BALL!$" - -gUnknown_81C686C:: - .string "Before you throw a POKé BALL,\n" - .string "consider the condition and the\l" - .string "type of POKéMON, and pick the kind\l" - .string "of BALL that would work best.$" + .include "data/scripts/test.inc" + .include "data/text/save.inc" + .include "data/text/new_game_intro.inc" + .include "data/text/poke_dude.inc" diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 8f4c34162..a9a7ec544 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -19,7 +19,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BB38 msgbox gUnknown_81A5190 @@ -47,7 +47,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BB74 msgbox gUnknown_81A5190 diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 7d358f621..c55eee6b7 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -19,7 +19,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BC30 msgbox gUnknown_81A5190 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 8556833c7..19f21c149 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -19,7 +19,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BC84 msgbox gUnknown_81A5190 @@ -45,7 +45,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BCBC msgbox gUnknown_81A5190 diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index eda64ebfe..ccac24aed 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -15,7 +15,7 @@ CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16ACD8 msgbox gUnknown_81A5190 diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index a303f9b27..b6bb33d34 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -15,7 +15,7 @@ CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16EA48 msgbox gUnknown_81A5190 diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index fc3664764..b2e3b5bb4 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -7,7 +7,7 @@ FourIsland_Mart_EventScript_171CAE:: @ 8171CAE goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_171CD4 msgbox gUnknown_81A5190 diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index 04854d419..824cdefe7 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -15,7 +15,7 @@ FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16D518 msgbox gUnknown_81A5190 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 7b467aa83..00a11018f 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -48,7 +48,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16EAF4 msgbox gUnknown_81A5190 diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index f5ebc9bc8..47c1b2df8 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -19,7 +19,7 @@ LavenderTown_Mart_EventScript_16B36B:: @ 816B36B goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16B390 msgbox gUnknown_81A5190 diff --git a/data/maps/OneIsland_PokemonCenter_1F/text.inc b/data/maps/OneIsland_PokemonCenter_1F/text.inc index 3e9e5b521..e2d6c7fed 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/text.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/text.inc @@ -108,7 +108,7 @@ gUnknown_81A1321:: @ 81A1321 .string "I'm also sorry for being such a \n" .string "poor host on your visit here.$" -Text_1A1390:: @ 81A1390 +Text_UsualPCServicesUnavailable:: @ 81A1390 .string "The usual PC services aren't\n" .string "available…$" diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index adbde2b4c..31ab70f51 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -15,7 +15,7 @@ PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16A708 msgbox gUnknown_81A5190 diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index b4e263da3..c40cb783c 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -15,7 +15,7 @@ SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16EFDC msgbox gUnknown_81A5190 diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index d4a17878b..2e7e2ad8a 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -7,7 +7,7 @@ SevenIsland_Mart_EventScript_170B31:: @ 8170B31 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_170B58 msgbox gUnknown_81A5190 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 353b9dd9f..7c4e287a2 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -129,7 +129,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_1649B8 msgbox gUnknown_81A5190 diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 2558fc999..3e2a19d53 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -7,7 +7,7 @@ SixIsland_Mart_EventScript_171E66:: @ 8171E66 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_171E8C msgbox gUnknown_81A5190 diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 171eff139..531e0de7b 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -7,7 +7,7 @@ ThreeIsland_Mart_EventScript_17188D:: @ 817188D goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_1718B4 msgbox gUnknown_81A5190 diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 64eeb39ca..12f3163a2 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -119,7 +119,7 @@ EventScript_16768E:: @ 816768E end EventScript_1676A6:: @ 81676A6 - message Text_1A6211 + message Text_MayIHelpYou waitmessage compare VAR_MAP_SCENE_TWO_ISLAND, 4 goto_if eq, EventScript_167728 diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 49bf508ee..49b9799b0 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -15,7 +15,7 @@ VermilionCity_Mart_EventScript_16B666:: @ 816B666 goto_if eq, EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16B68C msgbox gUnknown_81A5190 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 665bbe118..f0958605a 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -59,7 +59,7 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 special sub_8110AB4 compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16A298 msgbox gUnknown_81A5190 diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc new file mode 100644 index 000000000..d919d5fc6 --- /dev/null +++ b/data/scripts/obtain_item.inc @@ -0,0 +1,248 @@ +EventScript_1A666F:: @ 81A666F + copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID + return + +EventScript_1A6675:: @ 81A6675 + copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS + return + +Std_ObtainItem:: @ 81A667B + copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID + textcolor 3 + additem VAR_0x8000, VAR_0x8001 + copyvar VAR_0x8007, VAR_RESULT + call EventScript_1A6697 + copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS + return + +EventScript_1A6697:: @ 81A6697 + bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 + checkitemtype VAR_0x8000 + call EventScript_1A66BC + compare VAR_0x8007, 1 + call_if eq, EventScript_1A6749 + compare VAR_0x8007, 0 + call_if eq, EventScript_1A675E + return + +EventScript_1A66BC:: @ 81A66BC + switch VAR_RESULT + case POCKET_ITEMS, EventScript_1A66F9 + case POCKET_KEY_ITEMS, EventScript_1A6709 + case POCKET_POKE_BALLS, EventScript_1A6719 + case POCKET_TM_CASE, EventScript_1A6729 + case POCKET_BERRY_POUCH, EventScript_1A6739 + end + +EventScript_1A66F9:: @ 81A66F9 + getstdstring 2, 24 + compare VAR_0x8007, 1 + call_if eq, EventScript_1A6764 + return + +EventScript_1A6709:: @ 81A6709 + getstdstring 2, 25 + compare VAR_0x8007, 1 + call_if eq, EventScript_1A6764 + return + +EventScript_1A6719:: @ 81A6719 + getstdstring 2, 26 + compare VAR_0x8007, 1 + call_if eq, EventScript_1A6764 + return + +EventScript_1A6729:: @ 81A6729 + getstdstring 2, 27 + compare VAR_0x8007, 1 + call_if eq, EventScript_1A6768 + return + +EventScript_1A6739:: @ 81A6739 + getstdstring 2, 28 + compare VAR_0x8007, 1 + call_if eq, EventScript_1A6764 + return + +EventScript_1A6749:: @ 81A6749 + message Text_ObtainedTheX + waitfanfare + waitmessage + msgbox Text_PutItemAway + setvar VAR_RESULT, 1 + return + +EventScript_1A675E:: @ 81A675E + setvar VAR_RESULT, 0 + return + +EventScript_1A6764:: @ 81A6764 + playfanfare MUS_FANFA1 + return + +EventScript_1A6768:: @ 81A6768 + playfanfare MUS_FANFA1 + return + +Std_ObtainDecoration:: @ 81A676C + adddecor VAR_0x8000 + copyvar VAR_0x8007, VAR_RESULT + call EventScript_1A677A + return + +EventScript_1A677A:: @ 81A677A + getdecorname 1, VAR_0x8000 + compare VAR_0x8007, 1 + call_if eq, EventScript_1A6795 + compare VAR_0x8007, 0 + call_if eq, EventScript_1A67AD + return + +EventScript_1A6795:: @ 81A6795 + playfanfare MUS_FANFA4 + message Text_1A52F0 + waitfanfare + waitmessage + msgbox gUnknown_81A532F + setvar VAR_RESULT, 1 + return + +EventScript_1A67AD:: @ 81A67AD + setvar VAR_RESULT, 0 + return + +Std_FindItem:: @ 81A67B3 + lock + faceplayer + waitse + copyvar VAR_0x8004, VAR_0x8000 + copyvar VAR_0x8005, VAR_0x8001 + checkitemspace VAR_0x8000, VAR_0x8001 + copyvar VAR_0x8007, VAR_RESULT + getitemname 1, VAR_0x8000 + checkitemtype VAR_0x8000 + call EventScript_1A66BC + compare VAR_0x8007, 1 + call_if eq, EventScript_1A67EE + compare VAR_0x8007, 0 + call_if eq, EventScript_1A682D + release + return + +EventScript_1A67EE:: @ 81A67EE + removeobject VAR_LAST_TALKED + additem VAR_0x8004, VAR_0x8005 + specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName + copyvar VAR_0x8008, VAR_RESULT + compare VAR_0x8008, 1 + call_if eq, EventScript_1A6821 + compare VAR_0x8008, 0 + call_if eq, EventScript_1A6827 + waitfanfare + waitmessage + msgbox Text_PutItemAway + return + +EventScript_1A6821:: @ 81A6821 + message Text_1A63E8 + return + +EventScript_1A6827:: @ 81A6827 + message Text_FoundOneItem + return + +EventScript_1A682D:: @ 81A682D + msgbox Text_ObtainedTheX + msgbox Text_TooBadBagFull + setvar VAR_RESULT, 0 + return + +EventScript_PickUpHiddenItem:: @ 81A6843 + lockall + textcolor 3 + waitse + compare VAR_0x8005, 0 + goto_if eq, EventScript_PickUpHiddenCoins + call EventScript_GiveItem + compare VAR_0x8007, 1 + goto_if eq, EventScript_ItemInPocketMessage + compare VAR_0x8007, 0 + goto_if eq, EventScript_BagIsFullMessage + end + +EventScript_GiveItem:: + additem VAR_0x8005, VAR_0x8006 + copyvar VAR_0x8007, VAR_RESULT + getitemname 1, VAR_0x8005 + checkitemtype VAR_0x8005 + call EventScript_1A66BC + return + +EventScript_ItemInPocketMessage:: + compare VAR_0x8006, 1 + call_if eq, EventScript_FoundSingleItemMessage + compare VAR_0x8006, 1 + call_if ne, EventScript_FoundMultipleItemsMessage + waitfanfare + waitmessage + msgbox Text_PutItemAway + special Special_SetHiddenItemFlag + releaseall + end + +EventScript_FoundSingleItemMessage:: + message Text_FoundOneItem + return + +EventScript_FoundCoinsMessage:: + getnumberstring 0, VAR_0x8006 + message Text_FoundXCoins + return + +EventScript_FoundMultipleItemsMessage:: + getnumberstring 0, VAR_0x8006 + message Text_FoundXItems + return + +EventScript_BagIsFullMessage:: + msgbox Text_FoundOneItem + msgbox Text_TooBadBagFull + setvar VAR_RESULT, 0 + releaseall + end + +EventScript_PickUpHiddenCoins:: + checkflag FLAG_GOT_COIN_CASE + goto_if FALSE, EventScript_HiddenCoinsButNoCoinCase + checkcoins VAR_RESULT + specialvar VAR_RESULT, Special_CheckAddCoins + compare VAR_RESULT, 0 + goto_if eq, EventScript_HiddenCoinsButTheCoinCaseIsFull + givecoins VAR_0x8006 + getstdstring 1, 0x17 + call EventScript_1A6764 + call EventScript_FoundCoinsMessage + waitfanfare + waitmessage + msgbox Text_PutCoinsAwayInCoinCase + special Special_SetHiddenItemFlag + releaseall + end + +EventScript_HiddenCoinsButTheCoinCaseIsFull:: + getnumberstring 0, VAR_0x8006 + getstdstring 1, 0x17 + msgbox Text_FoundXCoins + msgbox Text_CoinCaseIsFull + setvar VAR_RESULT, 0 + releaseall + end + +EventScript_HiddenCoinsButNoCoinCase:: + getnumberstring 0, VAR_0x8006 + getstdstring 1, 0x17 + msgbox Text_FoundXCoins + msgbox Text_NothingToPutThemIn + setvar VAR_RESULT, 0 + releaseall + end diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc new file mode 100644 index 000000000..9666a1fd1 --- /dev/null +++ b/data/scripts/pc.inc @@ -0,0 +1,108 @@ +EventScript_PC:: @ 81A6955 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + lockall + checkflag FLAG_SYS_PC_STORAGE_DISABLED + goto_if TRUE, EventScript_PCDisabled + setvar VAR_0x8004, 27 + special Special_SetSomeVariable + setvar VAR_0x8004, 0 + special Special_AnimatePcTurnOn + playse SE_PC_ON + msgbox Text_BootedUpPC + goto EventScript_PCMainMenu + end + +EventScript_PCDisabled:: @ 81A698E + msgbox Text_UsualPCServicesUnavailable + releaseall + end + +EventScript_PCMainMenu:: @ 81A6998 + message Text_AccessWhichPC + waitmessage + special ScrSpecial_CreatePCMenu + waitstate + goto EventScript_ChoosePCMenu + end + +EventScript_ChoosePCMenu:: @ 81A69A8 + switch VAR_RESULT + case 0, EventScript_AccessPokemonStorage + case 1, EventScript_AccessPlayersPC + case 2, EventScript_AccessProfOaksPC + case 3, EventScript_1A6A56 + case 4, EventScript_1A6A46 + case SCR_MENU_CANCEL, EventScript_1A6A46 + end + +EventScript_AccessPlayersPC:: @ 81A69F0 + playse SE_PC_LOGIN + msgbox Text_AccessedPlayersPC + special PlayerPC + waitstate + goto EventScript_PCMainMenu + end + +EventScript_AccessPokemonStorage:: @ 81A6A05 + playse SE_PC_LOGIN + checkflag FLAG_SYS_NOT_SOMEONES_PC + call_if FALSE, EventScript_1A6A34 + checkflag FLAG_SYS_NOT_SOMEONES_PC + call_if TRUE, EventScript_1A6A3D + msgbox Text_OpenedPkmnStorage + special ShowPokemonStorageSystem + waitstate + setvar VAR_0x8004, 27 + special Special_SetSomeVariable + goto EventScript_PCMainMenu + end + +EventScript_1A6A34:: @ 81A6A34 + msgbox Text_AccessedSomeonesPC + return + +EventScript_1A6A3D:: @ 81A6A3D + msgbox Text_AccessedBillsPC + return + +EventScript_1A6A46:: @ 81A6A46 + setvar VAR_0x8004, 0 + playse SE_PC_OFF + special Special_AnimatePcTurnOff + special sub_812B35C + releaseall + end + +EventScript_1A6A56:: @ 81A6A56 + checkflag FLAG_SYS_GAME_CLEAR + goto_if FALSE, EventScript_1A6A46 + playse SE_PC_LOGIN + setvar VAR_0x8004, 31 + special HelpSystem_BackupSomeVariable + special Special_SetSomeVariable + special HallOfFamePCBeginFade + waitstate + special HelpSystem_RestoreSomeVariable + goto EventScript_ChoosePCMenu + end + +EventScript_AccessProfOaksPC:: @ 81A6A7A + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1A6A46 + playse SE_PC_LOGIN + msgbox Text_AccessedProfOaksPC + msgbox Text_HavePokedexRated, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if eq, EventScript_ExitOaksPC + setflag FLAG_OAKS_RATING_IS_VIA_PC + call EventScript_1A73E0 + clearflag FLAG_OAKS_RATING_IS_VIA_PC + goto EventScript_ExitOaksPC + end + +EventScript_ExitOaksPC:: @ 81A6AB2 + msgbox Text_ClosedLinkToProfOaksPC + goto EventScript_PCMainMenu + end diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc new file mode 100644 index 000000000..07e1db17d --- /dev/null +++ b/data/scripts/silphco_doors.inc @@ -0,0 +1,585 @@ +EventScript_NeedCardKey:: @ 81A8135 + msgbox Text_ItNeedsCardKey + releaseall + end + +EventScript_DoorUnlocked:: @ 81A813F + msgbox Text_TheDoorIsOpen + releaseall + end + +EventScript_Close2FDoor1:: @ 81A8149 + setmetatile 5, 8, 944, 1 + setmetatile 6, 8, 945, 1 + setmetatile 5, 9, 952, 1 + setmetatile 6, 9, 953, 1 + setmetatile 6, 10, 821, 0 + return + +EventScript_Close2FDoor2:: @ 81A8177 + setmetatile 5, 15, 944, 1 + setmetatile 6, 15, 945, 1 + setmetatile 5, 16, 952, 1 + setmetatile 6, 16, 953, 1 + setmetatile 6, 17, 821, 0 + return + +EventScript_Close3FDoor1:: @ 81A81A5 + setmetatile 9, 11, 960, 1 + setmetatile 10, 11, 961, 1 + setmetatile 9, 12, 962, 1 + setmetatile 10, 12, 963, 1 + setmetatile 9, 13, 964, 1 + setmetatile 10, 13, 965, 1 + return + +EventScript_Close3FDoor2:: @ 81A81DC + setmetatile 20, 11, 960, 1 + setmetatile 21, 11, 961, 1 + setmetatile 20, 12, 962, 1 + setmetatile 21, 12, 963, 1 + setmetatile 20, 13, 964, 1 + setmetatile 21, 13, 965, 1 + return + +EventScript_Close4FDoor1:: @ 81A8213 + setmetatile 3, 16, 944, 1 + setmetatile 4, 16, 945, 1 + setmetatile 3, 17, 952, 1 + setmetatile 4, 17, 953, 1 + setmetatile 4, 18, 821, 0 + return + +EventScript_Close4FDoor2:: @ 81A8241 + setmetatile 14, 11, 944, 1 + setmetatile 15, 11, 945, 1 + setmetatile 14, 12, 952, 1 + setmetatile 15, 12, 953, 1 + setmetatile 15, 13, 821, 0 + return + +EventScript_Close5FDoor1:: @ 81A826F + setmetatile 7, 8, 960, 1 + setmetatile 8, 8, 961, 1 + setmetatile 7, 9, 962, 1 + setmetatile 8, 9, 963, 1 + setmetatile 7, 10, 964, 1 + setmetatile 8, 10, 965, 1 + return + +EventScript_Close5FDoor2:: @ 81A82A6 + setmetatile 7, 17, 960, 1 + setmetatile 8, 17, 961, 1 + setmetatile 7, 18, 962, 1 + setmetatile 8, 18, 963, 1 + setmetatile 7, 19, 964, 1 + setmetatile 8, 19, 965, 1 + return + +EventScript_Close5FDoor3:: @ 81A82DD + setmetatile 18, 12, 960, 1 + setmetatile 19, 12, 961, 1 + setmetatile 18, 13, 962, 1 + setmetatile 19, 13, 963, 1 + setmetatile 18, 14, 964, 1 + setmetatile 19, 14, 965, 1 + return + +EventScript_Close6FDoor:: @ 81A8314 + setmetatile 5, 14, 960, 1 + setmetatile 6, 14, 961, 1 + setmetatile 5, 15, 962, 1 + setmetatile 6, 15, 963, 1 + setmetatile 5, 16, 964, 1 + setmetatile 6, 16, 965, 1 + return + +EventScript_Close7FDoor1:: @ 81A834B + setmetatile 11, 8, 944, 1 + setmetatile 12, 8, 945, 1 + setmetatile 11, 9, 952, 1 + setmetatile 12, 9, 953, 1 + setmetatile 12, 10, 821, 0 + return + +EventScript_Close7FDoor2:: @ 81A8379 + setmetatile 24, 7, 944, 1 + setmetatile 25, 7, 945, 1 + setmetatile 24, 8, 952, 1 + setmetatile 25, 8, 953, 1 + setmetatile 25, 9, 821, 0 + return + +EventScript_Close7FDoor3:: @ 81A83A7 + setmetatile 25, 13, 944, 1 + setmetatile 26, 13, 945, 1 + setmetatile 25, 14, 952, 1 + setmetatile 26, 14, 953, 1 + setmetatile 26, 15, 821, 0 + return + +EventScript_Close8FDoor:: @ 81A83D5 + setmetatile 5, 9, 960, 1 + setmetatile 6, 9, 961, 1 + setmetatile 5, 10, 962, 1 + setmetatile 6, 10, 963, 1 + setmetatile 5, 11, 964, 1 + setmetatile 6, 11, 965, 1 + return + +EventScript_Close9FDoor1:: @ 81A840C + setmetatile 2, 9, 960, 1 + setmetatile 3, 9, 961, 1 + setmetatile 2, 10, 962, 1 + setmetatile 3, 10, 963, 1 + setmetatile 2, 11, 964, 1 + setmetatile 3, 11, 965, 1 + return + +EventScript_Close9FDoor2:: @ 81A8443 + setmetatile 12, 15, 960, 1 + setmetatile 13, 15, 961, 1 + setmetatile 12, 16, 962, 1 + setmetatile 13, 16, 963, 1 + setmetatile 12, 17, 964, 1 + setmetatile 13, 17, 965, 1 + return + +EventScript_Close9FDoor3:: @ 81A847A + setmetatile 21, 6, 944, 1 + setmetatile 22, 6, 945, 1 + setmetatile 21, 7, 952, 1 + setmetatile 22, 7, 953, 1 + setmetatile 22, 8, 821, 0 + return + +EventScript_Close9FDoor4:: @ 81A84A8 + setmetatile 21, 12, 944, 1 + setmetatile 22, 12, 945, 1 + setmetatile 21, 13, 952, 1 + setmetatile 22, 13, 953, 1 + setmetatile 22, 14, 821, 0 + return + +EventScript_Close10FDoor:: @ 81A84D6 + setmetatile 12, 11, 944, 1 + setmetatile 13, 11, 945, 1 + setmetatile 12, 12, 952, 1 + setmetatile 13, 12, 953, 1 + setmetatile 13, 13, 821, 0 + return + +EventScript_Close11FDoor:: @ 81A8504 + setmetatile 5, 16, 944, 1 + setmetatile 6, 16, 945, 1 + setmetatile 5, 17, 952, 1 + setmetatile 6, 17, 953, 1 + setmetatile 6, 18, 821, 0 + return + +EventScript_Open2FDoor1:: @ 81A8532 + setmetatile 5, 8, 821, 0 + setmetatile 6, 8, 820, 0 + setmetatile 5, 9, 821, 0 + setmetatile 6, 9, 820, 0 + setmetatile 6, 10, 820, 0 + return + +EventScript_Open2FDoor2:: @ 81A8560 + setmetatile 5, 15, 821, 0 + setmetatile 6, 15, 820, 0 + setmetatile 5, 16, 821, 0 + setmetatile 6, 16, 820, 0 + setmetatile 6, 17, 820, 0 + return + +EventScript_Open3FDoor1:: @ 81A858E + setmetatile 9, 11, 839, 1 + setmetatile 10, 11, 838, 1 + setmetatile 9, 12, 821, 0 + setmetatile 10, 12, 821, 0 + setmetatile 9, 13, 825, 0 + setmetatile 10, 13, 826, 0 + return + +EventScript_Open3FDoor2:: @ 81A85C5 + setmetatile 20, 11, 839, 1 + setmetatile 21, 11, 838, 1 + setmetatile 20, 12, 821, 0 + setmetatile 21, 12, 821, 0 + setmetatile 20, 13, 825, 0 + setmetatile 21, 13, 826, 0 + return + +EventScript_Open4FDoor1:: @ 81A85FC + setmetatile 3, 16, 821, 0 + setmetatile 4, 16, 820, 0 + setmetatile 3, 17, 821, 0 + setmetatile 4, 17, 820, 0 + setmetatile 4, 18, 820, 0 + return + +EventScript_Open4FDoor2:: @ 81A862A + setmetatile 14, 11, 821, 0 + setmetatile 15, 11, 820, 0 + setmetatile 14, 12, 821, 0 + setmetatile 15, 12, 820, 0 + setmetatile 15, 13, 820, 0 + return + +EventScript_Open5FDoor1:: @ 81A8658 + setmetatile 7, 8, 839, 1 + setmetatile 8, 8, 838, 1 + setmetatile 7, 9, 821, 0 + setmetatile 8, 9, 821, 0 + setmetatile 7, 10, 825, 0 + setmetatile 8, 10, 826, 0 + return + +EventScript_Open5FDoor2:: @ 81A868F + setmetatile 7, 17, 839, 1 + setmetatile 8, 17, 838, 1 + setmetatile 7, 18, 821, 0 + setmetatile 8, 18, 821, 0 + setmetatile 7, 19, 825, 0 + setmetatile 8, 19, 826, 0 + return + +EventScript_Open5FDoor3:: @ 81A86C6 + setmetatile 18, 12, 839, 1 + setmetatile 19, 12, 838, 1 + setmetatile 18, 13, 821, 0 + setmetatile 19, 13, 821, 0 + setmetatile 18, 14, 825, 0 + setmetatile 19, 14, 826, 0 + return + +EventScript_Open6FDoor:: @ 81A86FD + setmetatile 5, 14, 839, 1 + setmetatile 6, 14, 838, 1 + setmetatile 5, 15, 821, 0 + setmetatile 6, 15, 821, 0 + setmetatile 5, 16, 825, 0 + setmetatile 6, 16, 826, 0 + return + +EventScript_Open7FDoor1:: @ 81A8734 + setmetatile 11, 8, 821, 0 + setmetatile 12, 8, 820, 0 + setmetatile 11, 9, 821, 0 + setmetatile 12, 9, 820, 0 + setmetatile 12, 10, 820, 0 + return + +EventScript_Open7FDoor2:: @ 81A8762 + setmetatile 24, 7, 821, 0 + setmetatile 25, 7, 820, 0 + setmetatile 24, 8, 821, 0 + setmetatile 25, 8, 820, 0 + setmetatile 25, 9, 820, 0 + return + +EventScript_Open7FDoor3:: @ 81A8790 + setmetatile 25, 13, 821, 0 + setmetatile 26, 13, 820, 0 + setmetatile 25, 14, 821, 0 + setmetatile 26, 14, 820, 0 + setmetatile 26, 15, 820, 0 + return + +EventScript_Open8FDoor:: @ 81A87BE + setmetatile 5, 9, 839, 1 + setmetatile 6, 9, 838, 1 + setmetatile 5, 10, 821, 0 + setmetatile 6, 10, 821, 0 + setmetatile 5, 11, 825, 0 + setmetatile 6, 11, 826, 0 + return + +EventScript_Open9FDoor1:: @ 81A87F5 + setmetatile 2, 9, 839, 1 + setmetatile 3, 9, 838, 1 + setmetatile 2, 10, 821, 0 + setmetatile 3, 10, 821, 0 + setmetatile 2, 11, 825, 0 + setmetatile 3, 11, 826, 0 + return + +EventScript_Open9FDoor2:: @ 81A882C + setmetatile 12, 15, 839, 1 + setmetatile 13, 15, 838, 1 + setmetatile 12, 16, 821, 0 + setmetatile 13, 16, 821, 0 + setmetatile 12, 17, 825, 0 + setmetatile 13, 17, 826, 0 + return + +EventScript_Open9FDoor3:: @ 81A8863 + setmetatile 21, 6, 821, 0 + setmetatile 22, 6, 820, 0 + setmetatile 21, 7, 821, 0 + setmetatile 22, 7, 820, 0 + setmetatile 22, 8, 820, 0 + return + +EventScript_Open9FDoor4:: @ 81A8891 + setmetatile 21, 12, 821, 0 + setmetatile 22, 12, 820, 0 + setmetatile 21, 13, 821, 0 + setmetatile 22, 13, 820, 0 + setmetatile 22, 14, 820, 0 + return + +EventScript_Open10FDoor:: @ 81A88BF + setmetatile 12, 11, 821, 0 + setmetatile 13, 11, 820, 0 + setmetatile 12, 12, 821, 0 + setmetatile 13, 12, 820, 0 + setmetatile 13, 13, 820, 0 + return + +EventScript_Open11FDoor:: @ 81A88ED + setmetatile 5, 16, 821, 0 + setmetatile 6, 16, 820, 0 + setmetatile 5, 17, 821, 0 + setmetatile 6, 17, 820, 0 + setmetatile 6, 18, 820, 0 + return + +SilphCo_2F_EventScript_Door1:: @ 81A891B + lockall + setvar VAR_0x4001, 1 + setvar VAR_0x8004, 634 + checkflag FLAG_SILPH_2F_DOOR_1 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_2F_EventScript_Door2:: @ 81A8935 + lockall + setvar VAR_0x4001, 2 + setvar VAR_0x8004, 635 + checkflag FLAG_SILPH_2F_DOOR_2 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_3F_EventScript_Door1:: @ 81A894F + lockall + setvar VAR_0x4001, 3 + setvar VAR_0x8004, 636 + checkflag FLAG_SILPH_3F_DOOR_1 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_3F_EventScript_Door2:: @ 81A8969 + lockall + setvar VAR_0x4001, 4 + setvar VAR_0x8004, 637 + checkflag FLAG_SILPH_3F_DOOR_2 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_4F_EventScript_Door1:: @ 81A8983 + lockall + setvar VAR_0x4001, 5 + setvar VAR_0x8004, 638 + checkflag FLAG_SILPH_4F_DOOR_1 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_4F_EventScript_Door2:: @ 81A899D + lockall + setvar VAR_0x4001, 6 + setvar VAR_0x8004, 639 + checkflag FLAG_SILPH_4F_DOOR_2 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_5F_EventScript_Door1:: @ 81A89B7 + lockall + setvar VAR_0x4001, 7 + setvar VAR_0x8004, 640 + checkflag FLAG_SILPH_5F_DOOR_1 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_5F_EventScript_Door2:: @ 81A89D1 + lockall + setvar VAR_0x4001, 8 + setvar VAR_0x8004, 641 + checkflag FLAG_SILPH_5F_DOOR_2 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_5F_EventScript_Door3:: @ 81A89EB + lockall + setvar VAR_0x4001, 9 + setvar VAR_0x8004, 642 + checkflag FLAG_SILPH_5F_DOOR_3 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_6F_EventScript_Door:: @ 81A8A05 + lockall + setvar VAR_0x4001, 10 + setvar VAR_0x8004, 643 + checkflag FLAG_SILPH_6F_DOOR + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_7F_EventScript_Door1:: @ 81A8A1F + lockall + setvar VAR_0x4001, 11 + setvar VAR_0x8004, 644 + checkflag FLAG_SILPH_7F_DOOR_1 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_7F_EventScript_Door2:: @ 81A8A39 + lockall + setvar VAR_0x4001, 12 + setvar VAR_0x8004, 645 + checkflag FLAG_SILPH_7F_DOOR_2 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_7F_EventScript_Door3:: @ 81A8A53 + lockall + setvar VAR_0x4001, 13 + setvar VAR_0x8004, 646 + checkflag FLAG_SILPH_7F_DOOR_3 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_8F_EventScript_Door:: @ 81A8A6D + lockall + setvar VAR_0x4001, 14 + setvar VAR_0x8004, 647 + checkflag FLAG_SILPH_8F_DOOR + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_9F_EventScript_Door1:: @ 81A8A87 + lockall + setvar VAR_0x4001, 15 + setvar VAR_0x8004, 648 + checkflag FLAG_SILPH_9F_DOOR_1 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_9F_EventScript_Door2:: @ 81A8AA1 + lockall + setvar VAR_0x4001, 16 + setvar VAR_0x8004, 649 + checkflag FLAG_SILPH_9F_DOOR_2 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_9F_EventScript_Door3:: @ 81A8ABB + lockall + setvar VAR_0x4001, 17 + setvar VAR_0x8004, 650 + checkflag FLAG_SILPH_9F_DOOR_3 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_9F_EventScript_Door4:: @ 81A8AD5 + lockall + setvar VAR_0x4001, 18 + setvar VAR_0x8004, 651 + checkflag FLAG_SILPH_9F_DOOR_4 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_10F_EventScript_Door:: @ 81A8AEF + lockall + setvar VAR_0x4001, 19 + setvar VAR_0x8004, 652 + checkflag FLAG_SILPH_10F_DOOR + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +SilphCo_11F_EventScript_Door:: @ 81A8B09 + lockall + setvar VAR_0x4001, 20 + setvar VAR_0x8004, 653 + checkflag FLAG_SILPH_11F_DOOR + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor + end + +EventScript_TryUnlockDoor:: @ 81A8B23 + checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY + goto_if TRUE, EventScript_OpenDoor + goto EventScript_NeedCardKey + end + +EventScript_OpenDoor:: @ 81A8B32 + playfanfare MUS_FANFA1 + msgbox Text_CardKeyOpenedDoor + waitfanfare + compare VAR_0x4001, 1 + call_if eq, EventScript_Open2FDoor1 + compare VAR_0x4001, 2 + call_if eq, EventScript_Open2FDoor2 + compare VAR_0x4001, 3 + call_if eq, EventScript_Open3FDoor1 + compare VAR_0x4001, 4 + call_if eq, EventScript_Open3FDoor2 + compare VAR_0x4001, 5 + call_if eq, EventScript_Open4FDoor1 + compare VAR_0x4001, 6 + call_if eq, EventScript_Open4FDoor2 + compare VAR_0x4001, 7 + call_if eq, EventScript_Open5FDoor1 + compare VAR_0x4001, 8 + call_if eq, EventScript_Open5FDoor2 + compare VAR_0x4001, 9 + call_if eq, EventScript_Open5FDoor3 + compare VAR_0x4001, 10 + call_if eq, EventScript_Open6FDoor + compare VAR_0x4001, 11 + call_if eq, EventScript_Open7FDoor1 + compare VAR_0x4001, 12 + call_if eq, EventScript_Open7FDoor2 + compare VAR_0x4001, 13 + call_if eq, EventScript_Open7FDoor3 + compare VAR_0x4001, 14 + call_if eq, EventScript_Open8FDoor + compare VAR_0x4001, 15 + call_if eq, EventScript_Open9FDoor1 + compare VAR_0x4001, 16 + call_if eq, EventScript_Open9FDoor2 + compare VAR_0x4001, 17 + call_if eq, EventScript_Open9FDoor3 + compare VAR_0x4001, 18 + call_if eq, EventScript_Open9FDoor4 + compare VAR_0x4001, 19 + call_if eq, EventScript_Open10FDoor + compare VAR_0x4001, 20 + call_if eq, EventScript_Open11FDoor + waitse + playse SE_KI_GASYAN + special DrawWholeMapView + waitse + special Special_SetHiddenItemFlag + releaseall + end diff --git a/data/scripts/test.inc b/data/scripts/test.inc new file mode 100644 index 000000000..55578f159 --- /dev/null +++ b/data/scripts/test.inc @@ -0,0 +1,27 @@ +EventScript_1C5550:: @ 81C5552 + msgbox Text_1C556D, MSGBOX_NPC + end + +EventScript_1C555B:: @ 81C555B + msgbox Text_1C558D, MSGBOX_SIGN + end + +EventScript_1C5564:: @ 81C5564 + msgbox Text_1C55A4, MSGBOX_SIGN + end + +Text_1C556D:: @ 81C556D + .string "テストよう　メッセージです！\n" + .string "ポケモンの　せかいへ　ようこそ！$" + +Text_1C558D:: @ 81C558D + .string "テストよう　メッセージです！\n" + .string "かんばん　です$" + +Text_1C55A4:: @ 81C55A4 + .string "テストよう　メッセージです！\n" + .string "ざひょう　チェックの　イベントです$" + + .align 2 +Text_1C55C8:: @ 81C55C8 + .string "$" diff --git a/data/text/braille.inc b/data/text/braille.inc new file mode 100644 index 000000000..a057ec84e --- /dev/null +++ b/data/text/braille.inc @@ -0,0 +1,116 @@ +gUnknown_81A9288:: @ 81A9288 + .braille "UP$" + +gUnknown_81A928B:: @ 81A928B + .braille "DOWN$" + +gUnknown_81A9290:: @ 81A9290 + .braille "RIGHT$" + +gUnknown_81A9296:: @ 81A9296 + .braille "LEFT$" + +gUnknown_81A929B:: @ 81A929B + .braille "CUT$" + +gUnknown_81A929F:: @ 81A929F + .braille "ABC$" + +gUnknown_81A92A3:: @ 81A92A3 + .braille "GHI$" + +gUnknown_81A92A7:: @ 81A92A7 + .braille "MNO$" + +gUnknown_81A92AB:: @ 81A92AB + .braille "TUV$" + +gUnknown_81A92AF:: @ 81A92AF + .braille "DEF$" + +gUnknown_81A92B3:: @ 81A92B3 + .braille "JKL$" + +gUnknown_81A92B7:: @ 81A92B7 + .braille "PQRS$" + +gUnknown_81A92BC:: @ 81A92BC + .braille "WXYZ$" + +gUnknown_81A92C1:: @ 81A92C1 + .braille ".$" + +gUnknown_81A92C3:: @ 81A92C3 + .braille ",$" + +gUnknown_81A92C5:: @ 81A92C5 + .braille "EVERYTHING$" + +gUnknown_81A92D0:: @ 81A92D0 + .braille "HAS MEANING$" + +gUnknown_81A92DC:: @ 81A92DC + .braille "EXISTENCE$" + +gUnknown_81A92E6:: @ 81A92E6 + .braille "HAS MEANING$" + +gUnknown_81A92F2:: @ 81A92F2 + .braille "BEING ALIVE$" + +gUnknown_81A92FE:: @ 81A92FE + .braille "HAS MEANING$" + +gUnknown_81A930A:: @ 81A930A + .braille "HAVE DREAMS$" + +gUnknown_81A9316:: @ 81A9316 + .braille "USE POWER.$" + +gUnknown_81A9321:: @ 81A9321 + .braille "LET THE TWO$" + +gUnknown_81A932D:: @ 81A932D + .braille "GLITTERING$" + +gUnknown_81A9338:: @ 81A9338 + .braille "STONES$" + +gUnknown_81A933F:: @ 81A933F + .braille "ONE IN RED$" + +gUnknown_81A934A:: @ 81A934A + .braille "ONE IN BLUE$" + +gUnknown_81A9356:: @ 81A9356 + .braille "CONNECT THE$" + +gUnknown_81A9362:: @ 81A9362 + .braille "PAST.$" + +gUnknown_81A9368:: @ 81A9368 + .braille "TWO FRIENDS$" + +gUnknown_81A9374:: @ 81A9374 + .braille "SHARING$" + +gUnknown_81A937C:: @ 81A937C + .braille "POWER OPEN$" + +gUnknown_81A9387:: @ 81A9387 + .braille "A WINDOW TO$" + +gUnknown_81A9393:: @ 81A9393 + .braille "A NEW WORLD$" + +gUnknown_81A939F:: @ 81A939F + .braille "THAT GLOWS.$" + +gUnknown_81A93AB:: @ 81A93AB + .braille "THE NEXT$" + +gUnknown_81A93B4:: @ 81A93B4 + .braille "WORLD WAITS$" + +gUnknown_81A93C0:: @ 81A93C0 + .braille "FOR YOU.$" diff --git a/data/text/new_game_intro.inc b/data/text/new_game_intro.inc new file mode 100644 index 000000000..8a3696c8b --- /dev/null +++ b/data/text/new_game_intro.inc @@ -0,0 +1,234 @@ +gOtherText_NewName:: @ 81C574F + .string "NEW NAME$" + +gNameChoice_Green:: @ 81C5758 + .string "GREEN$" + +gNameChoice_Red:: @ 81C575E + .string "RED$" + +gNameChoice_Leaf:: @ 81C5762 + .string "LEAF$" + +gNameChoice_Fire:: @ 81C5767 + .string "FIRE$" + +gNameChoice_Gary:: @ 81C576C + .string "GARY$" + +gNameChoice_Kaz:: @ 81C5771 + .string "KAZ$" + +gNameChoice_Toru:: @ 81C5775 + .string "TORU$" + +gNameChoice_Ash:: @ 81C577A + .string "ASH$" + +gNameChoice_Kene:: @ 81C577E + .string "KENE$" + +gNameChoice_Geki:: @ 81C5783 + .string "GEKI$" + +gNameChoice_Jak:: @ 81C5788 + .string "JAK$" + +gNameChoice_Janne:: @ 81C578C + .string "JANNE$" + +gNameChoice_Jonn:: @ 81C5792 + .string "JONN$" + +gNameChoice_Kamon:: @ 81C5797 + .string "KAMON$" + +gNameChoice_Karl:: @ 81C579D + .string "KARL$" + +gNameChoice_Taylor:: @ 81C57A2 + .string "TAYLOR$" + +gNameChoice_Oscar:: @ 81C57A9 + .string "OSCAR$" + +gNameChoice_Hiro:: @ 81C57AF + .string "HIRO$" + +gNameChoice_Max:: @ 81C57B4 + .string "MAX$" + +gNameChoice_Jon:: @ 81C57B8 + .string "JON$" + +gNameChoice_Ralph:: @ 81C57BC + .string "RALPH$" + +gNameChoice_Kay:: @ 81C57C2 + .string "KAY$" + +gNameChoice_Tosh:: @ 81C57C6 + .string "TOSH$" + +gNameChoice_Roak:: @ 81C57CB + .string "ROAK$" + +gNameChoice_Omi:: @ 81C57D0 + .string "OMI$" + +gNameChoice_Jodi:: @ 81C57D4 + .string "JODI$" + +gNameChoice_Amanda:: @ 81C57D9 + .string "AMANDA$" + +gNameChoice_Hillary:: @ 81C57E0 + .string "HILLARY$" + +gNameChoice_Makey:: @ 81C57E8 + .string "MAKEY$" + +gNameChoice_Michi:: @ 81C57EE + .string "MICHI$" + +gNameChoice_Paula:: @ 81C57F4 + .string "PAULA$" + +gNameChoice_June:: @ 81C57FA + .string "JUNE$" + +gNameChoice_Cassie:: @ 81C57FF + .string "CASSIE$" + +gNameChoice_Rey:: @ 81C5806 + .string "REY$" + +gNameChoice_Seda:: @ 81C580A + .string "SEDA$" + +gNameChoice_Kiko:: @ 81C580F + .string "KIKO$" + +gNameChoice_Mina:: @ 81C5814 + .string "MINA$" + +gNameChoice_Norie:: @ 81C5819 + .string "NORIE$" + +gNameChoice_Sai:: @ 81C581F + .string "SAI$" + +gNameChoice_Momo:: @ 81C5823 + .string "MOMO$" + +gNameChoice_Suzi:: @ 81C5828 + .string "SUZI$" + +gNewGame_HelpDocs1:: @ 81C582D + .string "The various buttons will be explained in\n" + .string "the order of their importance.$" + +gNewGame_HelpDocs2:: @ 81C5875 + .string "Moves the main character.\n" + .string "Also used to choose various data\n" + .string "headings.$" + +gNewGame_HelpDocs3:: @ 81C58BA + .string "Used to confirm a choice, check\n" + .string "things, chat, and scroll text.$" + +gNewGame_HelpDocs4:: @ 81C58F9 + .string "Used to exit, cancel a choice,\n" + .string "and cancel a mode.$" + +gNewGame_HelpDocs5:: @ 81C592B + .string "Press this button to open the\n" + .string "MENU.$" + +gNewGame_HelpDocs6:: @ 81C594F + .string "Used to shift items and to use\n" + .string "a registered item.$" + +gNewGame_HelpDocs7:: @ 81C5981 + .string "If you need help playing the\n" + .string "game, or on how to do things,\n" + .string "press the L or R Button.$" + +gOakText_AskPlayerGender:: @ 81C59D5 + .string "Now tell me. Are you a boy?\n" + .string "Or are you a girl?$" + +gNewGameAdventureIntro1:: + .string "In the world which you are about to\n" + .string "enter, you will embark on a grand\n" + .string "adventure with you as the hero.\n" + .string "\n" + .string "Speak to people and check things\n" + .string "wherever you go, be it towns, roads,\n" + .string "or caves. Gather information and\n" + .string "hints from every source.$" + +gNewGameAdventureIntro2:: + .string "New paths will open to you by helping\n" + .string "people in need, overcoming challenges,\n" + .string "and solving mysteries.\n" + .string "\n" + .string "At times, you will be challenged by\n" + .string "others and attacked by wild creatures.\n" + .string "Be brave and keep pushing on.$" + +gNewGameAdventureIntro3:: + .string "Through your adventure, we hope\n" + .string "that you will interact with all sorts\n" + .string "of people and achieve personal growth.\n" + .string "That is our biggest objective.\n" + .string "\n" + .string "Press the A Button, and let your\n" + .string "adventure begin!$" + +gOakText_WelcomeToTheWorld:: @ 81C5C78 + .string "Hello, there!\n" + .string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n" + .string "as the POKéMON PROFESSOR.\p$" + +gOakText_WorldInhabited1:: @ 81C5D06 + .string "This world…$" + +gOakText_WorldInhabited2:: @ 81C5D12 + .string "…is inhabited far and wide by\n" + .string "creatures called POKéMON.\p$" + +gOakText_PetsBattlingStudy:: @ 81C5D4B + .string "For some people, POKéMON are pets.\n" + .string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$" + +gOakText_TellMeALittleAboutYourself:: @ 81C5DBD + .string "But first, tell me a little about\n" + .string "yourself.\p$" + +gOakText_AskPlayerName:: @ 81C5DEA + .string "Let's begin with your name.\n" + .string "What is it?\p$" + +gOakText_FinalizePlayerName:: @ 81C5E13 + .string "Right…\n" + .string "So your name is {PLAYER}.$" + +gOakText_IntroduceRival:: @ 81C5E2E + .string "This is my grandson.\pHe's been your rival since you both\n" + .string "were babies.\p…Erm, what was his name now?$" + +gOakText_AskRivalName:: @ 81C5E91 + .string "Your rival's name, what was it now?$" + +gOakText_ConfirmRivalName:: @ 81C5EB5 + .string "…Er, was it {RIVAL}?$" + +gOakText_RememberRivalName:: @ 81C5EC5 + .string "That's right! I remember now!\n" + .string "His name is {RIVAL}!\p$" + +gOakText_LegendAboutToUnfold:: @ 81C5EF4 + .string "{PLAYER}!\pYour very own POKéMON legend is\n" + .string "about to unfold!\pA world of dreams and adventures\n" + .string "with POKéMON awaits! Let's go!$" diff --git a/data/text/obtain_item.inc b/data/text/obtain_item.inc new file mode 100644 index 000000000..74a2716f8 --- /dev/null +++ b/data/text/obtain_item.inc @@ -0,0 +1,47 @@ +Text_ObtainedTheX:: @ 81A51F6 + .string "Obtained the {STR_VAR_2}!$" + +Text_BagIsFull:: @ 81A5207 + .string "The BAG is full…$" + +Text_PutItemAway:: @ 81A5218 + .string "{PLAYER} put the {STR_VAR_2}\n" + .string "in the {STR_VAR_3}.$" + +Text_FoundOneItem:: @ 81A5231 + .string "{PLAYER} found one {STR_VAR_2}!$" + +Text_TooBadBagFull:: @ 81A5242 + .string "Too bad!\n" + .string "The BAG is full…$" + +Text_FoundXCoins:: @ 81A525C + .string "{PLAYER} found\n" + .string "{STR_VAR_1} {STR_VAR_2}!$" + +Text_PutCoinsAwayInCoinCase:: @ 81A526C + .string "{PLAYER} put the COINS away in\n" + .string "the COIN CASE.$" + +Text_CoinCaseIsFull:: @ 81A5294 + .string "Too bad!\n" + .string "The COIN CASE is full…$" + +Text_NothingToPutThemIn:: @ 81A52B4 + .string "Too bad!\n" + .string "There's nothing to put them in…$" + +Text_FoundXItems:: @ 81A52DD + .string "{PLAYER} found\n" + .string "{STR_VAR_1} {STR_VAR_2}(s)!$" + +Text_1A52F0:: @ 81A52F0 + .string "Obtained the {STR_VAR_2}!$" + +Text_1A5301:: @ 81A5301 + .string "Too bad! There's no room left for\n" + .string "another {STR_VAR_2}…$" + +gUnknown_81A532F:: @ 81A532F + .string "The {STR_VAR_2} was transferred\n" + .string "to the PC.$" diff --git a/data/text/poke_dude.inc b/data/text/poke_dude.inc new file mode 100644 index 000000000..fc1273056 --- /dev/null +++ b/data/text/poke_dude.inc @@ -0,0 +1,155 @@ +gUnknown_81C5F69:: + .string "POKé DUDE: The speedier of the\n" + .string "battlers gets to attack first.$" + +gUnknown_81C5FA7:: + .string "It looks like my RATTATA was\n" + .string "faster than the PIDGEY.$" + +gUnknown_81C5FDC:: + .string "The battlers take turns attacking\n" + .string "and reducing each other's HP.$" + +gUnknown_81C601C:: + .string "My RATTATA reduced the foe's HP\n" + .string "to zero, so it wins!\p" + + .string "The POKéMON that took part in the\n" + .string "battle get EXP. Points.\p" + + .string "When a POKéMON collects enough\n" + .string "EXP. Points, it levels up.\p" + + .string "Leveling up makes your POKéMON\n" + .string "stronger than before.$" + +gUnknown_81C60FA:: + .string "POKé DUDE: Uh-oh…\n" + .string "My RATTATA has been poisoned…\p" + + .string "If a POKéMON is poisoned, it loses\n" + .string "HP steadily.$" + +gUnknown_81C615A:: + .string "If a POKéMON develops a status\n" + .string "problem, heal it right away.$" + +gUnknown_81C6196:: + .string "Using an item on a POKéMON uses\n" + .string "up one turn, though.\p" + + .string "Now, it's the opponent's turn!$" + +gUnknown_81C61EA:: + .string "Yay!\n" + .string "We managed to win!$" + +gUnknown_81C6202:: + .string "POKé DUDE: The move BUBBLE is\n" + .string "a WATER-type attack.\p" + + .string "The targeted ODDISH is a\n" + .string "GRASS/POISON-type POKéMON.\p" + + .string "The WATER-type attack is absorbed\n" + .string "by the GRASS-type POKéMON…\p" + + .string "As a result, the move becomes not\n" + .string "very effective, and inflicts only\l" + .string "half the usual damage.$" + +gUnknown_81C6301:: + .string "Uh-oh, this is not good!\p" + + .string "The ABSORB attack you just saw\n" + .string "is a GRASS-type move.\p" + + .string "POLIWAG is a WATER-type POKéMON.\p" + + .string "So, ABSORB becomes super\n" + .string "effective, doubling the damage.$" + +gUnknown_81C63A9:: + .string "It's not going to be easy to win\n" + .string "with this matchup…\p" + + .string "Let's try shifting POKéMON!$" + +gUnknown_81C63F9:: + .string "Shifting POKéMON in and out uses\n" + .string "up one turn.\p" + + .string "Now, it's the opponent's turn.$" + +gUnknown_81C6446:: + .string "BUTTERFREE is a BUG/FLYING-type\n" + .string "POKéMON.\p" + + .string "Against this POKéMON, a GRASS-\n" + .string "type attack…\p" + + .string "…inflicts only half the usual\n" + .string "damage on a BUG-type POKéMON…\p" + + .string "…And, it also causes only half the\n" + .string "damage on a FLYING-type POKéMON.\p" + + .string "Therefore, BUTTERFREE, being a\n" + .string "BUG/FLYING POKéMON, only takes\l" + .string "one quarter of the usual damage.$" + +gUnknown_81C657A:: + .string "ODDISH is a GRASS/POISON-type\n" + .string "POKéMON.\p" + + .string "A FLYING- or PSYCHIC-type attack\n" + .string "is super effective against it.\p" + + .string "One of those types of attacks will\n" + .string "inflict double the usual damage.\p" + + .string "Okay, here we go!$" + +gUnknown_81C6637:: + .string "Yeah!\n" + .string "We won!$" + +gUnknown_81C6645:: + .string "POKé DUDE: When you're trying to\n" + .string "catch a POKéMON, don't throw any\l" + .string "POKé BALLS right away.\p" + + .string "First, you need to weaken it by\n" + .string "reducing its HP.$" + +gUnknown_81C66CF:: + .string "Okay, that should be good enough.\p" + + .string "But, if it's possible, it would be\n" + .string "best if the target has a status\l" + .string "problem.\p" + + .string "For instance, it would be easier\n" + .string "to catch if it were asleep or\l" + .string "paralyzed.$" + +gUnknown_81C6787:: + .string "This will make the POKéMON a lot\n" + .string "easier to catch!\p" + + .string "Oh, yes. If you paralyze a\n" + .string "POKéMON, you can't make it fall\l" + .string "asleep on top of paralysis.\p" + + .string "In other words, you can't double\n" + .string "up status problems, okay?$" + +gUnknown_81C684B:: + .string "Okay!\n" + .string "Let me throw my POKé BALL!$" + +gUnknown_81C686C:: + .string "Before you throw a POKé BALL,\n" + .string "consider the condition and the\l" + .string "type of POKéMON, and pick the kind\l" + .string "of BALL that would work best.$" diff --git a/data/text/save.inc b/data/text/save.inc new file mode 100644 index 000000000..4d459a7f3 --- /dev/null +++ b/data/text/save.inc @@ -0,0 +1,26 @@ +gText_WouldYouLikeToSaveTheGame:: @ 81C55C9 + .string "Would you like to save the game?$" + +gText_AlreadySaveFile_WouldLikeToOverwrite:: @ 81C55EA + .string "There is already a saved file.\n" + .string "Is it okay to overwrite it?$" + +gText_SavingDontTurnOffThePower:: @ 81C5625 + .string "SAVING…\n" + .string "DON'T TURN OFF THE POWER.$" + +gText_PlayerSavedTheGame:: @ 81C5647 + .string "{PLAYER} saved the game.$" + +gUnknown_81C565A:: + .string "セーブに　しっぱい　しました‥$" + +gText_DifferentGameFile:: @ 81C566A + .string "WARNING!\p" + .string "There is a different game file that\n" + .string "is already saved.\p" + .string "If you save now, the other file's\n" + .string "adventure, including items and\l" + .string "POKéMON, will be entirely lost.\p" + .string "Are you sure you want to save now\n" + .string "and overwrite the other save file?$" diff --git a/include/event_scripts.h b/include/event_scripts.h index b899a217b..08b5b8c01 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1184,6 +1184,7 @@ extern const u8 Text_1BCB42[]; extern const u8 Text_1BCA95[]; extern const u8 Text_1BCACB[]; extern const u8 Text_1BCAF2[]; +extern const u8 EventScript_PC[]; extern const u8 EventScript_RepelWoreOff[]; diff --git a/include/strings.h b/include/strings.h index 4379ebb65..33650663d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -706,6 +706,7 @@ extern const u8 gText_HpUp_1000[]; extern const u8 gText_PpUp_3000[]; // script_menu +extern const u8 Text_AccessWhichPC[]; extern const u8 gText_SomeoneSPc[]; extern const u8 gText_BillSPc[]; extern const u8 gText_SPc[]; @@ -713,7 +714,6 @@ extern const u8 gText_HallOfFame_2[]; extern const u8 gText_LogOff[]; extern const u8 gText_ProfOakSPc[]; extern const u8 gText_Other[]; -extern const u8 gUnknown_81A508A[]; extern const u8 gOtherText_Double[]; extern const u8 gOtherText_Knockout[]; extern const u8 gOtherText_Mixed[]; diff --git a/src/script_menu.c b/src/script_menu.c index be8578cd0..827f79fa6 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1007,7 +1007,7 @@ static void CreatePCMenuWindow(void) void ScriptMenu_DisplayPCStartupPrompt(void) { sub_80F7768(0, TRUE); - AddTextPrinterParameterized2(0, 2, gUnknown_81A508A, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, Text_AccessWhichPC, 0, NULL, 2, 1, 3); } static void Task_ScriptShowMonPic(u8 taskId) From 0f5e3174d0d4b910beb273de772772d257692c94 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 9 Jan 2020 14:30:22 -0500 Subject: [PATCH 09/20] Split more file from event_scripts.s --- data/event_scripts.s | 1260 +---------------- .../PalletTown_PlayersHouse_2F/scripts.inc | 2 +- data/scripts/pokedex_rating.inc | 89 ++ data/scripts/route23.inc | 229 +++ data/scripts/seagallop.inc | 207 +++ data/scripts/static_pokemon.inc | 23 + data/scripts/std_msgbox.inc | 63 + data/scripts/trainer_tower.inc | 450 ++++++ data/text/poke_mart.inc | 29 + data/text/pokedex_rating.inc | 123 ++ data/text/route23.inc | 28 + 11 files changed, 1254 insertions(+), 1249 deletions(-) create mode 100644 data/scripts/pokedex_rating.inc create mode 100644 data/scripts/route23.inc create mode 100644 data/scripts/seagallop.inc create mode 100644 data/scripts/static_pokemon.inc create mode 100644 data/scripts/std_msgbox.inc create mode 100644 data/scripts/trainer_tower.inc create mode 100644 data/text/poke_mart.inc create mode 100644 data/text/pokedex_rating.inc create mode 100644 data/text/route23.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index 1796bc138..27b22fa85 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -782,70 +782,7 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_WaterPath_House2/text.inc" .include "data/maps/SevenIsland_SevaultCanyon_House/text.inc" -Std_MsgboxNPC:: @ 81A4E3F - lock - faceplayer - message 0x0 - waitmessage - waitbuttonpress - release - return - -Std_MsgboxSign:: @ 81A4E4A - lockall - message 0x0 - waitmessage - waitbuttonpress - releaseall - return - -Std_MsgboxDefault:: @ 81A4E54 - message 0x0 - waitmessage - waitbuttonpress - return - -Std_MsgboxYesNo:: @ 81A4E5C - message 0x0 - waitmessage - yesnobox 20, 8 - return - -gStdScript_ItemMessageAndFanfare:: @ 81A4E66 - textcolor 3 - compare VAR_0x8002, MUS_FANFA1 - call_if eq, EventScript_1A4EA2 - compare VAR_0x8002, MUS_FAN5 - call_if eq, EventScript_1A4EA6 - message 0x0 - waitmessage - waitfanfare - compare VAR_0x8002, MUS_FANFA1 - call_if eq, EventScript_1A4EAA - putitemaway VAR_0x8000, VAR_0x8001 - call EventScript_1A6675 - return - -EventScript_1A4EA2:: @ 81A4EA2 - playfanfare MUS_FANFA1 - return - -EventScript_1A4EA6:: @ 81A4EA6 - playfanfare MUS_FAN5 - return - -EventScript_1A4EAA:: @ 81A4EAA - delay 50 - return - -EventScript_UnusedReturn:: @ 81A4EAE - return - -EventScript_1A4EAF:: @ 81A4EAF - special Field_AskSaveTheGame - waitstate - return - + .include "data/scripts/std_msgbox.inc" .include "data/scripts/trainer_battle.inc" @ Unused @@ -920,13 +857,14 @@ Text_1A53B2:: @ 81A53B2 .string "トレーナーの　じつりょくが　とわれます！\p" .string "‥‥　‥‥　‥‥$" -gUnknown_81A5420:: @ 81A5420 +Text_PlayerBootedUpPC:: @ 81A5420 .string "{PLAYER} booted up the PC.$" Text_1A5435:: @ 81A5435 .string "つうしんは　キャンセルされました$" -Text_1A5446:: @ 81A5446 +@ Unused +Text_GiveNicknameToReceivedMon:: @ 81A5446 .string "Want to give a nickname to the\n" .string "{STR_VAR_2} you received?$" @@ -990,34 +928,7 @@ Text_DugUpItemFromGround:: @ 81A5700 .string "{PLAYER} dug up one {STR_VAR_2}\n" .string "from deep in the ground.$" -Text_1A572A:: @ 81A572A - .string "Only truly skilled TRAINERS are\n" - .string "allowed through.\p" - .string "You don't have the {STR_VAR_1}\n" - .string "yet!$" - -Text_1A5776:: @ 81A5776 - .string "Rules are rules.\n" - .string "I can't let you pass.$" - -Text_1A579D:: @ 81A579D - .string "Oh! That is the {STR_VAR_1}!\n" - .string "Go right ahead.$" - -Text_1A57C1:: @ 81A57C1 - .string "You can pass here only if you have\n" - .string "the {STR_VAR_1}.\p" - .string "You don't have the {STR_VAR_1}\n" - .string "yet.\p" - .string "You have to have it to get to\n" - .string "the POKéMON LEAGUE.$" - -Text_1A5839:: @ 81A5839 - .string "You can pass here only if you have\n" - .string "the {STR_VAR_1}.\p" - .string "Oh! That is the {STR_VAR_1}!{PAUSE_MUSIC}{PLAY_BGM}{MUS_FANFA1}{PAUSE 0x60}{RESUME_MUSIC}\p" - .string "Okay, then.\n" - .string "Please, go right ahead.$" + .include "data/text/route23.inc" Text_1A58A7:: @ 81A58A7 .string "Let's see…\n" @@ -1177,35 +1088,7 @@ Text_1A61E5:: @ 81A61E5 .string "POKéMON!\p" .string "{PLAYER} whited out!$" -Text_MayIHelpYou:: @ 81A6211 - .string "Hi, there!\n" - .string "May I help you?$" - -Text_FillOutQuestionnaire:: @ 81A622C - .string "There is a questionnaire.\n" - .string "Would you like to fill it out?$" - -Text_1A6265:: @ 81A6265 - .string "Thank you for taking the time to\n" - .string "fill out our questionnaire.\p" - .string "Your feedback will be used for\n" - .string "future reference.$" - -Text_1A62D3:: @ 81A62D3 - .string "Oh, hello!\n" - .string "You know those words?\p" - .string "That means you must know about\n" - .string "the MYSTERY GIFT.\p" - .string "From now on, you should be\n" - .string "receiving MYSTERY GIFTS!$" - -Text_1A6359:: @ 81A6359 - .string "Once you save your game, you can\n" - .string "access the MYSTERY GIFT.$" - -Text_1A6393:: @ 81A6393 - .string "Thank you for accessing the\n" - .string "MYSTERY GIFT System.$" + .include "data/text/poke_mart.inc" Text_1A63C4:: @ 81A63C4 .string "The {STR_VAR_1} flew away!$" @@ -1382,219 +1265,8 @@ gUnknown_81A6C32:: @ 81A6C32 releaseall end -gUnknown_81A6C51:: @ 81A6C51 - .string "OAK: Good to see you!\n" - .string "How is your POKéDEX coming along?\p" - .string "Here, let me take a look.$" - -Text_1A6CA3:: @ 81A6CA3 - .string "The amount of progress you've made\n" - .string "on your POKéDEX is:\p" - .string "{STR_VAR_1} POKéMON seen and\n" - .string "{STR_VAR_2} POKéMON owned.\p" - .string "{SIZE}ÁPROF. OAK's rating:$" - -gUnknown_81A6D17:: @ 81A6D17 - .string "You still have lots to do.\p" - .string "Go into every patch of grass you\n" - .string "see and look for POKéMON!$" - -gUnknown_81A6D6D:: @ 81A6D6D - .string "It looks as if you're getting on\n" - .string "the right track!\p" - .string "I've given one of my AIDES a FLASH\n" - .string "HM. Make sure you go get it!$" - -gUnknown_81A6DDF:: @ 81A6DDF - .string "Your POKéDEX could use a bit more\n" - .string "volume still!\p" - .string "Try to catch other species of\n" - .string "POKéMON!$" - -gUnknown_81A6E36:: @ 81A6E36 - .string "Good, it's apparent that you're\n" - .string "trying hard!\p" - .string "I've given one of my AIDES an\n" - .string "ITEMFINDER. Be sure to collect it!$" - -gUnknown_81A6EA4:: @ 81A6EA4 - .string "Your POKéDEX is coming along quite\n" - .string "well!\p" - .string "I've given one of my AIDES an\n" - .string "AMULET COIN. Be sure to get it!$" - -gUnknown_81A6F0B:: @ 81A6F0B - .string "Ah, you've finally topped 50\n" - .string "species!\p" - .string "I've given one of my AIDES an EXP.\n" - .string "SHARE. Be sure to go get it!$" - -gUnknown_81A6F71:: @ 81A6F71 - .string "Hoho! This is turning into quite the\n" - .string "respectable POKéDEX!$" - -gUnknown_81A6FAB:: @ 81A6FAB - .string "Very good!\p" - .string "I think you'll collect even more\n" - .string "POKéMON by going fishing!$" - -gUnknown_81A6FF1:: @ 81A6FF1 - .string "Wonderful! Let me guess… You\n" - .string "like to collect things, don't you?$" - -gUnknown_81A7031:: @ 81A7031 - .string "I'm impressed!\n" - .string "It must have been difficult to do!$" - -gUnknown_81A7063:: @ 81A7063 - .string "You've finally hit 100 species!\n" - .string "I can't believe how good you are!$" - -gUnknown_81A70A5:: @ 81A70A5 - .string "You even have the evolved forms\n" - .string "of POKéMON! Super!$" - -gUnknown_81A70D8:: @ 81A70D8 - .string "Excellent! Trade with friends to\n" - .string "get some more!$" - -gUnknown_81A7108:: @ 81A7108 - .string "Outstanding!\n" - .string "You've become a real pro at this!$" - -gUnknown_81A7137:: @ 81A7137 - .string "I have nothing left to say!\n" - .string "You're the POKéMON PROFESSOR now!$" - -gUnknown_81A7175:: @ 81A7175 - .string "Your POKéDEX is entirely complete!\n" - .string "Congratulations!!$" - -Text_1A71AA:: @ 81A71AA - .string "And your NATIONAL POKéDEX is:\p" - .string "{STR_VAR_1} POKéMON seen and\n" - .string "{STR_VAR_2} POKéMON owned.$" - -Text_1A71EE:: @ 81A71EE - .string "I'll be looking forward to seeing\n" - .string "you fill the NATIONAL POKéDEX!$" - -Text_1A722F:: @ 81A722F - .string "Finally…\p" - .string "You've finally completed the\n" - .string "POKéDEX!\p" - .string "It's magnificent!\n" - .string "Truly, this is a fantastic feat!$" - -Text_1A7291:: @ 81A7291 - .string "Wroooooooaaaaaarrrr!$" - -Text_1A72A6:: @ 81A72A6 - .string "はあ はあ‥$" - -gUnknown_81A72AD:: @ 81A72AD - .string "Thank you, {PLAYER}!\n" - .string "Sincerely, thank you!\l" - .string "You've made my dream a reality!$" - -Text_1A72F2:: @ 81A72F2 - .string "OAK: Ah, welcome!\p" - .string "Tell me, how is your POKéDEX\n" - .string "coming along?\p" - .string "Wahaha!\p" - .string "Actually, I know how it is, but I\n" - .string "love seeing it anyway!\p" - .string "Let's see…$" - -EventScript_1A737B:: @ 81A737B - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - special sub_8112364 - checkflag FLAG_OAK_SAW_DEX_COMPLETION - call_if TRUE, EventScript_1A73A4 - checkflag FLAG_OAK_SAW_DEX_COMPLETION - call_if FALSE, EventScript_1A73AD - call EventScript_1A73E0 - return - -EventScript_1A73A4:: @ 81A73A4 - msgbox Text_1A72F2 - return - -EventScript_1A73AD:: @ 81A73AD - msgbox gUnknown_81A6C51 - return - -EventScript_1A73B6:: @ 81A73B6 - copyvar VAR_0x8004, VAR_0x8009 - special Special_GetProfOaksRatingMessage - waitmessage - compare VAR_RESULT, 0 - call_if eq, EventScript_1A73D8 - compare VAR_RESULT, 1 - call_if eq, EventScript_1A73DC - waitfanfare - waitbuttonpress - return - -EventScript_1A73D8:: @ 81A73D8 - playfanfare MUS_FAN2 - return - -EventScript_1A73DC:: @ 81A73DC - playfanfare MUS_FANFA5 - return - -EventScript_1A73E0:: @ 81A73E0 - setvar VAR_0x8004, 31 - special HelpSystem_BackupSomeVariable - special Special_SetSomeVariable - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount - copyvar VAR_0x8008, VAR_0x8005 - copyvar VAR_0x8009, VAR_0x8006 - copyvar VAR_0x800A, VAR_RESULT - getnumberstring 0, VAR_0x8008 - getnumberstring 1, VAR_0x8009 - msgbox Text_1A6CA3 - checkflag FLAG_OAKS_RATING_IS_VIA_PC - call_if FALSE, EventScript_1A746D - call EventScript_1A73B6 - compare VAR_0x800A, 0 - goto_if eq, EventScript_1A748F - setvar VAR_0x8004, 1 - specialvar VAR_RESULT, Special_GetPokedexCount - copyvar VAR_0x8008, VAR_0x8005 - copyvar VAR_0x8009, VAR_0x8006 - getnumberstring 0, VAR_0x8008 - getnumberstring 1, VAR_0x8009 - msgbox Text_1A71AA - specialvar VAR_RESULT, HasAllMons - compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7470 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A747E - end - -EventScript_1A746D:: @ 81A746D - textcolor 0 - return - -EventScript_1A7470:: @ 81A7470 - msgbox Text_1A71EE - goto EventScript_1A748F - end - -EventScript_1A747E:: @ 81A747E - setflag FLAG_OAK_SAW_DEX_COMPLETION - msgbox Text_1A722F - goto EventScript_1A748F - end - -EventScript_1A748F:: @ 81A748F - special HelpSystem_RestoreSomeVariable - return + .include "data/text/pokedex_rating.inc" + .include "data/scripts/pokedex_rating.inc" EventScript_1A7493:: @ 81A7493 lockall @@ -1905,235 +1577,7 @@ Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1 releaseall end -EventScript_1A77C9:: @ 81A77C9 - msgbox Text_1A572A - playse SE_BOO - msgbox Text_1A5776 - release - end - -EventScript_1A77DE:: @ 81A77DE - message Text_1A57C1 - waitmessage - playse SE_BOO - waitbuttonpress - closemessage - waitse - release - end - -EventScript_1A77EC:: @ 81A77EC - message Text_1A579D - waitmessage - playfanfare MUS_FANFA1 - waitfanfare - waitbuttonpress - release - end - -EventScript_1A77F9:: @ 81A77F9 - msgbox Text_1A5839 - release - end - -EventScript_1A7803:: @ 81A7803 - compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 - goto_if ge, EventScript_1A77EC - switch VAR_0x4001 - case 1, EventScript_1A78D5 - case 2, EventScript_1A78E4 - case 3, EventScript_1A78F3 - case 4, EventScript_1A7902 - case 5, EventScript_1A7911 - case 6, EventScript_1A7920 - case 7, EventScript_1A792F - case 8, EventScript_1A793E - end - -EventScript_1A786C:: @ 81A786C - compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 - goto_if ge, EventScript_1A77F9 - switch VAR_0x4001 - case 1, EventScript_1A78D5 - case 2, EventScript_1A78E4 - case 3, EventScript_1A78F3 - case 4, EventScript_1A7902 - case 5, EventScript_1A7911 - case 6, EventScript_1A7920 - case 7, EventScript_1A792F - case 8, EventScript_1A793E - end - -EventScript_1A78D5:: @ 81A78D5 - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_1A794D - goto EventScript_1A77C9 - end - -EventScript_1A78E4:: @ 81A78E4 - checkflag FLAG_BADGE02_GET - goto_if TRUE, EventScript_1A795F - goto EventScript_1A77DE - end - -EventScript_1A78F3:: @ 81A78F3 - checkflag FLAG_BADGE03_GET - goto_if TRUE, EventScript_1A795F - goto EventScript_1A77DE - end - -EventScript_1A7902:: @ 81A7902 - checkflag FLAG_BADGE04_GET - goto_if TRUE, EventScript_1A795F - goto EventScript_1A77DE - end - -EventScript_1A7911:: @ 81A7911 - checkflag FLAG_BADGE05_GET - goto_if TRUE, EventScript_1A795F - goto EventScript_1A77DE - end - -EventScript_1A7920:: @ 81A7920 - checkflag FLAG_BADGE06_GET - goto_if TRUE, EventScript_1A795F - goto EventScript_1A77DE - end - -EventScript_1A792F:: @ 81A792F - checkflag FLAG_BADGE07_GET - goto_if TRUE, EventScript_1A795F - goto EventScript_1A77DE - end - -EventScript_1A793E:: @ 81A793E - checkflag FLAG_BADGE08_GET - goto_if TRUE, EventScript_1A795F - goto EventScript_1A77DE - end - -EventScript_1A794D:: @ 81A794D - message Text_1A579D - waitmessage - playfanfare MUS_FANFA1 - waitfanfare - waitbuttonpress - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 - release - end - -EventScript_1A795F:: @ 81A795F - msgbox Text_1A5839 - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 - release - end - -EventScript_1A796E:: @ 81A796E - textcolor 0 - applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft - waitmovement 0 - switch VAR_0x4001 - case 1, EventScript_1A79D8 - case 2, EventScript_1A79E7 - case 3, EventScript_1A79F6 - case 4, EventScript_1A7A05 - case 5, EventScript_1A7A14 - case 6, EventScript_1A7A23 - case 7, EventScript_1A7A32 - case 8, EventScript_1A7A41 - end - -EventScript_1A79D8:: @ 81A79D8 - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_1A7A96 - goto EventScript_1A7A50 - end - -EventScript_1A79E7:: @ 81A79E7 - checkflag FLAG_BADGE02_GET - goto_if TRUE, EventScript_1A7AA8 - goto EventScript_1A7A77 - end - -EventScript_1A79F6:: @ 81A79F6 - checkflag FLAG_BADGE03_GET - goto_if TRUE, EventScript_1A7AA8 - goto EventScript_1A7A77 - end - -EventScript_1A7A05:: @ 81A7A05 - checkflag FLAG_BADGE04_GET - goto_if TRUE, EventScript_1A7AA8 - goto EventScript_1A7A77 - end - -EventScript_1A7A14:: @ 81A7A14 - checkflag FLAG_BADGE05_GET - goto_if TRUE, EventScript_1A7AA8 - goto EventScript_1A7A77 - end - -EventScript_1A7A23:: @ 81A7A23 - checkflag FLAG_BADGE06_GET - goto_if TRUE, EventScript_1A7AA8 - goto EventScript_1A7A77 - end - -EventScript_1A7A32:: @ 81A7A32 - checkflag FLAG_BADGE07_GET - goto_if TRUE, EventScript_1A7AA8 - goto EventScript_1A7A77 - end - -EventScript_1A7A41:: @ 81A7A41 - checkflag FLAG_BADGE08_GET - goto_if TRUE, EventScript_1A7AA8 - goto EventScript_1A7A77 - end - -EventScript_1A7A50:: @ 81A7A50 - msgbox Text_1A572A - playse SE_BOO - msgbox Text_1A5776 - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 - applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown - waitmovement 0 - releaseall - end - -EventScript_1A7A77:: @ 81A7A77 - message Text_1A57C1 - waitmessage - playse SE_BOO - waitbuttonpress - closemessage - waitse - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 - applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown - waitmovement 0 - releaseall - end - -EventScript_1A7A96:: @ 81A7A96 - message Text_1A579D - waitmessage - playfanfare MUS_FANFA1 - waitfanfare - waitbuttonpress - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 - releaseall - end - -EventScript_1A7AA8:: @ 81A7AA8 - msgbox Text_1A5839 - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 - releaseall - end - -Movement_1A7AB7:: @ 81A7AB7 - walk_down - step_end + .include "data/scripts/route23.inc" EventScript_1A7AB9:: @ 81A7AB9 special Special_GetElevatorFloor @@ -2701,237 +2145,8 @@ EventScript_1A8EC0:: @ 81A8EC0 getstdstring 2, 28 return -EventScript_1A8EC5:: @ 81A8EC5 - compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1A911E - compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if ge, EventScript_1A8F12 - multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE - switch VAR_RESULT - case 0, EventScript_1A8FF9 - case 1, EventScript_1A9004 - case 2, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 - end - -EventScript_1A8F12:: @ 81A8F12 - multichoice 19, 5, MULTICHOICE_SEAGALLOP_V23, FALSE - switch VAR_RESULT - case 0, EventScript_1A8FE3 - case 1, EventScript_1A8FF9 - case 2, EventScript_1A9004 - case 3, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 - end - -EventScript_1A8F54:: @ 81A8F54 - compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1A911E - compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if ge, EventScript_1A8FA1 - multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE - switch VAR_RESULT - case 0, EventScript_1A8FEE - case 1, EventScript_1A9004 - case 2, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 - end - -EventScript_1A8FA1:: @ 81A8FA1 - multichoice 19, 5, MULTICHOICE_SEAGALLOP_V13, FALSE - switch VAR_RESULT - case 0, EventScript_1A8FE3 - case 1, EventScript_1A8FEE - case 2, EventScript_1A9004 - case 3, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 - end - -EventScript_1A8FE3:: @ 81A8FE3 - setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY - goto EventScript_1A909E - end - -EventScript_1A8FEE:: @ 81A8FEE - setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND - goto EventScript_1A909E - end - -EventScript_1A8FF9:: @ 81A8FF9 - setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND - goto EventScript_1A909E - end - -EventScript_1A9004:: @ 81A9004 - setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND - goto EventScript_1A909E - end - -EventScript_1A900F:: @ 81A900F - compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1A911E - compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if ge, EventScript_1A905C - multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE - switch VAR_RESULT - case 0, EventScript_1A8FEE - case 1, EventScript_1A8FF9 - case 2, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 - end - -EventScript_1A905C:: @ 81A905C - multichoice 19, 5, MULTICHOICE_SEAGALLOP_V12, FALSE - switch VAR_RESULT - case 0, EventScript_1A8FE3 - case 1, EventScript_1A8FEE - case 2, EventScript_1A8FF9 - case 3, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 - end - -EventScript_1A909E:: @ 81A909E - specialvar VAR_RESULT, sub_8147500 - getnumberstring 0, VAR_RESULT - compare VAR_0x8004, SEAGALLOP_VERMILION_CITY - goto_if eq, EventScript_1A90BE - compare VAR_0x8004, SEAGALLOP_VERMILION_CITY - goto_if ne, EventScript_1A90CC - end - -EventScript_1A90BE:: @ 81A90BE - msgbox Text_17FB67 - goto EventScript_1A90DA - end - -EventScript_1A90CC:: @ 81A90CC - msgbox Text_1A641B - goto EventScript_1A90DA - end - -EventScript_1A90DA:: @ 81A90DA - closemessage - delay 20 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - special sub_8112364 - fadescreen 1 - special ScrSpecial_SeagallopFerry - waitstate - end - -EventScript_1A90F6:: @ 81A90F6 - specialvar VAR_RESULT, sub_8147594 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9108 - release - end - -EventScript_1A9108:: @ 81A9108 - closemessage - applymovement 6, Movement_FaceOriginalDirection - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A911C - waitmovement 0 - releaseall - end - -Movement_1A911C:: @ 81A911C - walk_up - step_end - -EventScript_1A911E:: @ 81A911E - setvar VAR_0x8005, 0 - special Special_DrawSeagallopDestinationMenu - waitstate - specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination - switch VAR_0x8006 - case SEAGALLOP_VERMILION_CITY, EventScript_1A91D5 - case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0 - case SEAGALLOP_TWO_ISLAND, EventScript_1A91EB - case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6 - case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 - case SEAGALLOP_MORE, EventScript_1A917F - case SCR_MENU_CANCEL, EventScript_1A90F6 - end - -EventScript_1A917F:: @ 81A917F - setvar VAR_0x8005, 1 - special Special_DrawSeagallopDestinationMenu - waitstate - specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination - switch VAR_0x8006 - case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 - case SEAGALLOP_FIVE_ISLAND, EventScript_1A920C - case SEAGALLOP_SIX_ISLAND, EventScript_1A9217 - case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222 - case SEAGALLOP_MORE, EventScript_1A911E - case SCR_MENU_CANCEL, EventScript_1A90F6 - end - -EventScript_1A91D5:: @ 81A91D5 - setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY - goto EventScript_1A909E - end - -EventScript_1A91E0:: @ 81A91E0 - setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND - goto EventScript_1A909E - end - -EventScript_1A91EB:: @ 81A91EB - setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND - goto EventScript_1A909E - end - -EventScript_1A91F6:: @ 81A91F6 - setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND - goto EventScript_1A909E - end - -EventScript_1A9201:: @ 81A9201 - setvar VAR_0x8006, SEAGALLOP_FOUR_ISLAND - goto EventScript_1A909E - end - -EventScript_1A920C:: @ 81A920C - setvar VAR_0x8006, SEAGALLOP_FIVE_ISLAND - goto EventScript_1A909E - end - -EventScript_1A9217:: @ 81A9217 - setvar VAR_0x8006, SEAGALLOP_SIX_ISLAND - goto EventScript_1A909E - end - -EventScript_1A9222:: @ 81A9222 - setvar VAR_0x8006, SEAGALLOP_SEVEN_ISLAND - goto EventScript_1A909E - end - -EventScript_1A922D:: @ 81A922D - fadescreen 1 - removeobject VAR_LAST_TALKED - fadescreen 0 - release - end - -EventScript_1A9236:: @ 81A9236 - fadescreen 1 - removeobject VAR_LAST_TALKED - fadescreen 0 - getspeciesname 0, VAR_0x8004 - msgbox Text_1A63C4 - release - end - -EventScript_1A924B:: @ 81A924B - message Text_1853E8 - waitmessage - playfanfare MUS_POKEFUE - waitfanfare - msgbox Text_185354 - return + .include "data/scripts/seagallop.inc" + .include "data/scripts/static_pokemon.inc" EventScript_1A925E:: @ 81A925E checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS @@ -4029,458 +3244,7 @@ gUnknown_81C1300:: @ 81C1300 .include "data/scripts/hole.inc" .include "data/text/trainers.inc" .include "data/scripts/move_tutors.inc" - -SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_2F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_3F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_4F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_5F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_6F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54 - setvar VAR_0x4002, 0 - setvar VAR_0x8004, 10 - special sub_815D9E8 - end - -SevenIsland_TrainerTower_1F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_2F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_3F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_4F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_5F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_6F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_7F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62 - setvar VAR_0x8004, 0 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_1C4FA7 - case 1, EventScript_1C4FC5 - case 2, EventScript_1C5019 - setflag FLAG_TEMP_2 - setflag FLAG_TEMP_3 - setflag FLAG_TEMP_4 - setflag FLAG_TEMP_5 - setvar VAR_0x400E, 1 - setvar VAR_0x400F, 1 - end - -EventScript_1C4FA7:: @ 81C4FA7 - setflag FLAG_TEMP_2 - setflag FLAG_TEMP_4 - setflag FLAG_TEMP_5 - setvar VAR_0x400F, 1 - setobjectxyperm 3, 15, 13 - setobjectmovementtype 3, 9 - goto EventScript_1C5042 - -EventScript_1C4FC5:: @ 81C4FC5 - setflag FLAG_TEMP_3 - setflag FLAG_TEMP_4 - setvar VAR_0x400E, 1 - setvar VAR_0x8004, 5 - special sub_815D9E8 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1C4FFE - setobjectxyperm 2, 10, 12 - setobjectmovementtype 2, 9 - setobjectxyperm 5, 10, 13 - setobjectmovementtype 5, 9 - goto EventScript_1C5042 - -EventScript_1C4FFE:: @ 81C4FFE - setobjectxyperm 2, 10, 12 - setobjectmovementtype 2, 8 - setobjectxyperm 5, 11, 12 - setobjectmovementtype 5, 8 - goto EventScript_1C5042 - -EventScript_1C5019:: @ 81C5019 - setflag FLAG_TEMP_5 - setvar VAR_0x400F, 1 - setobjectxyperm 2, 10, 10 - setobjectmovementtype 2, 8 - setobjectxyperm 3, 14, 13 - setobjectmovementtype 3, 9 - setobjectxyperm 4, 10, 16 - setobjectmovementtype 4, 7 -EventScript_1C5042: - setflag FLAG_TEMP_6 - end - -SevenIsland_TrainerTower_1F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_2F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_3F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_4F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_5F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_6F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046 - map_script_2 VAR_0x4002, 0, EventScript_1C5050 - .2byte 0 - -EventScript_1C5050:: @ 81C5050 - setvar VAR_0x4002, 1 - setvar VAR_0x8004, 5 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if eq, EventScript_1C5072 - setvar VAR_0x400E, 1 - setvar VAR_0x400F, 1 -EventScript_1C5072: - setvar VAR_0x8004, 18 - special sub_815D9E8 - compare VAR_RESULT, 1 - goto_if eq, EventScript_1C5086 - end - -EventScript_1C5086:: @ 81C5086 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 - waitstate -EventScript_1C508F:: - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_1C50C2 - case 1, EventScript_1C510D - case 2, EventScript_1C515C -EventScript_1C50C2: - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 3, Movement_ExclamationMark - waitmovement 0 - applymovement 3, Movement_Delay48 - waitmovement 0 - setvar VAR_0x400E, 1 - applymovement 3, Movement_1C5541 - waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_815D9E8 - msgbox gStringVar4 - closemessage - goto EventScript_1C5219 - -EventScript_1C510D:: @ 81C510D - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_0x4003 - special sub_815D9E8 - msgbox gStringVar4 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - addvar VAR_0x4003, 1 - compare VAR_0x4003, 1 - goto_if eq, EventScript_1C5146 - setvar VAR_0x4003, 0 -EventScript_1C5146: - copyvar VAR_0x8006, VAR_0x4003 - special sub_815D9E8 - msgbox gStringVar4 - closemessage - goto EventScript_1C5219 - -EventScript_1C515C:: @ 81C515C - switch VAR_0x4001 - case 0, EventScript_1C5182 - case 1, EventScript_1C51AD - case 2, EventScript_1C51D8 -EventScript_1C5182: - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 4, Movement_ExclamationMark - waitmovement 0 - applymovement 4, Movement_Delay48 - waitmovement 0 - applymovement 4, Movement_1C5546 - waitmovement 0 - goto EventScript_1C51FE - -EventScript_1C51AD:: @ 81C51AD - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 2, Movement_ExclamationMark - waitmovement 0 - applymovement 2, Movement_Delay48 - waitmovement 0 - applymovement 2, Movement_1C5549 - waitmovement 0 - goto EventScript_1C51FE - -EventScript_1C51D8:: @ 81C51D8 - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 3, Movement_ExclamationMark - waitmovement 0 - applymovement 3, Movement_Delay48 - waitmovement 0 - applymovement 3, Movement_1C5542 - waitmovement 0 -EventScript_1C51FE: - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_0x4001 - special sub_815D9E8 - msgbox gStringVar4 - closemessage -EventScript_1C5219: - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - special sub_815D9E8 - waitstate - switch VAR_RESULT - case 1, EventScript_1C524D - case 2, EventScript_1C52E0 - case 3, EventScript_1C52E0 -EventScript_1C524D: - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_1C52D7 - case 1, EventScript_1C52BA - case 2, EventScript_1C5280 -EventScript_1C5280: - switch VAR_0x4001 - case 0, EventScript_1C52A6 - case 1, EventScript_1C52B0 - case 2, EventScript_1C52D0 -EventScript_1C52A6: - addvar VAR_0x4001, 1 - goto EventScript_1C515C - -EventScript_1C52B0:: @ 81C52B0 - addvar VAR_0x4001, 1 - goto EventScript_1C515C - -EventScript_1C52BA:: @ 81C52BA - applymovement 5, Movement_1C554C - waitmovement 0 - applymovement 2, Movement_1C5550 - goto EventScript_1C52D7 - -EventScript_1C52D0:: @ 81C52D0 - applymovement 3, Movement_1C554D -EventScript_1C52D7: - setvar VAR_0x8004, 4 - special sub_815D9E8 - end - -EventScript_1C52E0:: @ 81C52E0 - special sp000_heal_pokemon - setvar VAR_0x8004, 11 - special sub_815D9E8 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 - waitstate - -EventScript_1C52F4:: @ 81C52F4 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_1C5327 - case 1, EventScript_1C5327 - case 2, EventScript_1C5331 -EventScript_1C5327: - setvar VAR_0x8006, 0 - goto EventScript_1C5391 - -EventScript_1C5331:: @ 81C5331 - setvar VAR_0x8006, 1 - goto EventScript_1C5391 - -EventScript_1C533B:: @ 81C533B - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_1C536E - case 1, EventScript_1C536E - case 2, EventScript_1C5378 -EventScript_1C536E: - setvar VAR_0x8006, 0 - goto EventScript_1C5391 - -EventScript_1C5378:: @ 81C5378 - setvar VAR_0x8006, 2 - goto EventScript_1C5391 - -EventScript_1C5382:: @ 81C5382 - setvar VAR_0x8006, 0 - goto EventScript_1C5391 - -EventScript_1C538C:: @ 81C538C - setvar VAR_0x8006, 1 -EventScript_1C5391: - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special sub_815D9E8 - lock - faceplayer - msgbox gStringVar4 - release - return - -EventScript_1C53AA:: @ 81C53AA - lock - faceplayer - setvar VAR_0x8004, 7 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_1C53DA - case 1, EventScript_1C53E2 - case 2, EventScript_1C5492 -EventScript_1C53DA: - msgbox Text_17CA5A -EventScript_1C53E2: - setvar VAR_0x8004, 8 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_1C5410 - case 1, EventScript_1C543A - case 2, EventScript_1C544F -EventScript_1C5410: - msgbox Text_17CB09 - textcolor 3 - playfanfare MUS_FANFA1 - message Text_ObtainedTheX - waitfanfare - waitmessage - getstdstring 2, 24 - msgbox Text_PutItemAway - call EventScript_1A6675 - goto EventScript_1C544F - -EventScript_1C543A:: @ 81C543A - msgbox Text_17CB09 - msgbox Text_BagIsFull - goto EventScript_1C544F - -EventScript_1C544F:: @ 81C544F - setvar VAR_0x8004, 9 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_1C547D - case 1, EventScript_1C548A - case 2, EventScript_1C5492 -EventScript_1C547D: - msgbox Text_17CB1A - goto EventScript_1C5492 - -EventScript_1C548A:: @ 81C548A - msgbox Text_17CBC0 -EventScript_1C5492: - msgbox Text_17CBF5 - release - return - -EventScript_1C549C:: @ 81C549C - lockall - setvar VAR_0x8004, 13 - special sub_815D9E8 - msgbox Text_17CC56 - releaseall - end - -SevenIsland_TrainerTower_2F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_4F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_6F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_8F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_5F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_7F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_3F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_1F_EventScript_1C54AF:: @ 81C54AF - goto EventScript_1C508F - -SevenIsland_TrainerTower_2F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_4F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_6F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_8F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 - setvar VAR_0x4003, 0 - setvar VAR_0x8004, 16 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if ne, EventScript_1C5528 - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 2, Movement_ExclamationMark - waitmovement 0 - applymovement 2, Movement_Delay48 - goto EventScript_1C551B - -SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_4F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_6F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_8F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA - setvar VAR_0x4003, 1 - setvar VAR_0x8004, 16 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if ne, EventScript_1C5528 - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 5, Movement_ExclamationMark - waitmovement 0 - applymovement 5, Movement_Delay48 -EventScript_1C551B: - waitmovement 0 - setvar VAR_0x400F, 1 - goto EventScript_1C508F - -EventScript_1C5528:: @ 81C5528 - lockall - playse SE_PINPON - msgbox Text_17CC73 - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1C5544 - waitmovement 0 - releaseall - end - -Movement_1C5541: - walk_left -Movement_1C5542:: @ 81C5542 - walk_left - walk_left -Movement_1C5544: - walk_left - step_end - -Movement_1C5546:: @ 81C5546 - walk_up - walk_up - step_end - -Movement_1C5549:: @ 81C5549 - walk_down - walk_down - step_end - -Movement_1C554C:: @ 81C554C - walk_right -Movement_1C554D: - walk_up - face_down - step_end - -Movement_1C5550:: @ 81C5550 - face_down - step_end - + .include "data/scripts/trainer_tower.inc" .include "data/scripts/test.inc" .include "data/text/save.inc" .include "data/text/new_game_intro.inc" diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index acd6e8c77..b954f7ef7 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -40,7 +40,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 setvar VAR_0x8004, 1 special Special_AnimatePcTurnOn playse SE_PC_ON - msgbox gUnknown_81A5420 + msgbox Text_PlayerBootedUpPC special BedroomPC waitstate special sub_812B35C diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc new file mode 100644 index 000000000..efa2f0b98 --- /dev/null +++ b/data/scripts/pokedex_rating.inc @@ -0,0 +1,89 @@ +EventScript_1A737B:: @ 81A737B + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + special sub_8112364 + checkflag FLAG_OAK_SAW_DEX_COMPLETION + call_if TRUE, EventScript_1A73A4 + checkflag FLAG_OAK_SAW_DEX_COMPLETION + call_if FALSE, EventScript_1A73AD + call EventScript_1A73E0 + return + +EventScript_1A73A4:: @ 81A73A4 + msgbox Text_1A72F2 + return + +EventScript_1A73AD:: @ 81A73AD + msgbox gUnknown_81A6C51 + return + +EventScript_1A73B6:: @ 81A73B6 + copyvar VAR_0x8004, VAR_0x8009 + special Special_GetProfOaksRatingMessage + waitmessage + compare VAR_RESULT, 0 + call_if eq, EventScript_1A73D8 + compare VAR_RESULT, 1 + call_if eq, EventScript_1A73DC + waitfanfare + waitbuttonpress + return + +EventScript_1A73D8:: @ 81A73D8 + playfanfare MUS_FAN2 + return + +EventScript_1A73DC:: @ 81A73DC + playfanfare MUS_FANFA5 + return + +EventScript_1A73E0:: @ 81A73E0 + setvar VAR_0x8004, 31 + special HelpSystem_BackupSomeVariable + special Special_SetSomeVariable + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, Special_GetPokedexCount + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + copyvar VAR_0x800A, VAR_RESULT + getnumberstring 0, VAR_0x8008 + getnumberstring 1, VAR_0x8009 + msgbox Text_1A6CA3 + checkflag FLAG_OAKS_RATING_IS_VIA_PC + call_if FALSE, EventScript_1A746D + call EventScript_1A73B6 + compare VAR_0x800A, 0 + goto_if eq, EventScript_1A748F + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, Special_GetPokedexCount + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + getnumberstring 0, VAR_0x8008 + getnumberstring 1, VAR_0x8009 + msgbox Text_1A71AA + specialvar VAR_RESULT, HasAllMons + compare VAR_RESULT, 0 + goto_if eq, EventScript_1A7470 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A747E + end + +EventScript_1A746D:: @ 81A746D + textcolor 0 + return + +EventScript_1A7470:: @ 81A7470 + msgbox Text_1A71EE + goto EventScript_1A748F + end + +EventScript_1A747E:: @ 81A747E + setflag FLAG_OAK_SAW_DEX_COMPLETION + msgbox Text_1A722F + goto EventScript_1A748F + end + +EventScript_1A748F:: @ 81A748F + special HelpSystem_RestoreSomeVariable + return diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc new file mode 100644 index 000000000..fe2baa17a --- /dev/null +++ b/data/scripts/route23.inc @@ -0,0 +1,229 @@ +EventScript_1A77C9:: @ 81A77C9 + msgbox Text_OnlySkilledTrainersAllowedThrough + playse SE_BOO + msgbox Text_CantLetYouPass + release + end + +EventScript_1A77DE:: @ 81A77DE + message Text_OnlyPassWithBadgeDontHaveYet + waitmessage + playse SE_BOO + waitbuttonpress + closemessage + waitse + release + end + +EventScript_1A77EC:: @ 81A77EC + message Text_OhThatsBadgeGoRightAhead + waitmessage + playfanfare MUS_FANFA1 + waitfanfare + waitbuttonpress + release + end + +EventScript_1A77F9:: @ 81A77F9 + msgbox Text_OnlyPassWithBadgeOhGoAhead + release + end + +EventScript_1A7803:: @ 81A7803 + compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + goto_if ge, EventScript_1A77EC + switch VAR_0x4001 + case 1, EventScript_1A78D5 + case 2, EventScript_1A78E4 + case 3, EventScript_1A78F3 + case 4, EventScript_1A7902 + case 5, EventScript_1A7911 + case 6, EventScript_1A7920 + case 7, EventScript_1A792F + case 8, EventScript_1A793E + end + +EventScript_1A786C:: @ 81A786C + compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + goto_if ge, EventScript_1A77F9 + switch VAR_0x4001 + case 1, EventScript_1A78D5 + case 2, EventScript_1A78E4 + case 3, EventScript_1A78F3 + case 4, EventScript_1A7902 + case 5, EventScript_1A7911 + case 6, EventScript_1A7920 + case 7, EventScript_1A792F + case 8, EventScript_1A793E + end + +EventScript_1A78D5:: @ 81A78D5 + checkflag FLAG_BADGE01_GET + goto_if TRUE, EventScript_1A794D + goto EventScript_1A77C9 + end + +EventScript_1A78E4:: @ 81A78E4 + checkflag FLAG_BADGE02_GET + goto_if TRUE, EventScript_1A795F + goto EventScript_1A77DE + end + +EventScript_1A78F3:: @ 81A78F3 + checkflag FLAG_BADGE03_GET + goto_if TRUE, EventScript_1A795F + goto EventScript_1A77DE + end + +EventScript_1A7902:: @ 81A7902 + checkflag FLAG_BADGE04_GET + goto_if TRUE, EventScript_1A795F + goto EventScript_1A77DE + end + +EventScript_1A7911:: @ 81A7911 + checkflag FLAG_BADGE05_GET + goto_if TRUE, EventScript_1A795F + goto EventScript_1A77DE + end + +EventScript_1A7920:: @ 81A7920 + checkflag FLAG_BADGE06_GET + goto_if TRUE, EventScript_1A795F + goto EventScript_1A77DE + end + +EventScript_1A792F:: @ 81A792F + checkflag FLAG_BADGE07_GET + goto_if TRUE, EventScript_1A795F + goto EventScript_1A77DE + end + +EventScript_1A793E:: @ 81A793E + checkflag FLAG_BADGE08_GET + goto_if TRUE, EventScript_1A795F + goto EventScript_1A77DE + end + +EventScript_1A794D:: @ 81A794D + message Text_OhThatsBadgeGoRightAhead + waitmessage + playfanfare MUS_FANFA1 + waitfanfare + waitbuttonpress + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + release + end + +EventScript_1A795F:: @ 81A795F + msgbox Text_OnlyPassWithBadgeOhGoAhead + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + release + end + +EventScript_1A796E:: @ 81A796E + textcolor 0 + applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft + waitmovement 0 + switch VAR_0x4001 + case 1, EventScript_1A79D8 + case 2, EventScript_1A79E7 + case 3, EventScript_1A79F6 + case 4, EventScript_1A7A05 + case 5, EventScript_1A7A14 + case 6, EventScript_1A7A23 + case 7, EventScript_1A7A32 + case 8, EventScript_1A7A41 + end + +EventScript_1A79D8:: @ 81A79D8 + checkflag FLAG_BADGE01_GET + goto_if TRUE, EventScript_1A7A96 + goto EventScript_1A7A50 + end + +EventScript_1A79E7:: @ 81A79E7 + checkflag FLAG_BADGE02_GET + goto_if TRUE, EventScript_1A7AA8 + goto EventScript_1A7A77 + end + +EventScript_1A79F6:: @ 81A79F6 + checkflag FLAG_BADGE03_GET + goto_if TRUE, EventScript_1A7AA8 + goto EventScript_1A7A77 + end + +EventScript_1A7A05:: @ 81A7A05 + checkflag FLAG_BADGE04_GET + goto_if TRUE, EventScript_1A7AA8 + goto EventScript_1A7A77 + end + +EventScript_1A7A14:: @ 81A7A14 + checkflag FLAG_BADGE05_GET + goto_if TRUE, EventScript_1A7AA8 + goto EventScript_1A7A77 + end + +EventScript_1A7A23:: @ 81A7A23 + checkflag FLAG_BADGE06_GET + goto_if TRUE, EventScript_1A7AA8 + goto EventScript_1A7A77 + end + +EventScript_1A7A32:: @ 81A7A32 + checkflag FLAG_BADGE07_GET + goto_if TRUE, EventScript_1A7AA8 + goto EventScript_1A7A77 + end + +EventScript_1A7A41:: @ 81A7A41 + checkflag FLAG_BADGE08_GET + goto_if TRUE, EventScript_1A7AA8 + goto EventScript_1A7A77 + end + +EventScript_1A7A50:: @ 81A7A50 + msgbox Text_OnlySkilledTrainersAllowedThrough + playse SE_BOO + msgbox Text_CantLetYouPass + closemessage + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 + applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown + waitmovement 0 + releaseall + end + +EventScript_1A7A77:: @ 81A7A77 + message Text_OnlyPassWithBadgeDontHaveYet + waitmessage + playse SE_BOO + waitbuttonpress + closemessage + waitse + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 + applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown + waitmovement 0 + releaseall + end + +EventScript_1A7A96:: @ 81A7A96 + message Text_OhThatsBadgeGoRightAhead + waitmessage + playfanfare MUS_FANFA1 + waitfanfare + waitbuttonpress + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + releaseall + end + +EventScript_1A7AA8:: @ 81A7AA8 + msgbox Text_OnlyPassWithBadgeOhGoAhead + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + releaseall + end + +Movement_1A7AB7:: @ 81A7AB7 + walk_down + step_end diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc new file mode 100644 index 000000000..0fbfe3f93 --- /dev/null +++ b/data/scripts/seagallop.inc @@ -0,0 +1,207 @@ +EventScript_1A8EC5:: @ 81A8EC5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + goto_if ge, EventScript_1A911E + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + goto_if ge, EventScript_1A8F12 + multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE + switch VAR_RESULT + case 0, EventScript_1A8FF9 + case 1, EventScript_1A9004 + case 2, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 + end + +EventScript_1A8F12:: @ 81A8F12 + multichoice 19, 5, MULTICHOICE_SEAGALLOP_V23, FALSE + switch VAR_RESULT + case 0, EventScript_1A8FE3 + case 1, EventScript_1A8FF9 + case 2, EventScript_1A9004 + case 3, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 + end + +EventScript_1A8F54:: @ 81A8F54 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + goto_if ge, EventScript_1A911E + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + goto_if ge, EventScript_1A8FA1 + multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE + switch VAR_RESULT + case 0, EventScript_1A8FEE + case 1, EventScript_1A9004 + case 2, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 + end + +EventScript_1A8FA1:: @ 81A8FA1 + multichoice 19, 5, MULTICHOICE_SEAGALLOP_V13, FALSE + switch VAR_RESULT + case 0, EventScript_1A8FE3 + case 1, EventScript_1A8FEE + case 2, EventScript_1A9004 + case 3, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 + end + +EventScript_1A8FE3:: @ 81A8FE3 + setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY + goto EventScript_1A909E + end + +EventScript_1A8FEE:: @ 81A8FEE + setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND + goto EventScript_1A909E + end + +EventScript_1A8FF9:: @ 81A8FF9 + setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND + goto EventScript_1A909E + end + +EventScript_1A9004:: @ 81A9004 + setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND + goto EventScript_1A909E + end + +EventScript_1A900F:: @ 81A900F + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + goto_if ge, EventScript_1A911E + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + goto_if ge, EventScript_1A905C + multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE + switch VAR_RESULT + case 0, EventScript_1A8FEE + case 1, EventScript_1A8FF9 + case 2, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 + end + +EventScript_1A905C:: @ 81A905C + multichoice 19, 5, MULTICHOICE_SEAGALLOP_V12, FALSE + switch VAR_RESULT + case 0, EventScript_1A8FE3 + case 1, EventScript_1A8FEE + case 2, EventScript_1A8FF9 + case 3, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 + end + +EventScript_1A909E:: @ 81A909E + specialvar VAR_RESULT, sub_8147500 + getnumberstring 0, VAR_RESULT + compare VAR_0x8004, SEAGALLOP_VERMILION_CITY + goto_if eq, EventScript_1A90BE + compare VAR_0x8004, SEAGALLOP_VERMILION_CITY + goto_if ne, EventScript_1A90CC + end + +EventScript_1A90BE:: @ 81A90BE + msgbox Text_17FB67 + goto EventScript_1A90DA + end + +EventScript_1A90CC:: @ 81A90CC + msgbox Text_1A641B + goto EventScript_1A90DA + end + +EventScript_1A90DA:: @ 81A90DA + closemessage + delay 20 + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if eq, EventScript_1A7AE0 + special sub_8112364 + fadescreen 1 + special ScrSpecial_SeagallopFerry + waitstate + end + +EventScript_1A90F6:: @ 81A90F6 + specialvar VAR_RESULT, sub_8147594 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1A9108 + release + end + +EventScript_1A9108:: @ 81A9108 + closemessage + applymovement 6, Movement_FaceOriginalDirection + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A911C + waitmovement 0 + releaseall + end + +Movement_1A911C:: @ 81A911C + walk_up + step_end + +EventScript_1A911E:: @ 81A911E + setvar VAR_0x8005, 0 + special Special_DrawSeagallopDestinationMenu + waitstate + specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination + switch VAR_0x8006 + case SEAGALLOP_VERMILION_CITY, EventScript_1A91D5 + case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0 + case SEAGALLOP_TWO_ISLAND, EventScript_1A91EB + case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6 + case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 + case SEAGALLOP_MORE, EventScript_1A917F + case SCR_MENU_CANCEL, EventScript_1A90F6 + end + +EventScript_1A917F:: @ 81A917F + setvar VAR_0x8005, 1 + special Special_DrawSeagallopDestinationMenu + waitstate + specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination + switch VAR_0x8006 + case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 + case SEAGALLOP_FIVE_ISLAND, EventScript_1A920C + case SEAGALLOP_SIX_ISLAND, EventScript_1A9217 + case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222 + case SEAGALLOP_MORE, EventScript_1A911E + case SCR_MENU_CANCEL, EventScript_1A90F6 + end + +EventScript_1A91D5:: @ 81A91D5 + setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY + goto EventScript_1A909E + end + +EventScript_1A91E0:: @ 81A91E0 + setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND + goto EventScript_1A909E + end + +EventScript_1A91EB:: @ 81A91EB + setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND + goto EventScript_1A909E + end + +EventScript_1A91F6:: @ 81A91F6 + setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND + goto EventScript_1A909E + end + +EventScript_1A9201:: @ 81A9201 + setvar VAR_0x8006, SEAGALLOP_FOUR_ISLAND + goto EventScript_1A909E + end + +EventScript_1A920C:: @ 81A920C + setvar VAR_0x8006, SEAGALLOP_FIVE_ISLAND + goto EventScript_1A909E + end + +EventScript_1A9217:: @ 81A9217 + setvar VAR_0x8006, SEAGALLOP_SIX_ISLAND + goto EventScript_1A909E + end + +EventScript_1A9222:: @ 81A9222 + setvar VAR_0x8006, SEAGALLOP_SEVEN_ISLAND + goto EventScript_1A909E + end diff --git a/data/scripts/static_pokemon.inc b/data/scripts/static_pokemon.inc new file mode 100644 index 000000000..ef57cf36d --- /dev/null +++ b/data/scripts/static_pokemon.inc @@ -0,0 +1,23 @@ +EventScript_1A922D:: @ 81A922D + fadescreen 1 + removeobject VAR_LAST_TALKED + fadescreen 0 + release + end + +EventScript_1A9236:: @ 81A9236 + fadescreen 1 + removeobject VAR_LAST_TALKED + fadescreen 0 + getspeciesname 0, VAR_0x8004 + msgbox Text_1A63C4 + release + end + +EventScript_1A924B:: @ 81A924B + message Text_1853E8 + waitmessage + playfanfare MUS_POKEFUE + waitfanfare + msgbox Text_185354 + return diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc new file mode 100644 index 000000000..7f7bacd3a --- /dev/null +++ b/data/scripts/std_msgbox.inc @@ -0,0 +1,63 @@ +Std_MsgboxNPC:: @ 81A4E3F + lock + faceplayer + message 0x0 + waitmessage + waitbuttonpress + release + return + +Std_MsgboxSign:: @ 81A4E4A + lockall + message 0x0 + waitmessage + waitbuttonpress + releaseall + return + +Std_MsgboxDefault:: @ 81A4E54 + message 0x0 + waitmessage + waitbuttonpress + return + +Std_MsgboxYesNo:: @ 81A4E5C + message 0x0 + waitmessage + yesnobox 20, 8 + return + +gStdScript_ItemMessageAndFanfare:: @ 81A4E66 + textcolor 3 + compare VAR_0x8002, MUS_FANFA1 + call_if eq, EventScript_1A4EA2 + compare VAR_0x8002, MUS_FAN5 + call_if eq, EventScript_1A4EA6 + message 0x0 + waitmessage + waitfanfare + compare VAR_0x8002, MUS_FANFA1 + call_if eq, EventScript_1A4EAA + putitemaway VAR_0x8000, VAR_0x8001 + call EventScript_1A6675 + return + +EventScript_1A4EA2:: @ 81A4EA2 + playfanfare MUS_FANFA1 + return + +EventScript_1A4EA6:: @ 81A4EA6 + playfanfare MUS_FAN5 + return + +EventScript_1A4EAA:: @ 81A4EAA + delay 50 + return + +EventScript_UnusedReturn:: @ 81A4EAE + return + +EventScript_1A4EAF:: @ 81A4EAF + special Field_AskSaveTheGame + waitstate + return diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc new file mode 100644 index 000000000..c3b3cdc2e --- /dev/null +++ b/data/scripts/trainer_tower.inc @@ -0,0 +1,450 @@ +SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54 +SevenIsland_TrainerTower_2F_MapScript1_1C4F54:: @ 81C4F54 +SevenIsland_TrainerTower_3F_MapScript1_1C4F54:: @ 81C4F54 +SevenIsland_TrainerTower_4F_MapScript1_1C4F54:: @ 81C4F54 +SevenIsland_TrainerTower_5F_MapScript1_1C4F54:: @ 81C4F54 +SevenIsland_TrainerTower_6F_MapScript1_1C4F54:: @ 81C4F54 +SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54 +SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54 +SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54 +SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54 + setvar VAR_0x4002, 0 + setvar VAR_0x8004, 10 + special sub_815D9E8 + end + +SevenIsland_TrainerTower_1F_MapScript2_1C4F62:: @ 81C4F62 +SevenIsland_TrainerTower_2F_MapScript2_1C4F62:: @ 81C4F62 +SevenIsland_TrainerTower_3F_MapScript2_1C4F62:: @ 81C4F62 +SevenIsland_TrainerTower_4F_MapScript2_1C4F62:: @ 81C4F62 +SevenIsland_TrainerTower_5F_MapScript2_1C4F62:: @ 81C4F62 +SevenIsland_TrainerTower_6F_MapScript2_1C4F62:: @ 81C4F62 +SevenIsland_TrainerTower_7F_MapScript2_1C4F62:: @ 81C4F62 +SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62 + setvar VAR_0x8004, 0 + special sub_815D9E8 + switch VAR_RESULT + case 0, EventScript_1C4FA7 + case 1, EventScript_1C4FC5 + case 2, EventScript_1C5019 + setflag FLAG_TEMP_2 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_4 + setflag FLAG_TEMP_5 + setvar VAR_0x400E, 1 + setvar VAR_0x400F, 1 + end + +EventScript_1C4FA7:: @ 81C4FA7 + setflag FLAG_TEMP_2 + setflag FLAG_TEMP_4 + setflag FLAG_TEMP_5 + setvar VAR_0x400F, 1 + setobjectxyperm 3, 15, 13 + setobjectmovementtype 3, 9 + goto EventScript_1C5042 + +EventScript_1C4FC5:: @ 81C4FC5 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_4 + setvar VAR_0x400E, 1 + setvar VAR_0x8004, 5 + special sub_815D9E8 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1C4FFE + setobjectxyperm 2, 10, 12 + setobjectmovementtype 2, 9 + setobjectxyperm 5, 10, 13 + setobjectmovementtype 5, 9 + goto EventScript_1C5042 + +EventScript_1C4FFE:: @ 81C4FFE + setobjectxyperm 2, 10, 12 + setobjectmovementtype 2, 8 + setobjectxyperm 5, 11, 12 + setobjectmovementtype 5, 8 + goto EventScript_1C5042 + +EventScript_1C5019:: @ 81C5019 + setflag FLAG_TEMP_5 + setvar VAR_0x400F, 1 + setobjectxyperm 2, 10, 10 + setobjectmovementtype 2, 8 + setobjectxyperm 3, 14, 13 + setobjectmovementtype 3, 9 + setobjectxyperm 4, 10, 16 + setobjectmovementtype 4, 7 +EventScript_1C5042: + setflag FLAG_TEMP_6 + end + +SevenIsland_TrainerTower_1F_MapScript3_1C5046:: @ 81C5046 +SevenIsland_TrainerTower_2F_MapScript3_1C5046:: @ 81C5046 +SevenIsland_TrainerTower_3F_MapScript3_1C5046:: @ 81C5046 +SevenIsland_TrainerTower_4F_MapScript3_1C5046:: @ 81C5046 +SevenIsland_TrainerTower_5F_MapScript3_1C5046:: @ 81C5046 +SevenIsland_TrainerTower_6F_MapScript3_1C5046:: @ 81C5046 +SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046 +SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046 +SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046 +SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046 + map_script_2 VAR_0x4002, 0, EventScript_1C5050 + .2byte 0 + +EventScript_1C5050:: @ 81C5050 + setvar VAR_0x4002, 1 + setvar VAR_0x8004, 5 + special sub_815D9E8 + compare VAR_RESULT, 0 + goto_if eq, EventScript_1C5072 + setvar VAR_0x400E, 1 + setvar VAR_0x400F, 1 +EventScript_1C5072: + setvar VAR_0x8004, 18 + special sub_815D9E8 + compare VAR_RESULT, 1 + goto_if eq, EventScript_1C5086 + end + +EventScript_1C5086:: @ 81C5086 + warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 + waitstate +EventScript_1C508F:: + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_815D9E8 + switch VAR_RESULT + case 0, EventScript_1C50C2 + case 1, EventScript_1C510D + case 2, EventScript_1C515C +EventScript_1C50C2: + setvar VAR_0x8004, 19 + special sub_815D9E8 + applymovement 3, Movement_ExclamationMark + waitmovement 0 + applymovement 3, Movement_Delay48 + waitmovement 0 + setvar VAR_0x400E, 1 + applymovement 3, Movement_1C5541 + waitmovement 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 + special sub_815D9E8 + msgbox gStringVar4 + closemessage + goto EventScript_1C5219 + +EventScript_1C510D:: @ 81C510D + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_0x4003 + special sub_815D9E8 + msgbox gStringVar4 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + addvar VAR_0x4003, 1 + compare VAR_0x4003, 1 + goto_if eq, EventScript_1C5146 + setvar VAR_0x4003, 0 +EventScript_1C5146: + copyvar VAR_0x8006, VAR_0x4003 + special sub_815D9E8 + msgbox gStringVar4 + closemessage + goto EventScript_1C5219 + +EventScript_1C515C:: @ 81C515C + switch VAR_0x4001 + case 0, EventScript_1C5182 + case 1, EventScript_1C51AD + case 2, EventScript_1C51D8 +EventScript_1C5182: + setvar VAR_0x8004, 19 + special sub_815D9E8 + applymovement 4, Movement_ExclamationMark + waitmovement 0 + applymovement 4, Movement_Delay48 + waitmovement 0 + applymovement 4, Movement_1C5546 + waitmovement 0 + goto EventScript_1C51FE + +EventScript_1C51AD:: @ 81C51AD + setvar VAR_0x8004, 19 + special sub_815D9E8 + applymovement 2, Movement_ExclamationMark + waitmovement 0 + applymovement 2, Movement_Delay48 + waitmovement 0 + applymovement 2, Movement_1C5549 + waitmovement 0 + goto EventScript_1C51FE + +EventScript_1C51D8:: @ 81C51D8 + setvar VAR_0x8004, 19 + special sub_815D9E8 + applymovement 3, Movement_ExclamationMark + waitmovement 0 + applymovement 3, Movement_Delay48 + waitmovement 0 + applymovement 3, Movement_1C5542 + waitmovement 0 +EventScript_1C51FE: + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_0x4001 + special sub_815D9E8 + msgbox gStringVar4 + closemessage +EventScript_1C5219: + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + special sub_815D9E8 + waitstate + switch VAR_RESULT + case 1, EventScript_1C524D + case 2, EventScript_1C52E0 + case 3, EventScript_1C52E0 +EventScript_1C524D: + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_815D9E8 + switch VAR_RESULT + case 0, EventScript_1C52D7 + case 1, EventScript_1C52BA + case 2, EventScript_1C5280 +EventScript_1C5280: + switch VAR_0x4001 + case 0, EventScript_1C52A6 + case 1, EventScript_1C52B0 + case 2, EventScript_1C52D0 +EventScript_1C52A6: + addvar VAR_0x4001, 1 + goto EventScript_1C515C + +EventScript_1C52B0:: @ 81C52B0 + addvar VAR_0x4001, 1 + goto EventScript_1C515C + +EventScript_1C52BA:: @ 81C52BA + applymovement 5, Movement_1C554C + waitmovement 0 + applymovement 2, Movement_1C5550 + goto EventScript_1C52D7 + +EventScript_1C52D0:: @ 81C52D0 + applymovement 3, Movement_1C554D +EventScript_1C52D7: + setvar VAR_0x8004, 4 + special sub_815D9E8 + end + +EventScript_1C52E0:: @ 81C52E0 + special sp000_heal_pokemon + setvar VAR_0x8004, 11 + special sub_815D9E8 + warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 + waitstate + +EventScript_1C52F4:: @ 81C52F4 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_815D9E8 + switch VAR_RESULT + case 0, EventScript_1C5327 + case 1, EventScript_1C5327 + case 2, EventScript_1C5331 +EventScript_1C5327: + setvar VAR_0x8006, 0 + goto EventScript_1C5391 + +EventScript_1C5331:: @ 81C5331 + setvar VAR_0x8006, 1 + goto EventScript_1C5391 + +EventScript_1C533B:: @ 81C533B + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special sub_815D9E8 + switch VAR_RESULT + case 0, EventScript_1C536E + case 1, EventScript_1C536E + case 2, EventScript_1C5378 +EventScript_1C536E: + setvar VAR_0x8006, 0 + goto EventScript_1C5391 + +EventScript_1C5378:: @ 81C5378 + setvar VAR_0x8006, 2 + goto EventScript_1C5391 + +EventScript_1C5382:: @ 81C5382 + setvar VAR_0x8006, 0 + goto EventScript_1C5391 + +EventScript_1C538C:: @ 81C538C + setvar VAR_0x8006, 1 +EventScript_1C5391: + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special sub_815D9E8 + lock + faceplayer + msgbox gStringVar4 + release + return + +EventScript_1C53AA:: @ 81C53AA + lock + faceplayer + setvar VAR_0x8004, 7 + special sub_815D9E8 + switch VAR_RESULT + case 0, EventScript_1C53DA + case 1, EventScript_1C53E2 + case 2, EventScript_1C5492 +EventScript_1C53DA: + msgbox Text_17CA5A +EventScript_1C53E2: + setvar VAR_0x8004, 8 + special sub_815D9E8 + switch VAR_RESULT + case 0, EventScript_1C5410 + case 1, EventScript_1C543A + case 2, EventScript_1C544F +EventScript_1C5410: + msgbox Text_17CB09 + textcolor 3 + playfanfare MUS_FANFA1 + message Text_ObtainedTheX + waitfanfare + waitmessage + getstdstring 2, 24 + msgbox Text_PutItemAway + call EventScript_1A6675 + goto EventScript_1C544F + +EventScript_1C543A:: @ 81C543A + msgbox Text_17CB09 + msgbox Text_BagIsFull + goto EventScript_1C544F + +EventScript_1C544F:: @ 81C544F + setvar VAR_0x8004, 9 + special sub_815D9E8 + switch VAR_RESULT + case 0, EventScript_1C547D + case 1, EventScript_1C548A + case 2, EventScript_1C5492 +EventScript_1C547D: + msgbox Text_17CB1A + goto EventScript_1C5492 + +EventScript_1C548A:: @ 81C548A + msgbox Text_17CBC0 +EventScript_1C5492: + msgbox Text_17CBF5 + release + return + +EventScript_1C549C:: @ 81C549C + lockall + setvar VAR_0x8004, 13 + special sub_815D9E8 + msgbox Text_17CC56 + releaseall + end + +SevenIsland_TrainerTower_2F_EventScript_1C54AF:: @ 81C54AF +SevenIsland_TrainerTower_4F_EventScript_1C54AF:: @ 81C54AF +SevenIsland_TrainerTower_6F_EventScript_1C54AF:: @ 81C54AF +SevenIsland_TrainerTower_8F_EventScript_1C54AF:: @ 81C54AF +SevenIsland_TrainerTower_5F_EventScript_1C54AF:: @ 81C54AF +SevenIsland_TrainerTower_7F_EventScript_1C54AF:: @ 81C54AF +SevenIsland_TrainerTower_3F_EventScript_1C54AF:: @ 81C54AF +SevenIsland_TrainerTower_1F_EventScript_1C54AF:: @ 81C54AF + goto EventScript_1C508F + +SevenIsland_TrainerTower_2F_EventScript_1C54B4:: @ 81C54B4 +SevenIsland_TrainerTower_4F_EventScript_1C54B4:: @ 81C54B4 +SevenIsland_TrainerTower_6F_EventScript_1C54B4:: @ 81C54B4 +SevenIsland_TrainerTower_8F_EventScript_1C54B4:: @ 81C54B4 +SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4 +SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4 +SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4 +SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 + setvar VAR_0x4003, 0 + setvar VAR_0x8004, 16 + special sub_815D9E8 + compare VAR_RESULT, 0 + goto_if ne, EventScript_1C5528 + setvar VAR_0x8004, 19 + special sub_815D9E8 + applymovement 2, Movement_ExclamationMark + waitmovement 0 + applymovement 2, Movement_Delay48 + goto EventScript_1C551B + +SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA +SevenIsland_TrainerTower_4F_EventScript_1C54EA:: @ 81C54EA +SevenIsland_TrainerTower_6F_EventScript_1C54EA:: @ 81C54EA +SevenIsland_TrainerTower_8F_EventScript_1C54EA:: @ 81C54EA +SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA +SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA +SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA +SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA + setvar VAR_0x4003, 1 + setvar VAR_0x8004, 16 + special sub_815D9E8 + compare VAR_RESULT, 0 + goto_if ne, EventScript_1C5528 + setvar VAR_0x8004, 19 + special sub_815D9E8 + applymovement 5, Movement_ExclamationMark + waitmovement 0 + applymovement 5, Movement_Delay48 +EventScript_1C551B: + waitmovement 0 + setvar VAR_0x400F, 1 + goto EventScript_1C508F + +EventScript_1C5528:: @ 81C5528 + lockall + playse SE_PINPON + msgbox Text_17CC73 + closemessage + applymovement OBJ_EVENT_ID_PLAYER, Movement_1C5544 + waitmovement 0 + releaseall + end + +Movement_1C5541: + walk_left +Movement_1C5542:: @ 81C5542 + walk_left + walk_left +Movement_1C5544: + walk_left + step_end + +Movement_1C5546:: @ 81C5546 + walk_up + walk_up + step_end + +Movement_1C5549:: @ 81C5549 + walk_down + walk_down + step_end + +Movement_1C554C:: @ 81C554C + walk_right +Movement_1C554D: + walk_up + face_down + step_end + +Movement_1C5550:: @ 81C5550 + face_down + step_end diff --git a/data/text/poke_mart.inc b/data/text/poke_mart.inc new file mode 100644 index 000000000..de1a0596c --- /dev/null +++ b/data/text/poke_mart.inc @@ -0,0 +1,29 @@ +Text_MayIHelpYou:: @ 81A6211 + .string "Hi, there!\n" + .string "May I help you?$" + +Text_FillOutQuestionnaire:: @ 81A622C + .string "There is a questionnaire.\n" + .string "Would you like to fill it out?$" + +Text_1A6265:: @ 81A6265 + .string "Thank you for taking the time to\n" + .string "fill out our questionnaire.\p" + .string "Your feedback will be used for\n" + .string "future reference.$" + +Text_1A62D3:: @ 81A62D3 + .string "Oh, hello!\n" + .string "You know those words?\p" + .string "That means you must know about\n" + .string "the MYSTERY GIFT.\p" + .string "From now on, you should be\n" + .string "receiving MYSTERY GIFTS!$" + +Text_1A6359:: @ 81A6359 + .string "Once you save your game, you can\n" + .string "access the MYSTERY GIFT.$" + +Text_1A6393:: @ 81A6393 + .string "Thank you for accessing the\n" + .string "MYSTERY GIFT System.$" diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc new file mode 100644 index 000000000..461c29e26 --- /dev/null +++ b/data/text/pokedex_rating.inc @@ -0,0 +1,123 @@ +gUnknown_81A6C51:: @ 81A6C51 + .string "OAK: Good to see you!\n" + .string "How is your POKéDEX coming along?\p" + .string "Here, let me take a look.$" + +Text_1A6CA3:: @ 81A6CA3 + .string "The amount of progress you've made\n" + .string "on your POKéDEX is:\p" + .string "{STR_VAR_1} POKéMON seen and\n" + .string "{STR_VAR_2} POKéMON owned.\p" + .string "{SIZE}ÁPROF. OAK's rating:$" + +gUnknown_81A6D17:: @ 81A6D17 + .string "You still have lots to do.\p" + .string "Go into every patch of grass you\n" + .string "see and look for POKéMON!$" + +gUnknown_81A6D6D:: @ 81A6D6D + .string "It looks as if you're getting on\n" + .string "the right track!\p" + .string "I've given one of my AIDES a FLASH\n" + .string "HM. Make sure you go get it!$" + +gUnknown_81A6DDF:: @ 81A6DDF + .string "Your POKéDEX could use a bit more\n" + .string "volume still!\p" + .string "Try to catch other species of\n" + .string "POKéMON!$" + +gUnknown_81A6E36:: @ 81A6E36 + .string "Good, it's apparent that you're\n" + .string "trying hard!\p" + .string "I've given one of my AIDES an\n" + .string "ITEMFINDER. Be sure to collect it!$" + +gUnknown_81A6EA4:: @ 81A6EA4 + .string "Your POKéDEX is coming along quite\n" + .string "well!\p" + .string "I've given one of my AIDES an\n" + .string "AMULET COIN. Be sure to get it!$" + +gUnknown_81A6F0B:: @ 81A6F0B + .string "Ah, you've finally topped 50\n" + .string "species!\p" + .string "I've given one of my AIDES an EXP.\n" + .string "SHARE. Be sure to go get it!$" + +gUnknown_81A6F71:: @ 81A6F71 + .string "Hoho! This is turning into quite the\n" + .string "respectable POKéDEX!$" + +gUnknown_81A6FAB:: @ 81A6FAB + .string "Very good!\p" + .string "I think you'll collect even more\n" + .string "POKéMON by going fishing!$" + +gUnknown_81A6FF1:: @ 81A6FF1 + .string "Wonderful! Let me guess… You\n" + .string "like to collect things, don't you?$" + +gUnknown_81A7031:: @ 81A7031 + .string "I'm impressed!\n" + .string "It must have been difficult to do!$" + +gUnknown_81A7063:: @ 81A7063 + .string "You've finally hit 100 species!\n" + .string "I can't believe how good you are!$" + +gUnknown_81A70A5:: @ 81A70A5 + .string "You even have the evolved forms\n" + .string "of POKéMON! Super!$" + +gUnknown_81A70D8:: @ 81A70D8 + .string "Excellent! Trade with friends to\n" + .string "get some more!$" + +gUnknown_81A7108:: @ 81A7108 + .string "Outstanding!\n" + .string "You've become a real pro at this!$" + +gUnknown_81A7137:: @ 81A7137 + .string "I have nothing left to say!\n" + .string "You're the POKéMON PROFESSOR now!$" + +gUnknown_81A7175:: @ 81A7175 + .string "Your POKéDEX is entirely complete!\n" + .string "Congratulations!!$" + +Text_1A71AA:: @ 81A71AA + .string "And your NATIONAL POKéDEX is:\p" + .string "{STR_VAR_1} POKéMON seen and\n" + .string "{STR_VAR_2} POKéMON owned.$" + +Text_1A71EE:: @ 81A71EE + .string "I'll be looking forward to seeing\n" + .string "you fill the NATIONAL POKéDEX!$" + +Text_1A722F:: @ 81A722F + .string "Finally…\p" + .string "You've finally completed the\n" + .string "POKéDEX!\p" + .string "It's magnificent!\n" + .string "Truly, this is a fantastic feat!$" + +Text_1A7291:: @ 81A7291 + .string "Wroooooooaaaaaarrrr!$" + +Text_1A72A6:: @ 81A72A6 + .string "はあ はあ‥$" + +gUnknown_81A72AD:: @ 81A72AD + .string "Thank you, {PLAYER}!\n" + .string "Sincerely, thank you!\l" + .string "You've made my dream a reality!$" + +Text_1A72F2:: @ 81A72F2 + .string "OAK: Ah, welcome!\p" + .string "Tell me, how is your POKéDEX\n" + .string "coming along?\p" + .string "Wahaha!\p" + .string "Actually, I know how it is, but I\n" + .string "love seeing it anyway!\p" + .string "Let's see…$" diff --git a/data/text/route23.inc b/data/text/route23.inc new file mode 100644 index 000000000..9fe5cd426 --- /dev/null +++ b/data/text/route23.inc @@ -0,0 +1,28 @@ +Text_OnlySkilledTrainersAllowedThrough:: @ 81A572A + .string "Only truly skilled TRAINERS are\n" + .string "allowed through.\p" + .string "You don't have the {STR_VAR_1}\n" + .string "yet!$" + +Text_CantLetYouPass:: @ 81A5776 + .string "Rules are rules.\n" + .string "I can't let you pass.$" + +Text_OhThatsBadgeGoRightAhead:: @ 81A579D + .string "Oh! That is the {STR_VAR_1}!\n" + .string "Go right ahead.$" + +Text_OnlyPassWithBadgeDontHaveYet:: @ 81A57C1 + .string "You can pass here only if you have\n" + .string "the {STR_VAR_1}.\p" + .string "You don't have the {STR_VAR_1}\n" + .string "yet.\p" + .string "You have to have it to get to\n" + .string "the POKéMON LEAGUE.$" + +Text_OnlyPassWithBadgeOhGoAhead:: @ 81A5839 + .string "You can pass here only if you have\n" + .string "the {STR_VAR_1}.\p" + .string "Oh! That is the {STR_VAR_1}!{PAUSE_MUSIC}{PLAY_BGM}{MUS_FANFA1}{PAUSE 0x60}{RESUME_MUSIC}\p" + .string "Okay, then.\n" + .string "Please, go right ahead.$" From 94fbc3ac489e529176533a1fad7deac7e1014b9d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 9 Jan 2020 14:46:14 -0500 Subject: [PATCH 10/20] Sync temp vars --- data/event_scripts.s | 18 +-- .../scripts.inc | 2 +- .../scripts.inc | 34 ++--- data/maps/CeladonCity_GameCorner/scripts.inc | 20 +-- .../scripts.inc | 126 +++++++++--------- data/maps/CeruleanCity/scripts.inc | 16 +-- data/maps/CinnabarIsland/map.json | 2 +- data/maps/CinnabarIsland/scripts.inc | 2 +- data/maps/CinnabarIsland_Gym/scripts.inc | 48 +++---- .../scripts.inc | 6 +- .../FourIsland_IcefallCave_1F/scripts.inc | 2 +- .../FuchsiaCity_SafariZone_Entrance/map.json | 6 +- .../scripts.inc | 12 +- data/maps/NavelRock_Summit/map.json | 2 +- data/maps/NavelRock_Summit/scripts.inc | 8 +- .../OneIsland_KindleRoad_EmberSpa/map.json | 2 +- .../OneIsland_KindleRoad_EmberSpa/scripts.inc | 2 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 16 +-- data/maps/PalletTown/map.json | 2 +- data/maps/PalletTown/scripts.inc | 18 +-- data/maps/PalletTown_GarysHouse/scripts.inc | 4 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 38 +++--- data/maps/PewterCity/scripts.inc | 44 +++--- data/maps/PewterCity_Museum_1F/scripts.inc | 12 +- .../PokemonLeague_AgathasRoom/scripts.inc | 2 +- .../maps/PokemonLeague_BrunosRoom/scripts.inc | 2 +- .../PokemonLeague_ChampionsRoom/scripts.inc | 8 +- .../maps/PokemonLeague_HallOfFame/scripts.inc | 6 +- .../maps/PokemonLeague_LancesRoom/scripts.inc | 2 +- .../PokemonLeague_LoreleisRoom/scripts.inc | 2 +- data/maps/PokemonTower_2F/scripts.inc | 12 +- data/maps/PokemonTower_5F/map.json | 34 ++--- data/maps/PokemonTower_5F/scripts.inc | 4 +- data/maps/RocketHideout_B4F/scripts.inc | 18 +-- data/maps/Route16_NorthEntrance_1F/map.json | 10 +- .../maps/Route16_NorthEntrance_1F/scripts.inc | 2 +- data/maps/Route18_EastEntrance_1F/map.json | 10 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 2 +- data/maps/Route22/scripts.inc | 30 ++--- data/maps/Route22_NorthEntrance/scripts.inc | 4 +- data/maps/Route23/scripts.inc | 28 ++-- data/maps/Route24/scripts.inc | 10 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route5_SouthEntrance/scripts.inc | 12 +- data/maps/Route6_NorthEntrance/scripts.inc | 12 +- data/maps/Route7_EastEntrance/scripts.inc | 12 +- data/maps/Route8_WestEntrance/scripts.inc | 12 +- data/maps/SSAnne_2F_Corridor/scripts.inc | 18 +-- data/maps/SaffronCity_Dojo/scripts.inc | 10 +- data/maps/SeafoamIslands_B3F/scripts.inc | 14 +- data/maps/SeafoamIslands_B4F/scripts.inc | 20 +-- data/maps/SevenIsland_House_Room1/scripts.inc | 4 +- data/maps/SevenIsland_House_Room2/scripts.inc | 4 +- .../map.json | 14 +- .../scripts.inc | 60 ++++----- .../maps/SevenIsland_TrainerTower_1F/map.json | 6 +- .../maps/SevenIsland_TrainerTower_2F/map.json | 6 +- .../maps/SevenIsland_TrainerTower_3F/map.json | 6 +- .../maps/SevenIsland_TrainerTower_4F/map.json | 6 +- .../maps/SevenIsland_TrainerTower_5F/map.json | 6 +- .../maps/SevenIsland_TrainerTower_6F/map.json | 6 +- .../maps/SevenIsland_TrainerTower_7F/map.json | 6 +- .../maps/SevenIsland_TrainerTower_8F/map.json | 6 +- .../scripts.inc | 16 +-- data/maps/SilphCo_11F/scripts.inc | 8 +- data/maps/SilphCo_7F/scripts.inc | 14 +- data/maps/SixIsland_PatternBush/scripts.inc | 6 +- data/maps/ThreeIsland/scripts.inc | 48 +++---- data/maps/UnknownMap_00_00/map.json | 4 +- data/maps/UnknownMap_00_01/map.json | 4 +- data/maps/UnknownMap_00_02/map.json | 8 +- data/maps/UnknownMap_00_03/map.json | 8 +- data/maps/VermilionCity/map.json | 4 +- data/maps/VermilionCity_Gym/scripts.inc | 12 +- data/scripts/mystery_event_club.inc | 6 +- data/scripts/route23.inc | 18 +-- data/scripts/silphco_doors.inc | 80 +++++------ data/scripts/trainer_tower.inc | 48 +++---- include/constants/vars.h | 32 ++--- src/battle_tower.c | 14 +- src/field_tasks.c | 2 +- src/trainer_tower.c | 16 +-- 82 files changed, 609 insertions(+), 609 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 27b22fa85..2ff7dc61a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1270,19 +1270,19 @@ gUnknown_81A6C32:: @ 81A6C32 EventScript_1A7493:: @ 81A7493 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1A74B7 end EventScript_1A749F:: @ 81A749F lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto EventScript_1A74B7 end EventScript_1A74AB:: @ 81A74AB lockall - setvar VAR_0x4003, 1 + setvar VAR_TEMP_3, 1 goto EventScript_1A74B7 end @@ -1297,11 +1297,11 @@ EventScript_1A74B7:: @ 81A74B7 end EventScript_1A74D1:: @ 81A74D1 - setvar VAR_0x4001, 1 - setvar VAR_0x4002, 1 - setvar VAR_0x4003, 1 - setvar VAR_0x4004, 1 - setvar VAR_0x4005, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 return EventScript_1A74EB:: @ 81A74EB @@ -1851,7 +1851,7 @@ EventScript_1A8C33:: @ 81A8C33 EventScript_1A8C3C:: @ 81A8C3C bufferboxname 0, VAR_0x4037 - getspeciesname 1, VAR_0x4001 + getspeciesname 1, VAR_TEMP_1 checkflag FLAG_SYS_NOT_SOMEONES_PC call_if FALSE, EventScript_1A8C57 checkflag FLAG_SYS_NOT_SOMEONES_PC diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 1d5879580..2e6e09d48 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -8,7 +8,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D lock faceplayer - setvar VAR_0x4001, SPECIES_EEVEE + setvar VAR_TEMP_1, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 compare VAR_RESULT, 0 goto_if eq, EventScript_16C4A6 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 63feedabb..0668a0287 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -9,13 +9,13 @@ CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD lock faceplayer call EventScript_16BCF6 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 goto_if eq, EventScript_16C00E goto EventScript_16BD3E end EventScript_16BCF6:: @ 816BCF6 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 compare VAR_RESULT, 1 call_if eq, EventScript_16BD2C @@ -28,15 +28,15 @@ EventScript_16BCF6:: @ 816BCF6 return EventScript_16BD2C:: @ 816BD2C - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 return EventScript_16BD32:: @ 816BD32 - addvar VAR_0x4001, 2 + addvar VAR_TEMP_1, 2 return EventScript_16BD38:: @ 816BD38 - addvar VAR_0x4001, 4 + addvar VAR_TEMP_1, 4 return EventScript_16BD3E:: @ 816BD3E @@ -47,7 +47,7 @@ EventScript_16BD3E:: @ 816BD3E message Text_195D5F waitmessage textcolor 1 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_16BDAE case 2, EventScript_16BDDA case 3, EventScript_16BE06 @@ -221,8 +221,8 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 EventScript_16C045:: @ 816C045 multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE - copyvar VAR_0x4001, VAR_RESULT - switch VAR_0x4001 + copyvar VAR_TEMP_1, VAR_RESULT + switch VAR_TEMP_1 case 0, EventScript_16C083 case 1, EventScript_16C094 case 2, EventScript_16C0A5 @@ -231,19 +231,19 @@ EventScript_16C045:: @ 816C045 end EventScript_16C083:: @ 816C083 - setvar VAR_0x4000, ITEM_FRESH_WATER + setvar VAR_TEMP_0, ITEM_FRESH_WATER checkmoney 200, 0 goto EventScript_16C0CB end EventScript_16C094:: @ 816C094 - setvar VAR_0x4000, ITEM_SODA_POP + setvar VAR_TEMP_0, ITEM_SODA_POP checkmoney 300, 0 goto EventScript_16C0CB end EventScript_16C0A5:: @ 816C0A5 - setvar VAR_0x4000, ITEM_LEMONADE + setvar VAR_TEMP_0, ITEM_LEMONADE checkmoney 350, 0 goto EventScript_16C0CB end @@ -263,20 +263,20 @@ EventScript_16C0C4:: @ 816C0C4 EventScript_16C0CB:: @ 816C0CB compare VAR_RESULT, 0 goto_if eq, EventScript_16C131 - checkitemspace VAR_0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if eq, EventScript_16C13F - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16C0B6 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16C0BD - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16C0C4 updatemoneybox 0, 0, 0 - getitemname 0, VAR_0x4000 + getitemname 0, VAR_TEMP_0 playse SE_JIHANKI msgbox gUnknown_8196076 - additem VAR_0x4000, 1 + additem VAR_TEMP_0, 1 goto EventScript_16C125 end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index d107b3330..eb242f2e6 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -48,8 +48,8 @@ EventScript_16C6E6:: @ 816C6E6 end EventScript_16C706:: @ 816C706 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9500 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 goto_if ge, EventScript_16C79E checkmoney 10000, 0 compare VAR_RESULT, 0 @@ -60,8 +60,8 @@ EventScript_16C706:: @ 816C706 end EventScript_16C734:: @ 816C734 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9950 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 goto_if ge, EventScript_16C79E checkmoney 1000, 0 compare VAR_RESULT, 0 @@ -134,8 +134,8 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 msgbox gUnknown_8196AF3 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9990 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9990 goto_if ge, EventScript_16C82B givecoins 10 textcolor 3 @@ -198,8 +198,8 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E msgbox gUnknown_8196D2B checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9980 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9980 goto_if ge, EventScript_16C8E2 givecoins 20 textcolor 3 @@ -228,8 +228,8 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE msgbox gUnknown_8196DB7 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9980 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9980 goto_if ge, EventScript_16C942 givecoins 20 textcolor 3 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 225685d6a..92987068e 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -43,12 +43,12 @@ EventScript_16CC10:: @ 816CC10 EventScript_16CC15:: @ 816CC15 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_ABRA - setvar VAR_0x4002, 180 + setvar VAR_TEMP_1, SPECIES_ABRA + setvar VAR_TEMP_2, 180 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_ABRA - setvar VAR_0x4002, 120 + setvar VAR_TEMP_1, SPECIES_ABRA + setvar VAR_TEMP_2, 120 .endif .endif goto EventScript_16CC65 @@ -56,12 +56,12 @@ EventScript_16CC15:: @ 816CC15 EventScript_16CC25:: @ 816CC25 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_CLEFAIRY - setvar VAR_0x4002, 500 + setvar VAR_TEMP_1, SPECIES_CLEFAIRY + setvar VAR_TEMP_2, 500 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_CLEFAIRY - setvar VAR_0x4002, 750 + setvar VAR_TEMP_1, SPECIES_CLEFAIRY + setvar VAR_TEMP_2, 750 .endif .endif goto EventScript_16CC65 @@ -69,12 +69,12 @@ EventScript_16CC25:: @ 816CC25 EventScript_16CC35:: @ 816CC35 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_DRATINI - setvar VAR_0x4002, 2800 + setvar VAR_TEMP_1, SPECIES_DRATINI + setvar VAR_TEMP_2, 2800 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_PINSIR - setvar VAR_0x4002, 2500 + setvar VAR_TEMP_1, SPECIES_PINSIR + setvar VAR_TEMP_2, 2500 .endif .endif goto EventScript_16CC65 @@ -82,12 +82,12 @@ EventScript_16CC35:: @ 816CC35 EventScript_16CC45:: @ 816CC45 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_SCYTHER - setvar VAR_0x4002, 5500 + setvar VAR_TEMP_1, SPECIES_SCYTHER + setvar VAR_TEMP_2, 5500 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_DRATINI - setvar VAR_0x4002, 4600 + setvar VAR_TEMP_1, SPECIES_DRATINI + setvar VAR_TEMP_2, 4600 .endif .endif goto EventScript_16CC65 @@ -95,27 +95,27 @@ EventScript_16CC45:: @ 816CC45 EventScript_16CC55:: @ 816CC55 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_PORYGON - setvar VAR_0x4002, 9999 + setvar VAR_TEMP_1, SPECIES_PORYGON + setvar VAR_TEMP_2, 9999 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_PORYGON - setvar VAR_0x4002, 6500 + setvar VAR_TEMP_1, SPECIES_PORYGON + setvar VAR_TEMP_2, 6500 .endif .endif goto EventScript_16CC65 end EventScript_16CC65:: @ 816CC65 - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 checkcoins VAR_RESULT - compare VAR_RESULT, VAR_0x4002 + compare VAR_RESULT, VAR_TEMP_2 goto_if lt, EventScript_16CDA5 textcolor 3 - switch VAR_0x4001 + switch VAR_TEMP_1 case SPECIES_ABRA, EventScript_16CCD4 case SPECIES_CLEFAIRY, EventScript_16CCE9 case SPECIES_DRATINI, EventScript_16CCFE @@ -126,10 +126,10 @@ EventScript_16CC65:: @ 816CC65 EventScript_16CCD4:: @ 816CCD4 .ifdef FIRERED - givemon VAR_0x4001, 9, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 9, ITEM_NONE, 0, 0, 0 .else .ifdef LEAFGREEN - givemon VAR_0x4001, 7, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 7, ITEM_NONE, 0, 0, 0 .endif .endif goto EventScript_16CD52 @@ -137,10 +137,10 @@ EventScript_16CCD4:: @ 816CCD4 EventScript_16CCE9:: @ 816CCE9 .ifdef FIRERED - givemon VAR_0x4001, 8, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 8, ITEM_NONE, 0, 0, 0 .else .ifdef LEAFGREEN - givemon VAR_0x4001, 12, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 12, ITEM_NONE, 0, 0, 0 .endif .endif goto EventScript_16CD52 @@ -148,33 +148,33 @@ EventScript_16CCE9:: @ 816CCE9 EventScript_16CCFE:: @ 816CCFE .ifdef FIRERED - givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 .else .ifdef LEAFGREEN - givemon VAR_0x4001, 24, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 24, ITEM_NONE, 0, 0, 0 .endif .endif goto EventScript_16CD52 end EventScript_16CD13:: @ 816CD13 - givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end EventScript_16CD28:: @ 816CD28 .ifdef FIRERED - givemon VAR_0x4001, 26, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 26, ITEM_NONE, 0, 0, 0 .else .ifdef LEAFGREEN - givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 .endif .endif goto EventScript_16CD52 end EventScript_16CD3D:: @ 816CD3D - givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end @@ -214,9 +214,9 @@ EventScript_16CDA5:: @ 816CDA5 end EventScript_16CDB3:: @ 816CDB3 - takecoins VAR_0x4002 + takecoins VAR_TEMP_2 updatecoinsbox 0, 5 - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_1A5DF1 waitmessage @@ -228,9 +228,9 @@ EventScript_16CDB3:: @ 816CDB3 end EventScript_16CDE0:: @ 816CDE0 - takecoins VAR_0x4002 + takecoins VAR_TEMP_2 updatecoinsbox 0, 5 - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_1A5DF1 waitmessage @@ -275,36 +275,36 @@ EventScript_16CE47:: @ 816CE47 end EventScript_16CEA5:: @ 816CEA5 - setvar VAR_0x4001, ITEM_TM13 - setvar VAR_0x4002, 4000 + setvar VAR_TEMP_1, ITEM_TM13 + setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_ICE_BEAM goto EventScript_16CF09 end EventScript_16CEB9:: @ 816CEB9 - setvar VAR_0x4001, ITEM_TM23 - setvar VAR_0x4002, 3500 + setvar VAR_TEMP_1, ITEM_TM23 + setvar VAR_TEMP_2, 3500 getmovename 1, MOVE_IRON_TAIL goto EventScript_16CF09 end EventScript_16CECD:: @ 816CECD - setvar VAR_0x4001, ITEM_TM24 - setvar VAR_0x4002, 4000 + setvar VAR_TEMP_1, ITEM_TM24 + setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_THUNDERBOLT goto EventScript_16CF09 end EventScript_16CEE1:: @ 816CEE1 - setvar VAR_0x4001, ITEM_TM30 - setvar VAR_0x4002, 4500 + setvar VAR_TEMP_1, ITEM_TM30 + setvar VAR_TEMP_2, 4500 getmovename 1, MOVE_SHADOW_BALL goto EventScript_16CF09 end EventScript_16CEF5:: @ 816CEF5 - setvar VAR_0x4001, ITEM_TM35 - setvar VAR_0x4002, 4000 + setvar VAR_TEMP_1, ITEM_TM35 + setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_FLAMETHROWER goto EventScript_16CF09 end @@ -317,7 +317,7 @@ EventScript_16CF09:: @ 816CF09 end EventScript_16CF22:: @ 816CF22 - getitemname 0, VAR_0x4001 + getitemname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 @@ -325,16 +325,16 @@ EventScript_16CF22:: @ 816CF22 end EventScript_16CF3F:: @ 816CF3F - getitemname 0, VAR_0x4001 + getitemname 0, VAR_TEMP_1 checkcoins VAR_RESULT - compare VAR_RESULT, VAR_0x4002 + compare VAR_RESULT, VAR_TEMP_2 goto_if lt, EventScript_16CDA5 - checkitemspace VAR_0x4001, 1 + checkitemspace VAR_TEMP_1, 1 compare VAR_RESULT, 0 goto_if eq, EventScript_16CF79 - takecoins VAR_0x4002 + takecoins VAR_TEMP_2 updatecoinsbox 0, 5 - giveitem VAR_0x4001 + giveitem VAR_TEMP_1 goto EventScript_16CC10 end @@ -373,31 +373,31 @@ EventScript_16CFB2:: @ 816CFB2 end EventScript_16D010:: @ 816D010 - setvar VAR_0x4001, ITEM_SMOKE_BALL - setvar VAR_0x4002, 800 + setvar VAR_TEMP_1, ITEM_SMOKE_BALL + setvar VAR_TEMP_2, 800 goto EventScript_16CF22 end EventScript_16D020:: @ 816D020 - setvar VAR_0x4001, ITEM_MIRACLE_SEED - setvar VAR_0x4002, 1000 + setvar VAR_TEMP_1, ITEM_MIRACLE_SEED + setvar VAR_TEMP_2, 1000 goto EventScript_16CF22 end EventScript_16D030:: @ 816D030 - setvar VAR_0x4001, ITEM_CHARCOAL - setvar VAR_0x4002, 1000 + setvar VAR_TEMP_1, ITEM_CHARCOAL + setvar VAR_TEMP_2, 1000 goto EventScript_16CF22 end EventScript_16D040:: @ 816D040 - setvar VAR_0x4001, ITEM_MYSTIC_WATER - setvar VAR_0x4002, 1000 + setvar VAR_TEMP_1, ITEM_MYSTIC_WATER + setvar VAR_TEMP_2, 1000 goto EventScript_16CF22 end EventScript_16D050:: @ 816D050 - setvar VAR_0x4001, ITEM_YELLOW_FLUTE - setvar VAR_0x4002, 1600 + setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE + setvar VAR_TEMP_2, 1600 goto EventScript_16CF22 end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index b31b09ec2..6edb5737e 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -16,20 +16,20 @@ EventScript_166484:: @ 8166484 CeruleanCity_EventScript_16649A:: @ 816649A lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1664CC end CeruleanCity_EventScript_1664A6:: @ 81664A6 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 8, 23, 0 goto EventScript_1664CC end CeruleanCity_EventScript_1664B9:: @ 81664B9 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 8, 24, 0 goto EventScript_1664CC end @@ -53,11 +53,11 @@ EventScript_1664CC:: @ 81664CC msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1665A3 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1665A3 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 @@ -206,7 +206,7 @@ EventScript_166677:: @ 8166677 CeruleanCity_EventScript_166683:: @ 8166683 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown @@ -216,7 +216,7 @@ CeruleanCity_EventScript_166683:: @ 8166683 CeruleanCity_EventScript_1666A3:: @ 81666A3 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index ecc68bb6d..c83feff7b 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -120,7 +120,7 @@ "x": 20, "y": 5, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "CinnabarIsland_EventScript_1671CA" } diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 8c7e882d0..fa5546852 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -47,7 +47,7 @@ EventScript_166F5E:: @ 8166F5E return EventScript_166F68:: @ 8166F68 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return CinnabarIsland_OnFrame:: @ 8166F6E diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 9b1c42a45..03fbf26f0 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -214,13 +214,13 @@ EventScript_16DBDE:: @ 816DBDE CinnabarIsland_Gym_EventScript_16DBE8:: @ 816DBE8 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DC00 end CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DC00 end @@ -275,9 +275,9 @@ EventScript_16DC6A:: @ 816DC6A end EventScript_16DC7A:: @ 816DC7A - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16DCB4 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F @@ -311,13 +311,13 @@ Movement_16DCDB:: @ 816DCDB CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DCF5 end CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DCF5 end @@ -354,9 +354,9 @@ EventScript_16DD41:: @ 816DD41 end EventScript_16DD51:: @ 816DD51 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16DD8B - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD @@ -399,13 +399,13 @@ Movement_16DDB7:: @ 816DDB7 CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DDD3 end CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DDD3 end @@ -442,9 +442,9 @@ EventScript_16DE1F:: @ 816DE1F end EventScript_16DE2F:: @ 816DE2F - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16DE69 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 @@ -478,13 +478,13 @@ Movement_16DE90:: @ 816DE90 CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DEAA end CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DEAA end @@ -521,9 +521,9 @@ EventScript_16DEF6:: @ 816DEF6 end EventScript_16DF06:: @ 816DF06 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16DF40 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 @@ -557,13 +557,13 @@ Movement_16DF67:: @ 816DF67 CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DF81 end CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DF81 end @@ -600,9 +600,9 @@ EventScript_16DFCD:: @ 816DFCD end EventScript_16DFDD:: @ 816DFDD - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16E017 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F @@ -636,13 +636,13 @@ Movement_16E03E:: @ 816E03E CinnabarIsland_Gym_EventScript_16E040:: @ 816E040 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16E058 end CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16E058 end @@ -679,9 +679,9 @@ EventScript_16E0A4:: @ 816E0A4 end EventScript_16E0B4:: @ 816E0B4 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16E0EE - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 03562d9c1..fba30d1e8 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -216,7 +216,7 @@ EventScript_16E736:: @ 816E736 end EventScript_16E758:: @ 816E758 - setvar VAR_0x4001, SPECIES_OMANYTE + setvar VAR_TEMP_1, SPECIES_OMANYTE getspeciesname 0, SPECIES_OMANYTE msgbox gUnknown_819A34F givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 @@ -230,7 +230,7 @@ EventScript_16E758:: @ 816E758 end EventScript_16E79D:: @ 816E79D - setvar VAR_0x4001, SPECIES_KABUTO + setvar VAR_TEMP_1, SPECIES_KABUTO getspeciesname 0, SPECIES_KABUTO msgbox gUnknown_819A34F givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 @@ -244,7 +244,7 @@ EventScript_16E79D:: @ 816E79D end EventScript_16E7E2:: @ 816E7E2 - setvar VAR_0x4001, SPECIES_AERODACTYL + setvar VAR_TEMP_1, SPECIES_AERODACTYL getspeciesname 0, SPECIES_AERODACTYL msgbox gUnknown_819A34F givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index bc73fb818..c3e3eaff2 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -13,7 +13,7 @@ FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 end FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B - map_script_2 VAR_0x4001, 1, EventScript_163D65 + map_script_2 VAR_TEMP_1, 1, EventScript_163D65 .2byte 0 EventScript_163D65:: @ 8163D65 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 13f4ee261..625d4098b 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -76,7 +76,7 @@ "x": 4, "y": 3, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D36D" }, @@ -85,7 +85,7 @@ "x": 5, "y": 3, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D379" }, @@ -94,7 +94,7 @@ "x": 3, "y": 3, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D385" } diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 8d248b5d0..2ec411238 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -79,19 +79,19 @@ Movement_16D36A:: @ 816D36A FuchsiaCity_SafariZone_Entrance_EventScript_16D36D:: @ 816D36D lockall - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 goto EventScript_16D391 end FuchsiaCity_SafariZone_Entrance_EventScript_16D379:: @ 816D379 lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto EventScript_16D391 end FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385 lockall - setvar VAR_0x4002, 2 + setvar VAR_TEMP_2, 2 goto EventScript_16D391 end @@ -124,11 +124,11 @@ EventScript_16D3CA:: @ 816D3CA msgbox gUnknown_8197D80 closemessage hidemoneybox 0, 0 - compare VAR_0x4002, 0 + compare VAR_TEMP_2, 0 call_if eq, EventScript_16D44C - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 call_if eq, EventScript_16D441 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 call_if eq, EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 6baaa256f..669097ef3 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -42,7 +42,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "NavelRock_Summit_EventScript_164FFB" } diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index f881628e2..065fdfa42 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -11,15 +11,15 @@ NavelRock_Summit_OnTransition:: @ 8164FAA end EventScript_164FBD:: @ 8164FBD - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setflag FLAG_HIDE_HO_OH return EventScript_164FC6:: @ 8164FC6 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 checkflag FLAG_HO_OH_FLEW_AWAY goto_if TRUE, EventScript_1A77A9 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return @@ -41,7 +41,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 special SpawnCameraObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index a04cfa085..97c4318c3 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -107,7 +107,7 @@ "x": 13, "y": 13, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "OneIsland_KindleRoad_EmberSpa_EventScript_1653CF" } diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 71c8cf0ee..a4bd33e22 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -48,6 +48,6 @@ OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF special sp000_heal_pokemon fadescreen 2 msgbox gUnknown_817D450 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index d2a049acb..bb4d46273 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -437,25 +437,25 @@ EventScript_1711A0:: @ 81711A0 OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1711DA end OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_1711DA end OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto EventScript_1711DA end OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 goto EventScript_1711DA end @@ -466,13 +466,13 @@ EventScript_1711DA:: @ 81711DA waitmovement 0 msgbox gUnknown_81A13B8 closemessage - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1712E4 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1712EF - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_1712FA - compare VAR_0x4001, 4 + compare VAR_TEMP_1, 4 call_if eq, EventScript_171305 delay 10 msgbox gUnknown_81A13CB diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 2b2c4330a..1d65c1c3f 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -111,7 +111,7 @@ "x": 13, "y": 2, "elevation": 3, - "var": "VAR_0x4002", + "var": "VAR_TEMP_2", "var_value": 1, "script": "PalletTown_EventScript_16587B" } diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 4feb30355..831c17dde 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -35,7 +35,7 @@ EventScript_1654A8:: @ 81654A8 EventScript_1654BD:: @ 81654BD setobjectxyperm 1, 12, 2 setobjectmovementtype 1, 8 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 return PalletTown_OnFrame:: @ 81654CE @@ -173,13 +173,13 @@ Movement_1655DD:: @ 81655DD PalletTown_EventScript_1655ED:: @ 81655ED lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_165605 end PalletTown_EventScript_1655F9:: @ 81655F9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_165605 end @@ -199,17 +199,17 @@ EventScript_165605:: @ 8165605 waitmovement 0 delay 30 addobject 3 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1656B8 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1656CE - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1656E0 opendoor 16, 13 waitdooranim @@ -378,7 +378,7 @@ PalletTown_EventScript_16575C:: @ 816575C goto_if eq, EventScript_1657ED compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if eq, EventScript_165815 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_if eq, EventScript_1658C2 checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_165801 @@ -489,7 +489,7 @@ EventScript_165894:: @ 8165894 textcolor 3 setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 special sub_80699E0 special sub_80699BC signmsg diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 6a6354a1a..7a76bab27 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -15,7 +15,7 @@ EventScript_168D44:: @ 8168D44 return EventScript_168D50:: @ 8168D50 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 @@ -24,7 +24,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkflag FLAG_SYS_GAME_CLEAR goto_if TRUE, EventScript_168DB9 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_if eq, EventScript_168EEC compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 goto_if eq, EventScript_168F59 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index a4988a1c2..858b12d8c 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -284,19 +284,19 @@ Movement_1692E5:: @ 81692E5 PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7 lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto EventScript_16930B end PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3 lockall - setvar VAR_0x4002, 2 + setvar VAR_TEMP_2, 2 goto EventScript_16930B end PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF lockall - setvar VAR_0x4002, 3 + setvar VAR_TEMP_2, 3 goto EventScript_16930B end @@ -320,11 +320,11 @@ EventScript_16930B:: @ 816930B end EventScript_16935A:: @ 816935A - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_if eq, EventScript_16937C - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_16938C - compare VAR_0x4002, 3 + compare VAR_TEMP_2, 3 goto_if eq, EventScript_16939C end @@ -376,11 +376,11 @@ Movement_1693CD:: @ 81693CD step_end EventScript_1693D2:: @ 81693D2 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_if eq, EventScript_1693F4 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_169404 - compare VAR_0x4002, 3 + compare VAR_TEMP_2, 3 goto_if eq, EventScript_169414 end @@ -435,11 +435,11 @@ Movement_169447:: @ 8169447 step_end EventScript_16944D:: @ 816944D - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_if eq, EventScript_16946F - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_16947F - compare VAR_0x4002, 3 + compare VAR_TEMP_2, 3 goto_if eq, EventScript_16948F end @@ -492,11 +492,11 @@ EventScript_1694C2:: @ 81694C2 msgbox gUnknown_818DE38 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 call_if eq, EventScript_169504 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 call_if eq, EventScript_169516 - compare VAR_0x4002, 3 + compare VAR_TEMP_2, 3 call_if eq, EventScript_169528 removeobject 8 playse SE_KAIDAN @@ -1141,10 +1141,10 @@ Movement_169BA4:: @ 8169BA4 walk_down step_end - .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_0x4001 - .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_0x4002 - .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_0x4003 - .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_0x4004 + .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_TEMP_1 + .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_TEMP_2 + .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_TEMP_3 + .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_TEMP_4 PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB lock diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 7b5d4c2fe..8b196334c 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -418,25 +418,25 @@ Movement_165D83:: @ 8165D83 PewterCity_EventScript_165D8E:: @ 8165D8E lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_165DBE end PewterCity_EventScript_165D9A:: @ 8165D9A lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_165DBE end PewterCity_EventScript_165DA6:: @ 8165DA6 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_165DBE end PewterCity_EventScript_165DB2:: @ 8165DB2 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto EventScript_165DBE end @@ -445,11 +445,11 @@ EventScript_165DBE:: @ 8165DBE msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_165E0A - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_165E26 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_165E42 msgbox gUnknown_817E6C7 closemessage @@ -1388,39 +1388,39 @@ PewterCity_EventScript_1662A0:: @ 81662A0 PewterCity_EventScript_1662A9:: @ 81662A9 lock faceplayer - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 call EventScript_1662DE release end PewterCity_EventScript_1662B7:: @ 81662B7 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call EventScript_1662DE releaseall end PewterCity_EventScript_1662C4:: @ 81662C4 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 call EventScript_1662DE releaseall end PewterCity_EventScript_1662D1:: @ 81662D1 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 call EventScript_1662DE releaseall end EventScript_1662DE:: @ 81662DE textcolor 0 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1663CA - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1663CA - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_1663CA waitse playse SE_PIN @@ -1429,13 +1429,13 @@ EventScript_1662DE:: @ 81662DE applymovement 7, Movement_Delay48 waitmovement 0 msgbox gUnknown_817E902 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1663D5 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1663DA - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1663E6 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 @@ -1451,13 +1451,13 @@ EventScript_1662DE:: @ 81662DE call EventScript_1A6675 msgbox gUnknown_817EA06 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_166412 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16641D - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_166428 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_166433 delay 30 textcolor 3 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 8c9e56390..3fdeee10c 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -38,7 +38,7 @@ EventScript_16A37B:: @ 816A37B PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 @@ -46,7 +46,7 @@ PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 @@ -54,7 +54,7 @@ PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 @@ -79,11 +79,11 @@ EventScript_16A402:: @ 816A402 compare VAR_RESULT, 0 goto_if eq, EventScript_16A476 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16A455 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16A460 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16A46B playse SE_SHOP takemoney 50, 0 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index dcb002b5d..56816cd76 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -26,7 +26,7 @@ EventScript_16284B:: @ 816284B return PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 - map_script_2 VAR_0x4001, 0, EventScript_16285B + map_script_2 VAR_TEMP_1, 0, EventScript_16285B .2byte 0 EventScript_16285B:: @ 816285B diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 0eeb407c9..2f3fd90a1 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -26,7 +26,7 @@ EventScript_1626C0:: @ 81626C0 return PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 - map_script_2 VAR_0x4001, 0, EventScript_1626D0 + map_script_2 VAR_TEMP_1, 0, EventScript_1626D0 .2byte 0 EventScript_1626D0:: @ 81626D0 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 63c370711..87754a660 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -37,11 +37,11 @@ EventScript_162B44:: @ 8162B44 return EventScript_162B57:: @ 8162B57 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D - map_script_2 VAR_0x4001, 0, EventScript_162B67 + map_script_2 VAR_TEMP_1, 0, EventScript_162B67 .2byte 0 EventScript_162B67:: @ 8162B67 @@ -49,7 +49,7 @@ EventScript_162B67:: @ 8162B67 end PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C - map_script_2 VAR_0x4001, 0, EventScript_162B76 + map_script_2 VAR_TEMP_1, 0, EventScript_162B76 .2byte 0 EventScript_162B76:: @ 8162B76 @@ -104,7 +104,7 @@ EventScript_162B76:: @ 8162B76 applymovement 2, Movement_162D37 applymovement OBJ_EVENT_ID_PLAYER, Movement_162D12 waitmovement 0 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 waitstate releaseall diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 960b8cbb1..b28a75449 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -4,7 +4,7 @@ PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C .byte 0 PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 - map_script_2 VAR_0x4001, 0, EventScript_162D61 + map_script_2 VAR_TEMP_1, 0, EventScript_162D61 .2byte 0 EventScript_162D61:: @ 8162D61 @@ -12,7 +12,7 @@ EventScript_162D61:: @ 8162D61 end PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 - map_script_2 VAR_0x4001, 0, EventScript_162D70 + map_script_2 VAR_TEMP_1, 0, EventScript_162D70 .2byte 0 EventScript_162D70:: @ 8162D70 @@ -33,7 +33,7 @@ EventScript_162D70:: @ 8162D70 dofieldeffect 62 waitfieldeffect 62 delay 40 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call EventScript_1A651A setrespawn SPAWN_PALLET_TOWN fadescreenspeed 1, 24 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 257875ea2..d082de03b 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -26,7 +26,7 @@ EventScript_162968:: @ 8162968 return PokemonLeague_LancesRoom_OnWarp:: @ 816296E - map_script_2 VAR_0x4001, 0, EventScript_162978 + map_script_2 VAR_TEMP_1, 0, EventScript_162978 .2byte 0 EventScript_162978:: @ 8162978 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 27550f51f..449bd9f9a 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -31,7 +31,7 @@ PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2 end PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 - map_script_2 VAR_0x4001, 0, EventScript_1625C0 + map_script_2 VAR_TEMP_1, 0, EventScript_1625C0 .2byte 0 EventScript_1625C0:: @ 81625C0 diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 5b9ea13d2..eb47508bf 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -7,22 +7,22 @@ PokemonTower_2F_EventScript_163286:: @ 8163286 PokemonTower_2F_EventScript_16328F:: @ 816328F lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1632A7 end PokemonTower_2F_EventScript_16329B:: @ 816329B lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1632A7 end EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_163339 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16334B applymovement 1, Movement_ExclamationMark waitmovement 0 @@ -39,9 +39,9 @@ EventScript_1632A7:: @ 81632A7 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16337E - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_163389 playse SE_KAIDAN delay 25 diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index bd64e246e..37b0653e6 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -127,7 +127,7 @@ "x": 10, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -136,7 +136,7 @@ "x": 11, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -145,7 +145,7 @@ "x": 12, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -154,7 +154,7 @@ "x": 10, "y": 9, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -163,7 +163,7 @@ "x": 9, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -172,7 +172,7 @@ "x": 12, "y": 9, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -181,7 +181,7 @@ "x": 10, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -190,7 +190,7 @@ "x": 11, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -199,7 +199,7 @@ "x": 12, "y": 10, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -208,7 +208,7 @@ "x": 9, "y": 9, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -217,7 +217,7 @@ "x": 9, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -226,7 +226,7 @@ "x": 10, "y": 11, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -235,7 +235,7 @@ "x": 11, "y": 11, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -244,7 +244,7 @@ "x": 12, "y": 11, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -253,7 +253,7 @@ "x": 13, "y": 8, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -262,7 +262,7 @@ "x": 13, "y": 9, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -271,7 +271,7 @@ "x": 13, "y": 10, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" } diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 85517e241..18dc1aedd 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -11,13 +11,13 @@ PokemonTower_5F_EventScript_16343C:: @ 816343C special sp000_heal_pokemon fadescreen 2 msgbox gUnknown_817A1FA - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end PokemonTower_5F_EventScript_163453:: @ 8163453 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index fca61e89b..7adf4ce23 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -3,17 +3,17 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 .byte 0 RocketHideout_B4F_OnLoad:: @ 81612EE - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if ne, EventScript_16146A end EventScript_161311:: @ 8161311 - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 return RocketHideout_B4F_EventScript_161317:: @ 8161317 @@ -77,14 +77,14 @@ RocketHideout_B4F_EventScript_1613CE:: @ 81613CE end EventScript_1613E9:: @ 81613E9 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1614A1 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_161462 release end @@ -95,14 +95,14 @@ RocketHideout_B4F_EventScript_161418:: @ 8161418 end EventScript_161433:: @ 8161433 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1614A1 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_161462 release end diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 6288d8418..0618f25fd 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -101,7 +101,7 @@ "x": 6, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1701E4" }, @@ -110,7 +110,7 @@ "x": 6, "y": 11, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1701F0" }, @@ -155,7 +155,7 @@ "x": 6, "y": 12, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1701FC" }, @@ -164,7 +164,7 @@ "x": 6, "y": 13, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_170208" }, @@ -173,7 +173,7 @@ "x": 6, "y": 14, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_170214" } diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index 5c87fadab..ecc93ae83 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -9,7 +9,7 @@ Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 end EventScript_1701D5:: @ 81701D5 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 6dfc516fd..15d453cce 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -65,7 +65,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_17039A" }, @@ -74,7 +74,7 @@ "x": 6, "y": 5, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703A6" }, @@ -83,7 +83,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703B2" }, @@ -92,7 +92,7 @@ "x": 6, "y": 7, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703BE" }, @@ -101,7 +101,7 @@ "x": 6, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703CA" }, diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index d4582a73e..0be4bc59d 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -9,7 +9,7 @@ Route18_EastEntrance_1F_OnTransition:: @ 817037E end EventScript_17038B:: @ 817038B - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index dc72a7a1c..ad798166c 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -3,7 +3,7 @@ Route22_MapScripts:: @ 816828B Route22_EventScript_16828C:: @ 816828C lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1682BE EventScript_168297:: @ 8168297 @@ -11,7 +11,7 @@ EventScript_168297:: @ 8168297 Route22_EventScript_168298:: @ 8168298 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 goto EventScript_1682BE @@ -20,7 +20,7 @@ EventScript_1682AA:: @ 81682AA Route22_EventScript_1682AB:: @ 81682AB lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 goto EventScript_1682BE @@ -31,11 +31,11 @@ EventScript_1682BE:: @ 81682BE textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_168350 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_168350 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16835B delay 6 msgbox gUnknown_8188890 @@ -49,11 +49,11 @@ EventScript_1682BE:: @ 81682BE closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16839A - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16839A - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1683A5 fadedefaultbgm removeobject 1 @@ -169,7 +169,7 @@ Movement_1683E3:: @ 81683E3 Route22_EventScript_1683ED:: @ 81683ED lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16841F EventScript_1683F8:: @ 81683F8 @@ -177,7 +177,7 @@ EventScript_1683F8:: @ 81683F8 Route22_EventScript_1683F9:: @ 81683F9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 goto EventScript_16841F @@ -186,7 +186,7 @@ EventScript_16840B:: @ 816840B Route22_EventScript_16840C:: @ 816840C lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 goto EventScript_16841F @@ -197,11 +197,11 @@ EventScript_16841F:: @ 816841F textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16849C - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16849C - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 diff --git a/data/maps/Route22_NorthEntrance/scripts.inc b/data/maps/Route22_NorthEntrance/scripts.inc index 49fba6173..afbfbb165 100644 --- a/data/maps/Route22_NorthEntrance/scripts.inc +++ b/data/maps/Route22_NorthEntrance/scripts.inc @@ -4,14 +4,14 @@ Route22_NorthEntrance_MapScripts:: @ 81704FB Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC lock faceplayer - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 getstdstring 0, 15 goto EventScript_1A7803 end Route22_NorthEntrance_EventScript_17050D:: @ 817050D lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setvar VAR_0x8009, 1 getstdstring 0, 15 goto EventScript_1A796E diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index df211bc3f..4a3fcaf60 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -14,7 +14,7 @@ Route23_OnTransition:: @ 81684F1 Route23_EventScript_16850C:: @ 816850C lock faceplayer - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 getstdstring 0, 16 goto EventScript_1A786C end @@ -22,7 +22,7 @@ Route23_EventScript_16850C:: @ 816850C Route23_EventScript_16851D:: @ 816851D lock faceplayer - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 getstdstring 0, 17 goto EventScript_1A786C end @@ -30,7 +30,7 @@ Route23_EventScript_16851D:: @ 816851D Route23_EventScript_16852E:: @ 816852E lock faceplayer - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 getstdstring 0, 18 goto EventScript_1A786C end @@ -38,7 +38,7 @@ Route23_EventScript_16852E:: @ 816852E Route23_EventScript_16853F:: @ 816853F lock faceplayer - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 getstdstring 0, 19 goto EventScript_1A786C end @@ -46,7 +46,7 @@ Route23_EventScript_16853F:: @ 816853F Route23_EventScript_168550:: @ 8168550 lock faceplayer - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 getstdstring 0, 20 goto EventScript_1A786C end @@ -54,7 +54,7 @@ Route23_EventScript_168550:: @ 8168550 Route23_EventScript_168561:: @ 8168561 lock faceplayer - setvar VAR_0x4001, 7 + setvar VAR_TEMP_1, 7 getstdstring 0, 21 goto EventScript_1A786C end @@ -62,14 +62,14 @@ Route23_EventScript_168561:: @ 8168561 Route23_EventScript_168572:: @ 8168572 lock faceplayer - setvar VAR_0x4001, 8 + setvar VAR_TEMP_1, 8 getstdstring 0, 22 goto EventScript_1A786C end Route23_EventScript_168583:: @ 8168583 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setvar VAR_0x8009, 1 getstdstring 0, 16 goto EventScript_1A796E @@ -77,7 +77,7 @@ Route23_EventScript_168583:: @ 8168583 Route23_EventScript_168598:: @ 8168598 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 setvar VAR_0x8009, 2 getstdstring 0, 17 goto EventScript_1A796E @@ -85,7 +85,7 @@ Route23_EventScript_168598:: @ 8168598 Route23_EventScript_1685AD:: @ 81685AD lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 setvar VAR_0x8009, 3 getstdstring 0, 18 goto EventScript_1A796E @@ -93,7 +93,7 @@ Route23_EventScript_1685AD:: @ 81685AD Route23_EventScript_1685C2:: @ 81685C2 lockall - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 setvar VAR_0x8009, 4 getstdstring 0, 19 goto EventScript_1A796E @@ -101,7 +101,7 @@ Route23_EventScript_1685C2:: @ 81685C2 Route23_EventScript_1685D7:: @ 81685D7 lockall - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 setvar VAR_0x8009, 5 getstdstring 0, 20 goto EventScript_1A796E @@ -109,7 +109,7 @@ Route23_EventScript_1685D7:: @ 81685D7 Route23_EventScript_1685EC:: @ 81685EC lockall - setvar VAR_0x4001, 7 + setvar VAR_TEMP_1, 7 setvar VAR_0x8009, 6 getstdstring 0, 21 goto EventScript_1A796E @@ -117,7 +117,7 @@ Route23_EventScript_1685EC:: @ 81685EC Route23_EventScript_168601:: @ 8168601 lockall - setvar VAR_0x4001, 8 + setvar VAR_TEMP_1, 8 setvar VAR_0x8009, 7 getstdstring 0, 22 goto EventScript_1A796E diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 831b1f1d1..6889e739c 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -26,21 +26,21 @@ EventScript_168656:: @ 8168656 Route24_EventScript_168660:: @ 8168660 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_168678 end Route24_EventScript_16866C:: @ 816866C lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_168678 end EventScript_168678:: @ 8168678 textcolor 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1686FD - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_168708 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 @@ -80,7 +80,7 @@ EventScript_168713:: @ 8168713 closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_168743 waitmovement 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_168733 release end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 333edbb05..dbb66acfd 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -48,7 +48,7 @@ EventScript_16F7A2:: @ 816F7A2 compare VAR_RESULT, 0 goto_if eq, EventScript_16F895 textcolor 3 - setvar VAR_0x4001, 129 + setvar VAR_TEMP_1, 129 givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 compare VAR_RESULT, 0 goto_if eq, EventScript_16F7F6 diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index d61bbd99c..2aac04b78 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -7,19 +7,19 @@ Route5_SouthEntrance_EventScript_16F901:: @ 816F901 Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16F92E end Route5_SouthEntrance_EventScript_16F916:: @ 816F916 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16F92E end Route5_SouthEntrance_EventScript_16F922:: @ 816F922 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16F92E end @@ -44,11 +44,11 @@ EventScript_16F958:: @ 816F958 EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16F99C - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16F9A7 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16F9B2 msgbox gUnknown_819E0C1 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 4a7fe8f38..d85587c03 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -7,19 +7,19 @@ Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16F9F4 end Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16F9F4 end Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16F9F4 end @@ -44,11 +44,11 @@ EventScript_16FA1E:: @ 816FA1E EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16FA62 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16FA6D - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index a3b8f0412..5cb615467 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -7,19 +7,19 @@ Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16FABB end Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16FABB end Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16FABB end @@ -44,11 +44,11 @@ EventScript_16FAE5:: @ 816FAE5 EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16FB29 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16FB34 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16FB3F msgbox gUnknown_819E32D setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index dfff0bc4f..6d79a9412 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -7,19 +7,19 @@ Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16FB81 end Route8_WestEntrance_EventScript_16FB69:: @ 816FB69 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16FB81 end Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16FB81 end @@ -54,11 +54,11 @@ EventScript_16FBC1:: @ 816FBC1 EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16FC05 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16FC10 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16FC1B msgbox gUnknown_819E463 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 723a6d048..7cd9e2f5d 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -3,7 +3,7 @@ SSAnne_2F_Corridor_MapScripts:: @ 81608DE SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_160903 EventScript_1608EA:: @ 81608EA @@ -11,7 +11,7 @@ EventScript_1608EA:: @ 81608EA SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_160903 EventScript_1608F6:: @ 81608F6 @@ -19,7 +19,7 @@ EventScript_1608F6:: @ 81608F6 SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_160903 EventScript_160902:: @ 8160902 @@ -35,11 +35,11 @@ EventScript_160903:: @ 8160903 applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 delay 20 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1609AD - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1609B8 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 @@ -53,11 +53,11 @@ EventScript_160903:: @ 8160903 closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1609FD - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_160A08 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_160A13 fadedefaultbgm removeobject 1 diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 37856f0fd..06a315907 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -23,7 +23,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 checkflag FLAG_GOT_HITMON_FROM_DOJO goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 - setvar VAR_0x4001, SPECIES_HITMONLEE + setvar VAR_TEMP_1, SPECIES_HITMONLEE applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 @@ -46,7 +46,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 checkflag FLAG_GOT_HITMON_FROM_DOJO goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 - setvar VAR_0x4001, SPECIES_HITMONCHAN + setvar VAR_TEMP_1, SPECIES_HITMONCHAN applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 @@ -60,7 +60,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 EventScript_16EC82:: @ 816EC82 erasemonpic - givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0 compare VAR_RESULT, 0 goto_if eq, EventScript_16ECB5 compare VAR_RESULT, 1 @@ -72,7 +72,7 @@ EventScript_16EC82:: @ 816EC82 EventScript_16ECB5:: @ 816ECB5 removeobject VAR_LAST_TALKED - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_19B473 waitmessage @@ -88,7 +88,7 @@ EventScript_16ECB5:: @ 816ECB5 EventScript_16ECEC:: @ 816ECEC removeobject VAR_LAST_TALKED - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_19B473 waitmessage diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 931eb21cf..54543e54a 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -11,12 +11,12 @@ SeafoamIslands_B3F_OnTransition:: @ 8162F5A end EventScript_162F6D:: @ 8162F6D - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if FALSE, EventScript_162FF0 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 call_if eq, EventScript_162F90 return @@ -29,17 +29,17 @@ EventScript_162F94:: @ 8162F94 return SeafoamIslands_B3F_OnFrame:: @ 8162F98 - map_script_2 VAR_0x4001, 1, EventScript_162FA2 + map_script_2 VAR_TEMP_1, 1, EventScript_162FA2 .2byte 0 EventScript_162FA2:: @ 8162FA2 lockall - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if FALSE, EventScript_162FF0 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 24 @@ -53,7 +53,7 @@ EventScript_162FA2:: @ 8162FA2 end EventScript_162FF0:: @ 8162FF0 - addvar VAR_0x4002, 1 + addvar VAR_TEMP_2, 1 return EventScript_162FF6:: @ 8162FF6 @@ -67,7 +67,7 @@ EventScript_163001:: @ 8163001 return EventScript_16300C:: @ 816300C - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 70b33cf35..090b65d5f 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -28,12 +28,12 @@ SeafoamIslands_B4F_OnTransition:: @ 8163066 end EventScript_163082:: @ 8163082 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 call_if eq, EventScript_1630A5 return @@ -50,12 +50,12 @@ EventScript_1630AD:: @ 81630AD return SeafoamIslands_B4F_OnLoad:: @ 81630B1 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_1630D4 end @@ -75,7 +75,7 @@ EventScript_1630F1:: @ 81630F1 SeafoamIslands_B4F_OnFrame:: @ 81630F9 map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B - map_script_2 VAR_0x4001, 1, EventScript_163121 + map_script_2 VAR_TEMP_1, 1, EventScript_163121 .2byte 0 EventScript_16310B:: @ 816310B @@ -94,12 +94,12 @@ Movement_16311D:: @ 816311D EventScript_163121:: @ 8163121 lockall - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 9 @@ -107,12 +107,12 @@ EventScript_163121:: @ 8163121 compare VAR_0x8008, 9 call_if ge, EventScript_16317A special sub_805D1A8 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end EventScript_163169:: @ 8163169 - addvar VAR_0x4002, 1 + addvar VAR_TEMP_2, 1 return EventScript_16316F:: @ 816316F @@ -126,7 +126,7 @@ EventScript_16317A:: @ 816317A return EventScript_163185:: @ 8163185 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index fd358401f..33b085474 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -12,7 +12,7 @@ SevenIsland_House_Room1_OnTransition:: @ 8170895 end EventScript_1708AF:: @ 81708AF - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 4, 2 setobjectmovementtype 1, 8 setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C @@ -77,7 +77,7 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 special ValidateEReaderTrainer compare VAR_RESULT, 1 call_if eq, EventScript_17097D - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_if eq, EventScript_170987 msgbox gUnknown_81A049B release diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 461e4fe45..047f55705 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -8,7 +8,7 @@ SevenIsland_House_Room2_OnTransition:: @ 8170A89 end SevenIsland_House_Room2_OnFrame:: @ 8170A8D - map_script_2 VAR_0x4001, 0, EventScript_170A97 + map_script_2 VAR_TEMP_1, 0, EventScript_170A97 .2byte 0 EventScript_170A97:: @ 8170A97 @@ -33,7 +33,7 @@ EventScript_170A97:: @ 8170A97 applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 waitmovement 0 special LoadPlayerParty - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1 waitstate releaseall diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index c1b70fd2d..cbb2f2b76 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -120,7 +120,7 @@ "x": 7, "y": 2, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39" }, @@ -129,7 +129,7 @@ "x": 9, "y": 8, "elevation": 3, - "var": "VAR_0x4007", + "var": "VAR_TEMP_7", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B" }, @@ -138,7 +138,7 @@ "x": 5, "y": 8, "elevation": 3, - "var": "VAR_0x4006", + "var": "VAR_TEMP_6", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8" }, @@ -147,7 +147,7 @@ "x": 9, "y": 6, "elevation": 3, - "var": "VAR_0x4005", + "var": "VAR_TEMP_5", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5" }, @@ -156,7 +156,7 @@ "x": 5, "y": 6, "elevation": 3, - "var": "VAR_0x4004", + "var": "VAR_TEMP_4", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2" }, @@ -165,7 +165,7 @@ "x": 10, "y": 4, "elevation": 3, - "var": "VAR_0x4003", + "var": "VAR_TEMP_3", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F" }, @@ -174,7 +174,7 @@ "x": 4, "y": 4, "elevation": 3, - "var": "VAR_0x4002", + "var": "VAR_TEMP_2", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C" } diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 708541904..c22f3895b 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -6,14 +6,14 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS call_if TRUE, EventScript_164E07 - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 - setvar VAR_0x4003, 0 - setvar VAR_0x4004, 0 - setvar VAR_0x4005, 0 - setvar VAR_0x4006, 0 - setvar VAR_0x4007, 0 - setvar VAR_0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 end EventScript_164E07:: @ 8164E07 @@ -28,83 +28,83 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall - compare VAR_0x4001, 100 + compare VAR_TEMP_1, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4001, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_1, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall - compare VAR_0x4002, 100 + compare VAR_TEMP_2, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4002, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_2, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall - compare VAR_0x4003, 100 + compare VAR_TEMP_3, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4003, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_3, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall - compare VAR_0x4004, 100 + compare VAR_TEMP_4, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4004, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_4, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall - compare VAR_0x4005, 100 + compare VAR_TEMP_5, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4005, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_5, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall - compare VAR_0x4006, 100 + compare VAR_TEMP_6, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4006, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_6, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall - compare VAR_0x4007, 100 + compare VAR_TEMP_7, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4007, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_7, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end EventScript_164F2E:: @ 8164F2E - addvar VAR_0x4008, 1 + addvar VAR_TEMP_8, 1 playse SE_TRACK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index 524654792..ef0339b63 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -101,7 +101,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF" }, @@ -110,7 +110,7 @@ "x": 9, "y": 12, "elevation": 0, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4" }, @@ -119,7 +119,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index dde2e99ac..fe3329368 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index ddc7e3009..b241536b6 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index 010f213de..d32447db2 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index 933e07d80..f9d032e87 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 522d796dd..4ec4b1e45 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index 55ca3f1b7..4e28edf5b 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index 78e1fe89d..4e8fb9db3 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 7c4e287a2..1ae95e0d9 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -7,14 +7,14 @@ SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 .byte 0 SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 10 special sub_815D9E8 setvar VAR_0x8004, 18 special sub_815D9E8 compare VAR_RESULT, 0 goto_if eq, EventScript_164886 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 @@ -30,7 +30,7 @@ SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 end SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 - compare VAR_0x400D, 17 + compare VAR_TEMP_D, 17 call_if eq, EventScript_1648A3 end @@ -40,12 +40,12 @@ EventScript_1648A3:: @ 81648A3 SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY - getplayerxy VAR_0x400D, VAR_RESULT + getplayerxy VAR_TEMP_D, VAR_RESULT end SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6 - map_script_2 VAR_0x4000, 0, EventScript_1648ED - map_script_2 VAR_0x400D, 0x11, EventScript_1648C8 + map_script_2 VAR_TEMP_0, 0, EventScript_1648ED + map_script_2 VAR_TEMP_D, 0x11, EventScript_1648C8 .2byte 0 EventScript_1648C8:: @ 81648C8 @@ -56,7 +56,7 @@ EventScript_1648C8:: @ 81648C8 special DrawWholeMapView playse SE_TK_KASYA waitse - setvar VAR_0x400D, 0 + setvar VAR_TEMP_D, 0 releaseall end @@ -66,7 +66,7 @@ Movement_1648EA:: @ 81648EA step_end EventScript_1648ED:: @ 81648ED - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 12 special sub_815D9E8 switch VAR_RESULT diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 384e04b54..218838690 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -51,7 +51,7 @@ SilphCo_11F_EventScript_161E7F:: @ 8161E7F SilphCo_11F_EventScript_161E88:: @ 8161E88 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_161EA0 EventScript_161E93:: @ 8161E93 @@ -59,7 +59,7 @@ EventScript_161E93:: @ 8161E93 SilphCo_11F_EventScript_161E94:: @ 8161E94 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_161EA0 EventScript_161E9F:: @ 8161E9F @@ -72,9 +72,9 @@ EventScript_161EA0:: @ 8161EA0 delay 25 msgbox gUnknown_8177108 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_161F00 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_161F12 setvar VAR_LAST_TALKED, 3 trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 99a77ed9f..02e5de5e7 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -23,7 +23,7 @@ EventScript_1619B7:: @ 81619B7 SilphCo_7F_EventScript_1619BC:: @ 81619BC lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1619D4 EventScript_1619C7:: @ 81619C7 @@ -31,7 +31,7 @@ EventScript_1619C7:: @ 81619C7 SilphCo_7F_EventScript_1619C8:: @ 81619C8 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1619D4 EventScript_1619D3:: @ 81619D3 @@ -46,9 +46,9 @@ EventScript_1619D4:: @ 81619D4 applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_8176710 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_161A73 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 @@ -61,9 +61,9 @@ EventScript_1619D4:: @ 81619D4 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_161AA1 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm @@ -133,7 +133,7 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 checkflag FLAG_GOT_LAPRAS_FROM_SILPH goto_if TRUE, EventScript_161B8D msgbox gUnknown_8176266 - setvar VAR_0x4001, SPECIES_LAPRAS + setvar VAR_TEMP_1, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 compare VAR_RESULT, 0 goto_if eq, EventScript_161B12 diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index cc9a3549a..dd3eb293a 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -4,10 +4,10 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 SixIsland_PatternBush_OnTransition:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH - getplayerxy VAR_0x4001, VAR_0x4002 - compare VAR_0x4001, 50 + getplayerxy VAR_TEMP_1, VAR_TEMP_2 + compare VAR_TEMP_1, 50 call_if ge, EventScript_16457E - compare VAR_0x4001, 49 + compare VAR_TEMP_1, 49 call_if le, EventScript_164587 end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 0fd043847..f1fe4883a 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -21,7 +21,7 @@ EventScript_1677CF:: @ 81677CF ThreeIsland_EventScript_1677D8:: @ 81677D8 lock - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 call EventScript_16786F release end @@ -32,7 +32,7 @@ ThreeIsland_EventScript_1677E5:: @ 81677E5 goto_if TRUE, EventScript_167806 compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if eq, EventScript_16781A - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 call EventScript_16786F release end @@ -64,36 +64,36 @@ EventScript_167865:: @ 8167865 end EventScript_16786F:: @ 816786F - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167947 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_167952 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167952 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_167931 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167931 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_167952 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167952 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 @@ -138,7 +138,7 @@ ThreeIsland_EventScript_167989:: @ 8167989 lock compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if eq, EventScript_1679A1 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call EventScript_16786F release end @@ -182,31 +182,31 @@ Movement_167A1B:: @ 8167A1B ThreeIsland_EventScript_167A1D:: @ 8167A1D lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_167A59 end ThreeIsland_EventScript_167A29:: @ 8167A29 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_167A59 end ThreeIsland_EventScript_167A35:: @ 8167A35 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_167A59 end ThreeIsland_EventScript_167A41:: @ 8167A41 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto EventScript_167A59 end ThreeIsland_EventScript_167A4D:: @ 8167A4D lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 goto EventScript_167A59 end @@ -256,15 +256,15 @@ EventScript_167A59:: @ 8167A59 msgbox gUnknown_81825E2 closemessage delay 45 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_167BC6 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167BD8 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_167BEA - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_167C03 - compare VAR_0x4001, 4 + compare VAR_TEMP_1, 4 call_if eq, EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json index a4da32612..43e5f14ad 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/UnknownMap_00_00/map.json @@ -49,7 +49,7 @@ "x": 3, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_00_EventScript_1BB8C3" }, @@ -58,7 +58,7 @@ "x": 10, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_00_EventScript_1BB8CF" } diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json index a427bdc14..3cf67c7b1 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/UnknownMap_00_01/map.json @@ -49,7 +49,7 @@ "x": 4, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_01_EventScript_1BB950" }, @@ -58,7 +58,7 @@ "x": 7, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_01_EventScript_1BB95C" } diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json index 611a3c092..8dc5e473f 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/UnknownMap_00_02/map.json @@ -63,7 +63,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_02_EventScript_1BB980" }, @@ -72,7 +72,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_02_EventScript_1BB980" }, @@ -81,7 +81,7 @@ "x": 13, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_02_EventScript_1BB980" }, @@ -90,7 +90,7 @@ "x": 13, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_02_EventScript_1BB980" } diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json index 2f9141fe6..52295b5ea 100644 --- a/data/maps/UnknownMap_00_03/map.json +++ b/data/maps/UnknownMap_00_03/map.json @@ -49,7 +49,7 @@ "x": 3, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_03_EventScript_1BB8DB" }, @@ -58,7 +58,7 @@ "x": 3, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_03_EventScript_1BB915" }, @@ -67,7 +67,7 @@ "x": 10, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_03_EventScript_1BB8F8" }, @@ -76,7 +76,7 @@ "x": 10, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_03_EventScript_1BB932" } diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 216206ad1..7398ea10b 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -225,7 +225,7 @@ "x": 22, "y": 32, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "VermilionCity_EventScript_166B98" }, @@ -234,7 +234,7 @@ "x": 23, "y": 32, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "VermilionCity_EventScript_166B98" } diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index edef5c0ae..676a4d3fa 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -44,8 +44,8 @@ EventScript_16B778:: @ 816B778 checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES goto_if TRUE, EventScript_1A77A9 special Special_SetVermilionTrashCans - copyvar VAR_0x4000, VAR_0x8004 - copyvar VAR_0x4001, VAR_0x8005 + copyvar VAR_TEMP_0, VAR_0x8004 + copyvar VAR_TEMP_1, VAR_0x8005 return VermilionCity_Gym_EventScript_16B78F:: @ 816B78F @@ -143,8 +143,8 @@ EventScript_16B843:: @ 816B843 compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - copyvar VAR_0x8004, VAR_0x4000 - copyvar VAR_0x8005, VAR_0x4001 + copyvar VAR_0x8004, VAR_TEMP_0 + copyvar VAR_0x8005, VAR_TEMP_1 checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES goto_if TRUE, EventScript_16B8E5 checkflag FLAG_TEMP_1 @@ -171,8 +171,8 @@ EventScript_16B89E:: @ 816B89E msgbox gUnknown_819536C clearflag FLAG_TEMP_1 special Special_SetVermilionTrashCans - copyvar VAR_0x4000, VAR_0x8004 - copyvar VAR_0x4001, VAR_0x8005 + copyvar VAR_TEMP_0, VAR_0x8004 + copyvar VAR_TEMP_1, VAR_0x8005 call EventScript_16B8EF special DrawWholeMapView releaseall diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 6db5e89ff..f20768d88 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,7 +1,7 @@ PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 lock faceplayer - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_if eq, EventScript_1BEE3A checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE goto_if TRUE, EventScript_1BEECD @@ -42,7 +42,7 @@ EventScript_1BEE9E:: @ 81BEE9E end EventScript_1BEEA8:: @ 81BEEA8 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setvar VAR_0x8004, 0 special Special_BufferEasyChatMessage waitmessage @@ -89,7 +89,7 @@ EventScript_1BEF35:: @ 81BEF35 end EventScript_1BEF3F:: @ 81BEF3F - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setvar VAR_0x8004, 0 special Special_BufferEasyChatMessage waitmessage diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index fe2baa17a..77409e539 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -30,9 +30,9 @@ EventScript_1A77F9:: @ 81A77F9 end EventScript_1A7803:: @ 81A7803 - compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 goto_if ge, EventScript_1A77EC - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_1A78D5 case 2, EventScript_1A78E4 case 3, EventScript_1A78F3 @@ -44,9 +44,9 @@ EventScript_1A7803:: @ 81A7803 end EventScript_1A786C:: @ 81A786C - compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 goto_if ge, EventScript_1A77F9 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_1A78D5 case 2, EventScript_1A78E4 case 3, EventScript_1A78F3 @@ -111,13 +111,13 @@ EventScript_1A794D:: @ 81A794D playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 release end EventScript_1A795F:: @ 81A795F msgbox Text_OnlyPassWithBadgeOhGoAhead - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 release end @@ -125,7 +125,7 @@ EventScript_1A796E:: @ 81A796E textcolor 0 applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft waitmovement 0 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_1A79D8 case 2, EventScript_1A79E7 case 3, EventScript_1A79F6 @@ -214,13 +214,13 @@ EventScript_1A7A96:: @ 81A7A96 playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 releaseall end EventScript_1A7AA8:: @ 81A7AA8 msgbox Text_OnlyPassWithBadgeOhGoAhead - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 releaseall end diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc index 07e1db17d..13c59caa7 100644 --- a/data/scripts/silphco_doors.inc +++ b/data/scripts/silphco_doors.inc @@ -348,7 +348,7 @@ EventScript_Open11FDoor:: @ 81A88ED SilphCo_2F_EventScript_Door1:: @ 81A891B lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setvar VAR_0x8004, 634 checkflag FLAG_SILPH_2F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -357,7 +357,7 @@ SilphCo_2F_EventScript_Door1:: @ 81A891B SilphCo_2F_EventScript_Door2:: @ 81A8935 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setvar VAR_0x8004, 635 checkflag FLAG_SILPH_2F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -366,7 +366,7 @@ SilphCo_2F_EventScript_Door2:: @ 81A8935 SilphCo_3F_EventScript_Door1:: @ 81A894F lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 setvar VAR_0x8004, 636 checkflag FLAG_SILPH_3F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -375,7 +375,7 @@ SilphCo_3F_EventScript_Door1:: @ 81A894F SilphCo_3F_EventScript_Door2:: @ 81A8969 lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 setvar VAR_0x8004, 637 checkflag FLAG_SILPH_3F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -384,7 +384,7 @@ SilphCo_3F_EventScript_Door2:: @ 81A8969 SilphCo_4F_EventScript_Door1:: @ 81A8983 lockall - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 setvar VAR_0x8004, 638 checkflag FLAG_SILPH_4F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -393,7 +393,7 @@ SilphCo_4F_EventScript_Door1:: @ 81A8983 SilphCo_4F_EventScript_Door2:: @ 81A899D lockall - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 setvar VAR_0x8004, 639 checkflag FLAG_SILPH_4F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -402,7 +402,7 @@ SilphCo_4F_EventScript_Door2:: @ 81A899D SilphCo_5F_EventScript_Door1:: @ 81A89B7 lockall - setvar VAR_0x4001, 7 + setvar VAR_TEMP_1, 7 setvar VAR_0x8004, 640 checkflag FLAG_SILPH_5F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -411,7 +411,7 @@ SilphCo_5F_EventScript_Door1:: @ 81A89B7 SilphCo_5F_EventScript_Door2:: @ 81A89D1 lockall - setvar VAR_0x4001, 8 + setvar VAR_TEMP_1, 8 setvar VAR_0x8004, 641 checkflag FLAG_SILPH_5F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -420,7 +420,7 @@ SilphCo_5F_EventScript_Door2:: @ 81A89D1 SilphCo_5F_EventScript_Door3:: @ 81A89EB lockall - setvar VAR_0x4001, 9 + setvar VAR_TEMP_1, 9 setvar VAR_0x8004, 642 checkflag FLAG_SILPH_5F_DOOR_3 goto_if TRUE, EventScript_DoorUnlocked @@ -429,7 +429,7 @@ SilphCo_5F_EventScript_Door3:: @ 81A89EB SilphCo_6F_EventScript_Door:: @ 81A8A05 lockall - setvar VAR_0x4001, 10 + setvar VAR_TEMP_1, 10 setvar VAR_0x8004, 643 checkflag FLAG_SILPH_6F_DOOR goto_if TRUE, EventScript_DoorUnlocked @@ -438,7 +438,7 @@ SilphCo_6F_EventScript_Door:: @ 81A8A05 SilphCo_7F_EventScript_Door1:: @ 81A8A1F lockall - setvar VAR_0x4001, 11 + setvar VAR_TEMP_1, 11 setvar VAR_0x8004, 644 checkflag FLAG_SILPH_7F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -447,7 +447,7 @@ SilphCo_7F_EventScript_Door1:: @ 81A8A1F SilphCo_7F_EventScript_Door2:: @ 81A8A39 lockall - setvar VAR_0x4001, 12 + setvar VAR_TEMP_1, 12 setvar VAR_0x8004, 645 checkflag FLAG_SILPH_7F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -456,7 +456,7 @@ SilphCo_7F_EventScript_Door2:: @ 81A8A39 SilphCo_7F_EventScript_Door3:: @ 81A8A53 lockall - setvar VAR_0x4001, 13 + setvar VAR_TEMP_1, 13 setvar VAR_0x8004, 646 checkflag FLAG_SILPH_7F_DOOR_3 goto_if TRUE, EventScript_DoorUnlocked @@ -465,7 +465,7 @@ SilphCo_7F_EventScript_Door3:: @ 81A8A53 SilphCo_8F_EventScript_Door:: @ 81A8A6D lockall - setvar VAR_0x4001, 14 + setvar VAR_TEMP_1, 14 setvar VAR_0x8004, 647 checkflag FLAG_SILPH_8F_DOOR goto_if TRUE, EventScript_DoorUnlocked @@ -474,7 +474,7 @@ SilphCo_8F_EventScript_Door:: @ 81A8A6D SilphCo_9F_EventScript_Door1:: @ 81A8A87 lockall - setvar VAR_0x4001, 15 + setvar VAR_TEMP_1, 15 setvar VAR_0x8004, 648 checkflag FLAG_SILPH_9F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -483,7 +483,7 @@ SilphCo_9F_EventScript_Door1:: @ 81A8A87 SilphCo_9F_EventScript_Door2:: @ 81A8AA1 lockall - setvar VAR_0x4001, 16 + setvar VAR_TEMP_1, 16 setvar VAR_0x8004, 649 checkflag FLAG_SILPH_9F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -492,7 +492,7 @@ SilphCo_9F_EventScript_Door2:: @ 81A8AA1 SilphCo_9F_EventScript_Door3:: @ 81A8ABB lockall - setvar VAR_0x4001, 17 + setvar VAR_TEMP_1, 17 setvar VAR_0x8004, 650 checkflag FLAG_SILPH_9F_DOOR_3 goto_if TRUE, EventScript_DoorUnlocked @@ -501,7 +501,7 @@ SilphCo_9F_EventScript_Door3:: @ 81A8ABB SilphCo_9F_EventScript_Door4:: @ 81A8AD5 lockall - setvar VAR_0x4001, 18 + setvar VAR_TEMP_1, 18 setvar VAR_0x8004, 651 checkflag FLAG_SILPH_9F_DOOR_4 goto_if TRUE, EventScript_DoorUnlocked @@ -510,7 +510,7 @@ SilphCo_9F_EventScript_Door4:: @ 81A8AD5 SilphCo_10F_EventScript_Door:: @ 81A8AEF lockall - setvar VAR_0x4001, 19 + setvar VAR_TEMP_1, 19 setvar VAR_0x8004, 652 checkflag FLAG_SILPH_10F_DOOR goto_if TRUE, EventScript_DoorUnlocked @@ -519,7 +519,7 @@ SilphCo_10F_EventScript_Door:: @ 81A8AEF SilphCo_11F_EventScript_Door:: @ 81A8B09 lockall - setvar VAR_0x4001, 20 + setvar VAR_TEMP_1, 20 setvar VAR_0x8004, 653 checkflag FLAG_SILPH_11F_DOOR goto_if TRUE, EventScript_DoorUnlocked @@ -536,45 +536,45 @@ EventScript_OpenDoor:: @ 81A8B32 playfanfare MUS_FANFA1 msgbox Text_CardKeyOpenedDoor waitfanfare - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_Open2FDoor1 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_Open2FDoor2 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_Open3FDoor1 - compare VAR_0x4001, 4 + compare VAR_TEMP_1, 4 call_if eq, EventScript_Open3FDoor2 - compare VAR_0x4001, 5 + compare VAR_TEMP_1, 5 call_if eq, EventScript_Open4FDoor1 - compare VAR_0x4001, 6 + compare VAR_TEMP_1, 6 call_if eq, EventScript_Open4FDoor2 - compare VAR_0x4001, 7 + compare VAR_TEMP_1, 7 call_if eq, EventScript_Open5FDoor1 - compare VAR_0x4001, 8 + compare VAR_TEMP_1, 8 call_if eq, EventScript_Open5FDoor2 - compare VAR_0x4001, 9 + compare VAR_TEMP_1, 9 call_if eq, EventScript_Open5FDoor3 - compare VAR_0x4001, 10 + compare VAR_TEMP_1, 10 call_if eq, EventScript_Open6FDoor - compare VAR_0x4001, 11 + compare VAR_TEMP_1, 11 call_if eq, EventScript_Open7FDoor1 - compare VAR_0x4001, 12 + compare VAR_TEMP_1, 12 call_if eq, EventScript_Open7FDoor2 - compare VAR_0x4001, 13 + compare VAR_TEMP_1, 13 call_if eq, EventScript_Open7FDoor3 - compare VAR_0x4001, 14 + compare VAR_TEMP_1, 14 call_if eq, EventScript_Open8FDoor - compare VAR_0x4001, 15 + compare VAR_TEMP_1, 15 call_if eq, EventScript_Open9FDoor1 - compare VAR_0x4001, 16 + compare VAR_TEMP_1, 16 call_if eq, EventScript_Open9FDoor2 - compare VAR_0x4001, 17 + compare VAR_TEMP_1, 17 call_if eq, EventScript_Open9FDoor3 - compare VAR_0x4001, 18 + compare VAR_TEMP_1, 18 call_if eq, EventScript_Open9FDoor4 - compare VAR_0x4001, 19 + compare VAR_TEMP_1, 19 call_if eq, EventScript_Open10FDoor - compare VAR_0x4001, 20 + compare VAR_TEMP_1, 20 call_if eq, EventScript_Open11FDoor waitse playse SE_KI_GASYAN diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index c3b3cdc2e..ffec7d4c8 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -8,7 +8,7 @@ SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54 SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54 SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54 SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 10 special sub_815D9E8 end @@ -31,15 +31,15 @@ SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62 setflag FLAG_TEMP_3 setflag FLAG_TEMP_4 setflag FLAG_TEMP_5 - setvar VAR_0x400E, 1 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_E, 1 + setvar VAR_TEMP_F, 1 end EventScript_1C4FA7:: @ 81C4FA7 setflag FLAG_TEMP_2 setflag FLAG_TEMP_4 setflag FLAG_TEMP_5 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 setobjectxyperm 3, 15, 13 setobjectmovementtype 3, 9 goto EventScript_1C5042 @@ -47,7 +47,7 @@ EventScript_1C4FA7:: @ 81C4FA7 EventScript_1C4FC5:: @ 81C4FC5 setflag FLAG_TEMP_3 setflag FLAG_TEMP_4 - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 setvar VAR_0x8004, 5 special sub_815D9E8 compare VAR_RESULT, 1 @@ -67,7 +67,7 @@ EventScript_1C4FFE:: @ 81C4FFE EventScript_1C5019:: @ 81C5019 setflag FLAG_TEMP_5 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 setobjectxyperm 2, 10, 10 setobjectmovementtype 2, 8 setobjectxyperm 3, 14, 13 @@ -88,17 +88,17 @@ SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046 SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046 SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046 SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046 - map_script_2 VAR_0x4002, 0, EventScript_1C5050 + map_script_2 VAR_TEMP_2, 0, EventScript_1C5050 .2byte 0 EventScript_1C5050:: @ 81C5050 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 setvar VAR_0x8004, 5 special sub_815D9E8 compare VAR_RESULT, 0 goto_if eq, EventScript_1C5072 - setvar VAR_0x400E, 1 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_E, 1 + setvar VAR_TEMP_F, 1 EventScript_1C5072: setvar VAR_0x8004, 18 special sub_815D9E8 @@ -124,7 +124,7 @@ EventScript_1C50C2: waitmovement 0 applymovement 3, Movement_Delay48 waitmovement 0 - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 applymovement 3, Movement_1C5541 waitmovement 0 setvar VAR_0x8004, 1 @@ -138,24 +138,24 @@ EventScript_1C50C2: EventScript_1C510D:: @ 81C510D setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_0x4003 + copyvar VAR_0x8006, VAR_TEMP_3 special sub_815D9E8 msgbox gStringVar4 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - addvar VAR_0x4003, 1 - compare VAR_0x4003, 1 + addvar VAR_TEMP_3, 1 + compare VAR_TEMP_3, 1 goto_if eq, EventScript_1C5146 - setvar VAR_0x4003, 0 + setvar VAR_TEMP_3, 0 EventScript_1C5146: - copyvar VAR_0x8006, VAR_0x4003 + copyvar VAR_0x8006, VAR_TEMP_3 special sub_815D9E8 msgbox gStringVar4 closemessage goto EventScript_1C5219 EventScript_1C515C:: @ 81C515C - switch VAR_0x4001 + switch VAR_TEMP_1 case 0, EventScript_1C5182 case 1, EventScript_1C51AD case 2, EventScript_1C51D8 @@ -193,7 +193,7 @@ EventScript_1C51D8:: @ 81C51D8 EventScript_1C51FE: setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_0x4001 + copyvar VAR_0x8006, VAR_TEMP_1 special sub_815D9E8 msgbox gStringVar4 closemessage @@ -215,16 +215,16 @@ EventScript_1C524D: case 1, EventScript_1C52BA case 2, EventScript_1C5280 EventScript_1C5280: - switch VAR_0x4001 + switch VAR_TEMP_1 case 0, EventScript_1C52A6 case 1, EventScript_1C52B0 case 2, EventScript_1C52D0 EventScript_1C52A6: - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 goto EventScript_1C515C EventScript_1C52B0:: @ 81C52B0 - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 goto EventScript_1C515C EventScript_1C52BA:: @ 81C52BA @@ -374,7 +374,7 @@ SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4 SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4 SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4 SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 - setvar VAR_0x4003, 0 + setvar VAR_TEMP_3, 0 setvar VAR_0x8004, 16 special sub_815D9E8 compare VAR_RESULT, 0 @@ -394,7 +394,7 @@ SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA - setvar VAR_0x4003, 1 + setvar VAR_TEMP_3, 1 setvar VAR_0x8004, 16 special sub_815D9E8 compare VAR_RESULT, 0 @@ -406,7 +406,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA applymovement 5, Movement_Delay48 EventScript_1C551B: waitmovement 0 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 goto EventScript_1C508F EventScript_1C5528:: @ 81C5528 diff --git a/include/constants/vars.h b/include/constants/vars.h index 5806b8c42..164ac7c7b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -6,22 +6,22 @@ #define VARS_START 0x4000 // Temporary variables. Reset on map load. -#define VAR_0x4000 0x4000 -#define VAR_0x4001 0x4001 -#define VAR_0x4002 0x4002 -#define VAR_0x4003 0x4003 -#define VAR_0x4004 0x4004 -#define VAR_0x4005 0x4005 -#define VAR_0x4006 0x4006 -#define VAR_0x4007 0x4007 -#define VAR_0x4008 0x4008 -#define VAR_0x4009 0x4009 -#define VAR_0x400A 0x400A -#define VAR_0x400B 0x400B -#define VAR_0x400C 0x400C -#define VAR_0x400D 0x400D -#define VAR_0x400E 0x400E -#define VAR_0x400F 0x400F +#define VAR_TEMP_0 0x4000 +#define VAR_TEMP_1 0x4001 +#define VAR_TEMP_2 0x4002 +#define VAR_TEMP_3 0x4003 +#define VAR_TEMP_4 0x4004 +#define VAR_TEMP_5 0x4005 +#define VAR_TEMP_6 0x4006 +#define VAR_TEMP_7 0x4007 +#define VAR_TEMP_8 0x4008 +#define VAR_TEMP_9 0x4009 +#define VAR_TEMP_A 0x400A +#define VAR_TEMP_B 0x400B +#define VAR_TEMP_C 0x400C +#define VAR_TEMP_D 0x400D +#define VAR_TEMP_E 0x400E +#define VAR_TEMP_F 0x400F // Object event graphics IDs which can be changed by // script commands. diff --git a/src/battle_tower.c b/src/battle_tower.c index c8098abf4..86ed75273 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -190,33 +190,33 @@ void ScrSpecial_BattleTowerMapScript2(void) case 0: ResetBattleTowerStreak(levelType); if (count == 0) - VarSet(VAR_0x4000, 5); + VarSet(VAR_TEMP_0, 5); break; case 1: ResetBattleTowerStreak(levelType); - VarSet(VAR_0x4000, BTSPECIAL_RESULT_SAVE_SCUM); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_SAVE_SCUM); count++; break; case 3: break; case 4: - VarSet(VAR_0x4000, BTSPECIAL_RESULT_WON7); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_WON7); count++; break; case 5: - VarSet(VAR_0x4000, BTSPECIAL_RESULT_LOST); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_LOST); count++; break; case 6: break; case 2: - VarSet(VAR_0x4000, BTSPECIAL_RESULT_QUICKSAVE); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_QUICKSAVE); count++; break; } } if (gSaveBlock2Ptr->battleTower.var_4AE[0] == 3 && gSaveBlock2Ptr->battleTower.var_4AE[1] == 3) - VarSet(VAR_0x4000, BTSPECIAL_RESULT_INACTIVE); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_INACTIVE); ValidateBattleTowerRecordChecksums(); } @@ -1150,7 +1150,7 @@ void SaveBattleTowerProgress(void) if (gSpecialVar_0x8004 != 3) gSaveBlock2Ptr->battleTower.var_4AE[battleTowerLevelType] = gSpecialVar_0x8004; - VarSet(VAR_0x4000, BTSPECIAL_TEST); + VarSet(VAR_TEMP_0, BTSPECIAL_TEST); gSaveBlock2Ptr->battleTower.unk_554 = 1; TrySavingData(SAVE_EREADER); } diff --git a/src/field_tasks.c b/src/field_tasks.c index 7ca6d0e7b..e39009a2e 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -213,7 +213,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId) PlaySE(SE_RU_GASYAN); MapGridSetMetatileIdAt(x, y, 0x35b); CurrentMapDrawMetatileAt(x, y); - VarSet(VAR_0x4001, 1); + VarSet(VAR_TEMP_1, 1); data[1] = 1; } break; diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 5d1b3fc62..60c6fd93d 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -463,7 +463,7 @@ void InitTrainerTowerBattleStruct(void) sub_815DC8C(); sTrainerTowerOpponent = AllocZeroed(sizeof(*sTrainerTowerOpponent)); - r10 = VarGet(VAR_0x4001); + r10 = VarGet(VAR_TEMP_1); StringCopyN(sTrainerTowerOpponent->name, sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].name, 11); for (r9 = 0; r9 < 6; r9++) @@ -494,7 +494,7 @@ void FreeTrainerTowerBattleStruct(void) void sub_815DBF4(u8 *dest, u8 opponentIdx) // TTower_GetBeforeBattleMessage? { - VarSet(VAR_0x4003, opponentIdx); + VarSet(VAR_TEMP_3, opponentIdx); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass); if (opponentIdx == 0) TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechWin, dest); @@ -505,7 +505,7 @@ void sub_815DBF4(u8 *dest, u8 opponentIdx) void sub_815DC40(u8 *dest, u8 opponentIdx) // TTower_GetAfterBattleMessage? { - VarSet(VAR_0x4003, opponentIdx); + VarSet(VAR_TEMP_3, opponentIdx); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass); if (opponentIdx == 0) TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose, dest); @@ -706,7 +706,7 @@ static void TrainerTowerGetOpponentTextColor(u8 battleType, u8 facilityClass) } if (r4 != NELEMS(sDoubleBattleTrainerInfo)) { - if (VarGet(VAR_0x4003)) + if (VarGet(VAR_TEMP_3)) r5 = sDoubleBattleTrainerInfo[r4].gender2; else r5 = sDoubleBattleTrainerInfo[r4].gender1; @@ -905,12 +905,12 @@ static void sub_815E720(void) PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); - VarSet(VAR_0x4001, windowId); + VarSet(VAR_TEMP_1, windowId); } static void sub_815E88C(void) { - u8 windowId = VarGet(VAR_0x4001); + u8 windowId = VarGet(VAR_TEMP_1); ClearStdWindowAndFrameToTransparent(windowId, TRUE); RemoveWindow(windowId); } @@ -948,7 +948,7 @@ static void sub_815E908(void) static void sub_815E948(void) { s32 i; - u16 var_4001 = VarGet(VAR_0x4001); + u16 var_4001 = VarGet(VAR_TEMP_1); u8 r1 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[var_4001].facilityClass; for (i = 0; i < NELEMS(sTrainerEncounterMusicLUT); i++) @@ -974,7 +974,7 @@ static void sub_815E9C8(void) static void BuildEnemyParty(void) { - u16 trainerIdx = VarGet(VAR_0x4001); + u16 trainerIdx = VarGet(VAR_TEMP_1); s32 level = GetPartyMaxLevel(); u8 floorIdx = gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8; s32 i; From 4a6f15ba24c159ad6cc1be1d7c8c636e416e80d6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 00:44:57 -0500 Subject: [PATCH 11/20] Sync event macros --- asm/macros/event.inc | 640 +++++--- data/event_scripts.s | 121 +- data/maps/BirthIsland_Exterior/scripts.inc | 22 +- .../CeladonCity_Condominiums_1F/scripts.inc | 11 +- .../CeladonCity_Condominiums_3F/scripts.inc | 4 +- .../scripts.inc | 12 +- .../scripts.inc | 4 +- .../scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 13 +- .../scripts.inc | 43 +- data/maps/CeladonCity_GameCorner/scripts.inc | 61 +- .../scripts.inc | 59 +- data/maps/CeladonCity_Gym/scripts.inc | 27 +- data/maps/CeladonCity_Restaurant/scripts.inc | 8 +- data/maps/CeruleanCave_B1F/scripts.inc | 16 +- data/maps/CeruleanCity/scripts.inc | 55 +- data/maps/CeruleanCity_BikeShop/scripts.inc | 13 +- data/maps/CeruleanCity_Gym/scripts.inc | 20 +- data/maps/CeruleanCity_House2/scripts.inc | 3 +- data/maps/CeruleanCity_House3/scripts.inc | 9 +- data/maps/CeruleanCity_House4/scripts.inc | 24 +- data/maps/CeruleanCity_House5/scripts.inc | 20 +- data/maps/CeruleanCity_Mart/scripts.inc | 2 +- data/maps/CinnabarIsland/scripts.inc | 48 +- data/maps/CinnabarIsland_Gym/scripts.inc | 177 +-- data/maps/CinnabarIsland_Mart/scripts.inc | 2 +- .../scripts.inc | 8 +- .../scripts.inc | 2 +- .../scripts.inc | 98 +- .../scripts.inc | 18 +- .../FiveIsland_LostCave_Room1/scripts.inc | 2 +- .../FiveIsland_LostCave_Room10/scripts.inc | 6 +- .../FiveIsland_LostCave_Room4/scripts.inc | 2 +- data/maps/FiveIsland_Meadow/scripts.inc | 15 +- .../FiveIsland_MemorialPillar/scripts.inc | 22 +- .../scripts.inc | 21 +- .../FiveIsland_RocketWarehouse/scripts.inc | 42 +- .../FiveIsland_WaterLabyrinth/scripts.inc | 20 +- data/maps/FourIsland/scripts.inc | 22 +- .../FourIsland_IcefallCave_Back/scripts.inc | 4 +- .../maps/FourIsland_LoreleisHouse/scripts.inc | 6 +- data/maps/FourIsland_Mart/scripts.inc | 2 +- .../FourIsland_PokemonDayCare/scripts.inc | 44 +- data/maps/FuchsiaCity/scripts.inc | 9 +- data/maps/FuchsiaCity_Building1/scripts.inc | 17 +- data/maps/FuchsiaCity_Gym/scripts.inc | 28 +- data/maps/FuchsiaCity_House2/scripts.inc | 10 +- data/maps/FuchsiaCity_House3/scripts.inc | 12 +- data/maps/FuchsiaCity_Mart/scripts.inc | 2 +- .../scripts.inc | 22 +- data/maps/IndigoPlateau_Exterior/scripts.inc | 2 +- .../scripts.inc | 12 +- data/maps/LavenderTown/scripts.inc | 2 +- data/maps/LavenderTown_House1/scripts.inc | 3 +- data/maps/LavenderTown_House2/scripts.inc | 20 +- data/maps/LavenderTown_Mart/scripts.inc | 2 +- .../scripts.inc | 11 +- data/maps/MtEmber_Exterior/scripts.inc | 26 +- data/maps/MtEmber_RubyPath_B3F/scripts.inc | 3 +- data/maps/MtEmber_Summit/scripts.inc | 16 +- data/maps/MtMoon_1F/scripts.inc | 14 +- data/maps/MtMoon_B2F/scripts.inc | 28 +- data/maps/NavelRock_Base/scripts.inc | 22 +- data/maps/NavelRock_Summit/scripts.inc | 22 +- data/maps/OneIsland/scripts.inc | 6 +- .../OneIsland_KindleRoad_EmberSpa/scripts.inc | 3 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 79 +- data/maps/PalletTown/scripts.inc | 41 +- data/maps/PalletTown_GarysHouse/scripts.inc | 30 +- .../PalletTown_PlayersHouse_1F/scripts.inc | 13 +- .../PalletTown_PlayersHouse_2F/scripts.inc | 4 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 242 ++- data/maps/PewterCity/scripts.inc | 42 +- data/maps/PewterCity_Gym/scripts.inc | 22 +- data/maps/PewterCity_Mart/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/scripts.inc | 28 +- .../PokemonLeague_AgathasRoom/scripts.inc | 24 +- .../maps/PokemonLeague_BrunosRoom/scripts.inc | 40 +- .../PokemonLeague_ChampionsRoom/scripts.inc | 56 +- .../maps/PokemonLeague_LancesRoom/scripts.inc | 24 +- .../PokemonLeague_LoreleisRoom/scripts.inc | 24 +- data/maps/PokemonMansion_1F/scripts.inc | 7 +- data/maps/PokemonMansion_2F/scripts.inc | 5 +- data/maps/PokemonMansion_3F/scripts.inc | 7 +- data/maps/PokemonMansion_B1F/scripts.inc | 7 +- data/maps/PokemonTower_1F/scripts.inc | 2 +- data/maps/PokemonTower_2F/scripts.inc | 20 +- data/maps/PokemonTower_3F/scripts.inc | 6 +- data/maps/PokemonTower_4F/scripts.inc | 6 +- data/maps/PokemonTower_5F/scripts.inc | 8 +- data/maps/PokemonTower_6F/scripts.inc | 10 +- data/maps/PokemonTower_7F/scripts.inc | 20 +- data/maps/PowerPlant/scripts.inc | 38 +- data/maps/RockTunnel_1F/scripts.inc | 14 +- data/maps/RockTunnel_B1F/scripts.inc | 16 +- data/maps/RocketHideout_B1F/scripts.inc | 12 +- data/maps/RocketHideout_B2F/scripts.inc | 2 +- data/maps/RocketHideout_B3F/scripts.inc | 4 +- data/maps/RocketHideout_B4F/scripts.inc | 34 +- data/maps/RocketHideout_Elevator/scripts.inc | 12 +- data/maps/Route1/scripts.inc | 7 +- .../maps/Route10_PokemonCenter_1F/scripts.inc | 12 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 24 +- data/maps/Route12/scripts.inc | 16 +- data/maps/Route12_FishingHouse/scripts.inc | 36 +- .../maps/Route12_NorthEntrance_2F/scripts.inc | 12 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 12 +- data/maps/Route16/scripts.inc | 18 +- data/maps/Route16_House/scripts.inc | 8 +- .../maps/Route16_NorthEntrance_1F/scripts.inc | 11 +- .../maps/Route16_NorthEntrance_2F/scripts.inc | 12 +- data/maps/Route18/scripts.inc | 2 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 11 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 9 +- data/maps/Route20/scripts.inc | 6 +- data/maps/Route22/scripts.inc | 42 +- data/maps/Route24/scripts.inc | 17 +- data/maps/Route25_SeaCottage/scripts.inc | 48 +- data/maps/Route2_EastBuilding/scripts.inc | 12 +- data/maps/Route2_House/scripts.inc | 9 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 23 +- data/maps/Route5_SouthEntrance/scripts.inc | 9 +- data/maps/Route6_NorthEntrance/scripts.inc | 9 +- data/maps/Route7_EastEntrance/scripts.inc | 9 +- data/maps/Route8_WestEntrance/scripts.inc | 9 +- data/maps/SSAnne_1F_Room2/scripts.inc | 4 +- data/maps/SSAnne_1F_Room4/scripts.inc | 2 +- data/maps/SSAnne_1F_Room5/scripts.inc | 2 +- data/maps/SSAnne_1F_Room6/scripts.inc | 4 +- data/maps/SSAnne_1F_Room7/scripts.inc | 2 +- data/maps/SSAnne_2F_Corridor/scripts.inc | 24 +- data/maps/SSAnne_2F_Room2/scripts.inc | 4 +- data/maps/SSAnne_2F_Room4/scripts.inc | 4 +- data/maps/SSAnne_B1F_Room1/scripts.inc | 4 +- data/maps/SSAnne_B1F_Room2/scripts.inc | 2 +- data/maps/SSAnne_B1F_Room3/scripts.inc | 2 +- data/maps/SSAnne_B1F_Room4/scripts.inc | 4 +- data/maps/SSAnne_CaptainsOffice/scripts.inc | 6 +- data/maps/SSAnne_Deck/scripts.inc | 4 +- data/maps/SSAnne_Exterior/scripts.inc | 4 +- data/maps/SSAnne_Kitchen/scripts.inc | 6 +- data/maps/SafariZone_SecretHouse/scripts.inc | 8 +- data/maps/SaffronCity/scripts.inc | 6 +- data/maps/SaffronCity_Dojo/scripts.inc | 35 +- data/maps/SaffronCity_Gym/scripts.inc | 30 +- data/maps/SaffronCity_House1_2F/scripts.inc | 8 +- data/maps/SaffronCity_House3/scripts.inc | 8 +- data/maps/SaffronCity_Mart/scripts.inc | 2 +- .../SaffronCity_PokemonCenter_1F/scripts.inc | 2 +- .../scripts.inc | 76 +- data/maps/SeafoamIslands_B3F/scripts.inc | 26 +- data/maps/SeafoamIslands_B4F/scripts.inc | 50 +- data/maps/SevenIsland_House_Room1/scripts.inc | 28 +- data/maps/SevenIsland_House_Room2/scripts.inc | 6 +- data/maps/SevenIsland_Mart/scripts.inc | 2 +- .../scripts.inc | 7 +- .../scripts.inc | 31 +- .../scripts.inc | 5 +- .../scripts.inc | 10 +- data/maps/SilphCo_10F/scripts.inc | 9 +- data/maps/SilphCo_11F/scripts.inc | 25 +- data/maps/SilphCo_2F/scripts.inc | 14 +- data/maps/SilphCo_3F/scripts.inc | 12 +- data/maps/SilphCo_4F/scripts.inc | 14 +- data/maps/SilphCo_5F/scripts.inc | 19 +- data/maps/SilphCo_6F/scripts.inc | 19 +- data/maps/SilphCo_7F/scripts.inc | 60 +- data/maps/SilphCo_8F/scripts.inc | 11 +- data/maps/SilphCo_9F/scripts.inc | 20 +- data/maps/SilphCo_Elevator/scripts.inc | 25 +- .../scripts.inc | 40 +- data/maps/SixIsland_Mart/scripts.inc | 2 +- data/maps/SixIsland_OutcastIsland/scripts.inc | 2 +- data/maps/SixIsland_PatternBush/scripts.inc | 28 +- .../SixIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SixIsland_RuinValley/scripts.inc | 8 +- .../SixIsland_WaterPath_House1/scripts.inc | 25 +- data/maps/ThreeIsland/scripts.inc | 64 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 4 +- .../ThreeIsland_DunsparceTunnel/scripts.inc | 11 +- data/maps/ThreeIsland_House5/scripts.inc | 3 +- data/maps/ThreeIsland_Mart/scripts.inc | 2 +- data/maps/ThreeIsland_Port/scripts.inc | 4 +- data/maps/TwoIsland/scripts.inc | 56 +- data/maps/TwoIsland_House/scripts.inc | 40 +- .../TwoIsland_JoyfulGameCorner/scripts.inc | 24 +- .../UndergroundPath_NorthEntrance/scripts.inc | 9 +- data/maps/VermilionCity/scripts.inc | 50 +- data/maps/VermilionCity_Gym/scripts.inc | 46 +- data/maps/VermilionCity_House1/scripts.inc | 11 +- data/maps/VermilionCity_House2/scripts.inc | 9 +- data/maps/VermilionCity_Mart/scripts.inc | 2 +- .../VermilionCity_PokemonFanClub/scripts.inc | 19 +- data/maps/VictoryRoad_1F/scripts.inc | 8 +- data/maps/VictoryRoad_2F/scripts.inc | 18 +- data/maps/VictoryRoad_3F/scripts.inc | 16 +- data/maps/ViridianCity/scripts.inc | 49 +- data/maps/ViridianCity_Gym/scripts.inc | 32 +- data/maps/ViridianCity_House2/scripts.inc | 6 +- data/maps/ViridianCity_Mart/scripts.inc | 10 +- data/maps/ViridianForest/scripts.inc | 10 +- data/mystery_event_msg.s | 21 +- data/scripts/cable_club.inc | 209 ++- data/scripts/day_care.inc | 24 +- data/scripts/field_moves.inc | 46 +- data/scripts/move_tutors.inc | 165 +- data/scripts/mystery_event_club.inc | 11 +- data/scripts/obtain_item.inc | 41 +- data/scripts/pc.inc | 19 +- data/scripts/pkmn_center_nurse.inc | 11 +- data/scripts/pokedex_rating.inc | 21 +- data/scripts/route23.inc | 52 +- data/scripts/seagallop.inc | 20 +- data/scripts/silphco_doors.inc | 103 +- data/scripts/std_msgbox.inc | 8 +- data/scripts/surf.inc | 6 +- data/scripts/trainer_battle.inc | 30 +- data/scripts/trainer_tower.inc | 12 +- data/scripts/trainers.inc | 1404 ++++++++--------- 220 files changed, 3209 insertions(+), 3580 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index c440e7079..53a9285e9 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -19,59 +19,52 @@ .endm @ Jumps to destination and continues script execution from there. The location of the calling script is remembered and can be returned to later. - .macro call destination + .macro call destination:req .byte 0x04 .4byte \destination .endm @ Jumps to destination and continues script execution from there. - .macro goto destination + .macro goto destination:req .byte 0x05 .4byte \destination .endm @ If the result of the last comparison matches condition (see Comparison operators), jumps to destination and continues script execution from there. - .macro goto_if condition, destination + .macro goto_if condition:req, destination:req .byte 0x06 .byte \condition .4byte \destination .endm - lt = 0 - eq = 1 - gt = 2 - le = 3 - ge = 4 - ne = 5 - @ If the result of the last comparison matches condition (see Comparison operators), calls destination. - .macro call_if condition, destination + .macro call_if condition:req, destination:req .byte 0x07 .byte \condition .4byte \destination .endm @ Jumps to the standard function at index function. - .macro gotostd function + .macro gotostd function:req .byte 0x08 .byte \function .endm @ Calls the standard function at index function. - .macro callstd function + .macro callstd function:req .byte 0x09 .byte \function .endm @ If the result of the last comparison matches condition (see Comparison operators), jumps to the standard function at index function. - .macro gotostd_if condition, function + .macro gotostd_if condition:req, function:req .byte 0x0a .byte \condition .byte \function .endm @ If the result of the last comparison matches condition (see Comparison operators), calls the standard function at index function. - .macro callstd_if condition, function + .macro callstd_if condition:req, function:req .byte 0x0b .byte \condition .byte \function @@ -88,146 +81,146 @@ .endm @ Sets mystery event status - .macro setmysteryeventstatus value + .macro setmysteryeventstatus value:req .byte 0x0e .byte \value .endm @ Sets the specified script bank to immediate value. - .macro loadword destination, value + .macro loadword destination:req, value:req .byte 0x0f .byte \destination .4byte \value .endm @ Sets the specified script bank to immediate value. - .macro loadbyte destination, value + .macro loadbyte destination:req, value:req .byte 0x10 .byte \destination .byte \value .endm @ Sets the byte at offset to value. - .macro writebytetoaddr value, offset + .macro writebytetoaddr value:req, offset:req .byte 0x11 .byte \value .4byte \offset .endm @ Copies the byte value at source into the specified script bank. - .macro loadbytefromaddr destination, source + .macro loadbytefromaddr destination:req, source:req .byte 0x12 .byte \destination .4byte \source .endm @ Not sure. Judging from XSE's description I think it takes the least-significant byte in bank source and writes it to destination. - .macro setptrbyte source, destination + .macro setptrbyte source:req, destination:req .byte 0x13 .byte \source .4byte \destination .endm @ Copies the contents of bank source into bank destination. - .macro copylocal destination, source + .macro copylocal destination:req, source:req .byte 0x14 .byte \destination .byte \source .endm @ Copies the byte at source to destination, replacing whatever byte was previously there. - .macro copybyte destination, source + .macro copybyte destination:req, source:req .byte 0x15 .4byte \destination .4byte \source .endm @ Changes the value of destination to value. - .macro setvar destination, value + .macro setvar destination:req, value:req .byte 0x16 .2byte \destination .2byte \value .endm @ Changes the value of destination by adding value to it. Overflow is not prevented (0xFFFF + 1 = 0x0000). - .macro addvar destination, value + .macro addvar destination:req, value:req .byte 0x17 .2byte \destination .2byte \value .endm @ Changes the value of destination by subtracting value to it. Overflow is not prevented (0x0000 - 1 = 0xFFFF). - .macro subvar destination, value + .macro subvar destination:req, value:req .byte 0x18 .2byte \destination .2byte \value .endm @ Copies the value of source into destination. - .macro copyvar destination, source + .macro copyvar destination:req, source:req .byte 0x19 .2byte \destination .2byte \source .endm @ If source is not a variable, then this function acts like setvar. Otherwise, it acts like copyvar. - .macro setorcopyvar destination, source + .macro setorcopyvar destination:req, source:req .byte 0x1a .2byte \destination .2byte \source .endm @ Compares the values of script banks a and b, after forcing the values to bytes. - .macro compare_local_to_local byte1, byte2 + .macro compare_local_to_local byte1:req, byte2:req .byte 0x1b .byte \byte1 .byte \byte2 .endm @ Compares the least-significant byte of the value of script bank a to a fixed byte value (b). - .macro compare_local_to_value a, b + .macro compare_local_to_value a:req, b:req .byte 0x1c .byte \a .byte \b .endm @ Compares the least-significant byte of the value of script bank a to the byte located at offset b. - .macro compare_local_to_addr a, b + .macro compare_local_to_addr a:req, b:req .byte 0x1d .byte \a .4byte \b .endm @ Compares the byte located at offset a to the least-significant byte of the value of script bank b. - .macro compare_addr_to_local a, b + .macro compare_addr_to_local a:req, b:req .byte 0x1e .4byte \a .byte \b .endm @ Compares the byte located at offset a to a fixed byte value (b). - .macro compare_addr_to_value a, b + .macro compare_addr_to_value a:req, b:req .byte 0x1f .4byte \a .byte \b .endm @ Compares the byte located at offset a to the byte located at offset b. - .macro compare_addr_to_addr a, b + .macro compare_addr_to_addr a:req, b:req .byte 0x20 .4byte \a .4byte \b .endm @ Compares the value of `var` to a fixed word value (b). - .macro compare_var_to_value var, value + .macro compare_var_to_value var:req, value:req .byte 0x21 .2byte \var .2byte \value .endm @ Compares the value of `var` to the value of `var2`. - .macro compare_var_to_var var1, var2 + .macro compare_var_to_var var1:req, var2:req .byte 0x22 .2byte \var1 .2byte \var2 @@ -244,25 +237,25 @@ .endm @ Calls the native C function stored at `func`. - .macro callnative func + .macro callnative func:req .byte 0x23 .4byte \func .endm @ Replaces the script with the function stored at `func`. Execution returns to the bytecode script when func returns TRUE. - .macro gotonative func + .macro gotonative func:req .byte 0x24 .4byte \func .endm @ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers. - .macro special function + .macro special function:req .byte 0x25 .2byte SPECIAL_\function .endm @ Calls a special function. That function's output (if any) will be written to the variable you specify. - .macro specialvar output, function + .macro specialvar output:req, function:req .byte 0x26 .2byte \output .2byte SPECIAL_\function @@ -274,31 +267,31 @@ .endm @ Blocks script execution for time (frames? milliseconds?). - .macro delay time + .macro delay time:req .byte 0x28 .2byte \time .endm @ Sets a to 1. - .macro setflag a + .macro setflag a:req .byte 0x29 .2byte \a .endm @ Sets a to 0. - .macro clearflag a + .macro clearflag a:req .byte 0x2a .2byte \a .endm @ Compares a to 1. - .macro checkflag a + .macro checkflag a:req .byte 0x2b .2byte \a .endm @ In FireRed, this command is a nop. - .macro initclock hour minute + .macro initclock hour:req minute:req .byte 0x2c .endm @@ -307,13 +300,13 @@ .byte 0x2d .endm - @ Resets the values of variables 0x8000, 0x8001, and 0x8002. + @ Resets the values of variables VAR_0x8000, VAR_0x8001, and VAR_0x8002. .macro gettime .byte 0x2e .endm @ Plays the specified (sound_number) sound. Only one sound may play at a time, with newer ones interrupting older ones. - .macro playse sound_number + .macro playse sound_number:req .byte 0x2f .2byte \sound_number .endm @@ -324,7 +317,7 @@ .endm @ Plays the specified (fanfare_number) fanfare. - .macro playfanfare fanfare_number + .macro playfanfare fanfare_number:req .byte 0x31 .2byte \fanfare_number .endm @@ -335,14 +328,14 @@ .endm @ Plays the specified (song_number) song. The byte is apparently supposed to be 0x00. - .macro playbgm song_number, unknown + .macro playbgm song_number:req, unknown:req .byte 0x33 .2byte \song_number .byte \unknown .endm @ Plays the specified (song_number) song. - .macro savebgm song_number + .macro savebgm song_number:req .byte 0x34 .2byte \song_number .endm @@ -353,188 +346,188 @@ .endm @ Crossfades the currently-playng song into the specified (song_number) song. - .macro fadenewbgm song_number + .macro fadenewbgm song_number:req .byte 0x36 .2byte \song_number .endm @ Fades out the currently-playing song. - .macro fadeoutbgm speed + .macro fadeoutbgm speed:req .byte 0x37 .byte \speed .endm @ Fades the currently-playing song back in. - .macro fadeinbgm speed + .macro fadeinbgm speed:req .byte 0x38 .byte \speed .endm - @ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, then the player will instead be sent to (X, Y) on the map. - .macro warp map, warp, X, Y + @ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, then the player will instead be sent to (x, y) on the map. + .macro warp map:req, warp:req, x:req, y:req .byte 0x39 map \map .byte \warp - .2byte \X - .2byte \Y + .2byte \x + .2byte \y .endm @ Clone of warp that does not play a sound effect. - .macro warpsilent map, warp, X, Y + .macro warpsilent map:req, warp:req, x:req, y:req .byte 0x3a map \map .byte \warp - .2byte \X - .2byte \Y + .2byte \x + .2byte \y .endm @ Clone of warp that uses "a walking effect". - .macro warpdoor map, warp, X, Y + .macro warpdoor map:req, warp:req, x:req, y:req .byte 0x3b map \map .byte \warp - .2byte \X - .2byte \Y + .2byte \x + .2byte \y .endm @ Warps the player to another map using a hole animation. - .macro warphole map + .macro warphole map:req .byte 0x3c map \map .endm @ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E.[source] - .macro warpteleport map, warp, X, Y + .macro warpteleport map:req, warp:req, x:req, y:req .byte 0x3d map \map .byte \warp - .2byte \X - .2byte \Y + .2byte \x + .2byte \y .endm @ Clone of warp. Used by an (unused?) Safari Zone script to return the player to the gatehouse and end the Safari Game. - .macro setwarp map, warp, X, Y + .macro setwarp map:req, warp:req, x:req, y:req .byte 0x3e map \map .byte \warp - .2byte \X - .2byte \Y + .2byte \x + .2byte \y .endm @ Sets a default warp place. If a warp tries to send the player to Warp 127 on Map 127.127, they will instead be sent here. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators). - .macro setdynamicwarp map, warp, X, Y + .macro setdynamicwarp map:req, warp:req, x:req, y:req .byte 0x3f map \map .byte \warp - .2byte \X - .2byte \Y + .2byte \x + .2byte \y .endm @ Clone of warp3, except that this writes data to different offsets... - .macro setdivewarp map, warp, X, Y + .macro setdivewarp map:req, warp:req, x:req, y:req .byte 0x40 map \map .byte \warp - .2byte \X - .2byte \Y + .2byte \x + .2byte \x .endm @ Clone of warp3, except that this writes data to different offsets... - .macro setholewarp map, warp, X, Y + .macro setholewarp map:req, warp:req, x:req, y:req .byte 0x41 map \map .byte \warp - .2byte \X - .2byte \Y + .2byte \x + .2byte \y .endm @ Retrieves the player's zero-indexed X- and Y-coordinates in the map, and stores them in the specified variables. - .macro getplayerxy X, Y + .macro getplayerxy x:req, y:req .byte 0x42 - .2byte \X - .2byte \Y + .2byte \x + .2byte \y .endm - @ Retrieves the number of Pokmon in the player's party, and stores that number in variable 0x800D (LASTRESULT). - .macro countpokemon + @ Retrieves the number of Pokemon in the player's party, and stores that number in VAR_RESULT. + .macro getpartysize .byte 0x43 .endm - @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000. - .macro additem index, quantity + @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE. + .macro additem index:req, quantity=1 .byte 0x44 .2byte \index .2byte \quantity .endm @ Removes quantity of item index from the player's Bag. - .macro removeitem index, quantity + .macro removeitem index:req, quantity:req .byte 0x45 .2byte \index .2byte \quantity .endm - @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. - .macro checkitemspace index, quantity + @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to TRUE if there is room, or FALSE is there is no room. + .macro checkitemspace index:req, quantity:req .byte 0x46 .2byte \index .2byte \quantity .endm - @ Checks if the player has quantity or more of item index in their Bag. Sets variable 0x800D (LASTRESULT) to 0x0001 if the player has enough of the item, or 0x0000 if they have fewer than quantity of the item. - .macro checkitem index, quantity + @ Checks if the player has quantity or more of item index in their Bag. Sets VAR_RESULT to TRUE if the player has enough of the item, or FALSE if they have fewer than quantity of the item. + .macro checkitem index:req, quantity:req .byte 0x47 .2byte \index .2byte \quantity .endm - @ Checks which Bag pocket the specified (index) item belongs in, and writes the value to variable 0x800D (LASTRESULT). This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE). - .macro checkitemtype index + @ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT. This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE). + .macro checkitemtype index:req .byte 0x48 .2byte \index .endm @ Adds a quantity amount of item index to the player's PC. Both arguments can be variables. - .macro givepcitem index, quantity + .macro givepcitem index:req, quantity:req .byte 0x49 .2byte \index .2byte \quantity .endm @ Checks for quantity amount of item index in the player's PC. Both arguments can be variables. - .macro checkpcitem index, quantity + .macro checkpcitem index:req, quantity:req .byte 0x4a .2byte \index .2byte \quantity .endm @ In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro adddecor decoration + .macro adddecor decoration:req .byte 0x4b .2byte \decoration .endm @ In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro removedecor decoration + .macro removedecor decoration:req .byte 0x4c .2byte \decoration .endm @ In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro hasdecor decoration + .macro hasdecor decoration:req .byte 0x4d .2byte \decoration .endm @ In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro checkdecor decoration + .macro checkdecor decoration:req .byte 0x4e .2byte \decoration .endm - @ Applies the movement data at movements to the specified (index) Person event. Also closes any standard message boxes that are still open. - @ This command in fact uses variables to access the Person event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Person event 3 will have the movements at @move1 applied to them. Thank you Shiny Quagsire for bringing this to my attention. - .macro applymovement index, movements, mapGroup, mapNum + @ Applies the movement data at movements to the specified (index) Object. Also closes any standard message boxes that are still open. + @ If no map is specified, then the current map is used. + .macro applymovement index:req, movements:req, mapGroup, mapNum .ifb \mapGroup .byte 0x4f .2byte \index @@ -548,22 +541,23 @@ .endif .endm - @ Blocks script execution until the movements being applied to the specified (index) Person event finish. If the specified Person event is 0x0000, then the command will block script execution until all Person events affected by applymovement finish their movements. If the specified Person event is not currently being manipulated with applymovement, then this command does nothing. - .macro waitmovement index, mapBank, mapNum - .ifb \mapBank + @ Blocks script execution until the movements being applied to the specified (index) Object finish. If the specified Object is 0x0000, then the command will block script execution until all Objects affected by applymovement finish their movements. If the specified Object is not currently being manipulated with applymovement, then this command does nothing. + @ If no map is specified, then the current map is used. + .macro waitmovement index:req, mapGroup, mapNum + .ifb \mapGroup .byte 0x51 .2byte \index .else .byte 0x52 .2byte \index - .byte \mapBank + .byte \mapGroup .byte \mapNum .endif .endm - @ Attempts to hide the specified (local_ID, a local ID) Person event on the specified map, by setting its visibility flag if it has a valid one. If the Person does not have a valid visibility flag, this command does nothing. - @ If no map is specified, then the current map is used - .macro removeobject localId, mapGroup, mapNum + @ Attempts to hide the specified (localId) Object on the specified (map_group, map_num) map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. + @ If no map is specified, then the current map is used. + .macro removeobject localId:req, mapGroup, mapNum .ifb \mapGroup .byte 0x53 .2byte \localId @@ -575,7 +569,7 @@ .endif .endm - .macro addobject localId, mapGroup, mapNum + .macro addobject localId:req, mapGroup, mapNum .ifb \mapGroup .byte 0x55 .2byte \localId @@ -588,20 +582,20 @@ .endm @ Sets the specified (index) Object's position on the current map. - .macro setobjectxy index, x, y + .macro setobjectxy index:req, x:req, y:req .byte 0x57 .2byte \index .2byte \x .2byte \y .endm - .macro showobject index, map + .macro showobject index:req, map:req .byte 0x58 .2byte \index map \map .endm - .macro hideobject index, map + .macro hideobject index:req, map:req .byte 0x59 .2byte \index map \map @@ -612,58 +606,103 @@ .byte 0x5a .endm - .macro turnobject index, direction + .macro turnobject index:req, direction:req .byte 0x5b .2byte \index .byte \direction .endm @ If the Trainer flag for Trainer index is not set, this command does absolutely nothing. - .macro trainerbattle type, trainer, word, pointer1, pointer2, pointer3, pointer4 + .macro trainerbattle type:req, trainer:req, word:req, pointer1:req, pointer2, pointer3, pointer4 .byte 0x5c .byte \type .2byte \trainer .2byte \word - .if \type == 0 + .if \type == TRAINER_BATTLE_SINGLE .4byte \pointer1 @ text .4byte \pointer2 @ text - .elseif \type == 1 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ event script - .elseif \type == 2 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ event script - .elseif \type == 3 + .elseif \type == TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT .4byte \pointer1 @ text - .elseif \type == 4 + .elseif \type == TRAINER_BATTLE_DOUBLE .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text - .elseif \type == 5 + .elseif \type == TRAINER_BATTLE_REMATCH .4byte \pointer1 @ text .4byte \pointer2 @ text - .elseif \type == 6 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script - .elseif \type == 7 + .elseif \type == TRAINER_BATTLE_REMATCH_DOUBLE .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text - .elseif \type == 8 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script - .elseif \type == 9 + .elseif \type == TRAINER_BATTLE_TUTORIAL .4byte \pointer1 @ text .4byte \pointer2 @ text .endif .endm + NO_MUSIC = FALSE + + @ Starts a single trainer battle, takes a trainer, intro text, loss text, and an optional event script + @ when used with an event script, you can also pass in an optional flag to disable music + .macro trainerbattle_single trainer:req, intro_text:req, lose_text:req, event_script=FALSE, music=TRUE + .if \event_script == FALSE + trainerbattle TRAINER_BATTLE_SINGLE, \trainer, 0, \intro_text, \lose_text + .elseif \music == TRUE + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, \trainer, 0, \intro_text, \lose_text, \event_script + .else + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \event_script + .endif + .endm + + @ Starts a double trainer battle, takes a trainer, intro text, loss text, text for when you have too few pokemon + @ and an optional event script, when used with an event script you can pass in an optional flag to disable music + .macro trainerbattle_double trainer:req, intro_text:req, lose_text:req, not_enough_pkmn_text:req, event_script=FALSE, music=TRUE + .if \event_script == FALSE + trainerbattle TRAINER_BATTLE_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text + .elseif \music == TRUE + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script + .else + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script + .endif + .endm + + @ Starts a rematch battle, takes a trainer, intro text and loss text + .macro trainerbattle_rematch trainer:req, intro_text:req, lose_text:req + trainerbattle TRAINER_BATTLE_REMATCH, \trainer, 0, \intro_text, \lose_text + .endm + + @ Starts a rematch double battle, takes a trainer, intro text, loss text, and text for when you have too few pokemon + .macro trainerbattle_rematch_double trainer:req, intro_text:req, lose_text:req, not_enough_pkmn_text:req + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text + .endm + + @ Starts a trainer battle, skipping intro text, takes a trainer and loss text + .macro trainerbattle_no_intro trainer:req, lose_text:req + trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, \trainer, 0, \lose_text + .endm + + @ + .macro trainerbattle_tutorial trainer:req, unk:req, intro_text:req, lose_text:req + trainerbattle TRAINER_BATTLE_TUTORIAL, \trainer, \unk, \intro_text, \lose_text + .endm @ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes. .macro battlebegin @@ -679,36 +718,36 @@ .endm @ Compares Flag (trainer + 0x500) to 1. (If the flag is set, then the trainer has been defeated by the player.) - .macro checktrainerflag trainer + .macro checktrainerflag trainer:req .byte 0x60 .2byte \trainer .endm @ Sets Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.) - .macro settrainerflag trainer + .macro settrainerflag trainer:req .byte 0x61 .2byte \trainer .endm @ Clears Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.) - .macro cleartrainerflag trainer + .macro cleartrainerflag trainer:req .byte 0x62 .2byte \trainer .endm - .macro setobjectxyperm index, x, y + .macro setobjectxyperm index:req, x:req, y:req .byte 0x63 .2byte \index .2byte \x .2byte \y .endm - .macro moveobjectoffscreen index + .macro moveobjectoffscreen index:req .byte 0x64 .2byte \index .endm - .macro setobjectmovementtype word, byte + .macro setobjectmovementtype word:req, byte:req .byte 0x65 .2byte \word .byte \byte @@ -720,7 +759,7 @@ .endm @ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.) - .macro message text + .macro message text:req .byte 0x67 .4byte \text .endm @@ -755,15 +794,15 @@ .byte 0x6d .endm - @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES". - .macro yesnobox x, y + @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in VAR_RESULT as NO (0) or YES (1). Pressing B is equivalent to answering NO + .macro yesnobox x:req, y:req .byte 0x6e .byte \x .byte \y .endm @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro multichoice x, y, list, b + .macro multichoice x:req, y:req, list:req, b:req .byte 0x6f .byte \x .byte \y @@ -772,7 +811,7 @@ .endm @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro multichoicedefault x, y, list, default, b + .macro multichoicedefault x:req, y:req, list:req, default:req, b:req .byte 0x70 .byte \x .byte \y @@ -782,20 +821,20 @@ .endm @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box. - .macro multichoicegrid x, y, list, per_row, B + .macro multichoicegrid x:req, y:req, list:req, per_row:req, b:req .byte 0x71 .byte \x .byte \y .byte \list .byte \per_row - .byte \B + .byte \b .endm .macro drawbox .byte 0x72 .endm - .macro erasebox byte1, byte2, byte3, byte4 + .macro erasebox byte1:req, byte2:req, byte3:req, byte4:req .byte 0x73 .byte \byte1 .byte \byte2 @@ -808,7 +847,7 @@ .endm @ Displays a box containing the front sprite for the specified (species) Pokemon species. - .macro drawmonpic species, x, y + .macro drawmonpic species:req, x:req, y:req .byte 0x75 .2byte \species .byte \x @@ -821,132 +860,128 @@ .endm @ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.) - .macro drawcontestwinner a + .macro drawcontestwinner a:req .byte 0x77 .byte \a .endm @ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille characters. - .macro braillemessage text + .macro braillemessage text:req .byte 0x78 .4byte \text .endm - @ RENAMED! - @ Gives the player one of the specified (species) Pokmon at level level holding item. The unknown arguments should all be zeroes. - .macro givemon species, level, item, unknown1, unknown2, unknown3 + @ Gives the player one of the specified (species) Pokemon at level level holding item. The trailing 0s are unused parameters + .macro givemon species:req, level:req, item:req .byte 0x79 .2byte \species .byte \level .2byte \item - .4byte \unknown1 - .4byte \unknown2 - .byte \unknown3 + .4byte 0x0 + .4byte 0x0 + .byte 0 .endm - .macro giveegg species + .macro giveegg species:req .byte 0x7a .2byte \species .endm - @ RENAMED! - .macro setmonmove byte1, byte2, word + .macro setmonmove byte1:req, byte2:req, word:req .byte 0x7b .byte \byte1 .byte \byte2 .2byte \word .endm - @ Checks if at least one Pokémon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokémon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokémon's species. - .macro checkpartymove index + @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, VAR_RESULT is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, VAR_RESULT is set to PARTY_SIZE. VAR_0x8004 is also set to this Pokemon's species. + .macro checkpartymove index:req .byte 0x7c .2byte \index .endm @ Writes the name of the Pokemon at index species to the specified buffer. - .macro getspeciesname out, species + .macro getspeciesname out:req, species:req .byte 0x7d .byte \out .2byte \species .endm - @ RENAMED! @ Writes the name of the species of the first Pokémon in the player's party to the specified buffer. - .macro getfirstpartymonname out + .macro getfirstpartymonname out:req .byte 0x7e .byte \out .endm - @ RENAMED! @ Writes the nickname of the Pokemon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer. - .macro getpartymonname out, slot + .macro getpartymonname out:req, slot:req .byte 0x7f .byte \out .2byte \slot .endm @ Writes the name of the item at index item to the specified buffer. If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead. - .macro getitemname out, item + .macro getitemname out:req, item:req .byte 0x80 .byte \out .2byte \item .endm @ Writes the name of the decoration at index decoration to the specified buffer. In FireRed, this command is a nop. - .macro getdecorname out, decoration + .macro getdecorname out:req, decoration:req .byte 0x81 .byte \out .2byte \decoration .endm @ Writes the name of the move at index move to the specified buffer. - .macro getmovename out, move + .macro getmovename out:req, move:req .byte 0x82 .byte \out .2byte \move .endm @ Converts the value of input to a decimal string, and writes that string to the specified buffer. - .macro getnumberstring out, input + .macro getnumberstring out:req, input:req .byte 0x83 .byte \out .2byte \input .endm @ Writes the standard string identified by index to the specified buffer. This command has no protections in place at all, so specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption. - .macro getstdstring out, index + .macro getstdstring out:req, index:req .byte 0x84 .byte \out .2byte \index .endm @ Copies the string at offset to the specified buffer. - .macro getstring out, offset + .macro getstring out:req, offset:req .byte 0x85 .byte \out .4byte \offset .endm @ Opens the Pokemart system, offering the specified products for sale. - .macro pokemart products + .macro pokemart products:req .byte 0x86 .4byte \products .endm - @ Apparent clone of pokemart. - .macro pokemartdecor products + @ Opens the Pokemart system and treats the list of items as decorations. + .macro pokemartdecor products:req .byte 0x87 .4byte \products .endm @ Apparent clone of pokemart. - .macro pokemartbp products + .macro pokemartbp products:req .byte 0x88 .4byte \products .endm @ Starts up the slot machine minigame. - .macro playslotmachine word + .macro playslotmachine word:req .byte 0x89 .2byte \word .endm @@ -976,35 +1011,35 @@ .byte 0x8e .endm - @ Stores a random integer between 0 and limit in variable 0x800D (LASTRESULT). - .macro random limit + @ Stores a random integer between 0 and limit in VAR_RESULT. + .macro random limit:req .byte 0x8f .2byte \limit .endm @ If check is 0x00, this command adds value to the player's money. - .macro givemoney value, check + .macro givemoney value:req, check:req .byte 0x90 .4byte \value .byte \check .endm @ If check is 0x00, this command subtracts value from the player's money. - .macro takemoney value, check + .macro takemoney value:req, check:req .byte 0x91 .4byte \value .byte \check .endm - @ If check is 0x00, this command will check if the player has value or more money; script variable 0x800D (LASTRESULT) is set to 0x0001 if the player has enough money, or 0x0000 if the do not. - .macro checkmoney value, check + @ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player has enough money, or FALSE if they do not. + .macro checkmoney value:req, check:req .byte 0x92 .4byte \value .byte \check .endm @ Spawns a secondary box showing how much money the player has. - .macro showmoneybox x, y, check + .macro showmoneybox x:req, y:req, check:req .byte 0x93 .byte \x .byte \y @@ -1014,14 +1049,14 @@ @ Hides the secondary box spawned by showmoney. @ The two arguments are unused. @ They are retained here for backwards compatibility with Ruby/Sapphire. - .macro hidemoneybox x, y + .macro hidemoneybox x:req, y:req .byte 0x94 .byte \x .byte \y .endm @ Updates the secondary box spawned by showmoney. Consumes but does not use arguments. - .macro updatemoneybox x, y, check + .macro updatemoneybox x:req, y:req, check:req .byte 0x95 .byte \x .byte \y @@ -1034,72 +1069,72 @@ .endm @ Fades the screen to black or back, using the specified effect. Effect 0x00 fades in, and effect 0x01 fades out. I don't know if other effects exist. - .macro fadescreen effect + .macro fadescreen effect:req .byte 0x97 .byte \effect .endm @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. Other modes may exist. - .macro fadescreenspeed effect, speed + .macro fadescreenspeed effect:req, speed:req .byte 0x98 .byte \effect .byte \speed .endm - .macro setflashradius word + .macro setflashradius word:req .byte 0x99 .2byte \word .endm - .macro animateflash byte + .macro animateflash byte:req .byte 0x9a .byte \byte .endm - .macro messageautoscroll pointer + .macro messageautoscroll pointer:req .byte 0x9b .4byte \pointer .endm @ Executes the specified field move animation. - .macro dofieldeffect animation + .macro dofieldeffect animation:req .byte 0x9c .2byte \animation .endm @ Sets up the field effect argument argument with the value value. - .macro setfieldeffectarg argument, param + .macro setfieldeffectarg argument:req, param:req .byte 0x9d .byte \argument .2byte \param .endm @ Blocks script execution until all playing field move animations complete. - .macro waitfieldeffect animation + .macro waitfieldeffect animation:req .byte 0x9e .2byte \animation .endm @ Sets which healing place the player will return to if all of the Pokemon in their party faint. - .macro setrespawn flightspot + .macro setrespawn heallocation:req .byte 0x9f - .2byte \flightspot + .2byte \heallocation .endm - @ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT. + @ Checks the player's gender. If male, then MALE (0) is stored in VAR_RESULT. If female, then FEMALE (1) is stored in VAR_RESULT. .macro checkplayergender .byte 0xa0 .endm @ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes. - .macro playmoncry species, effect + .macro playmoncry species:req, effect:req .byte 0xa1 .2byte \species .2byte \effect .endm @ Changes the metatile at (x, y) on the current map. - .macro setmetatile x, y, metatile_number, tile_attrib + .macro setmetatile x:req, y:req, metatile_number:req, tile_attrib:req .byte 0xa2 .2byte \x .2byte \y @@ -1113,7 +1148,7 @@ .endm @ Queues a weather change to type weather. - .macro setweather type + .macro setweather type:req .byte 0xa4 .2byte \type .endm @@ -1124,30 +1159,30 @@ .endm @ This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors). - .macro setstepcallback subroutine + .macro setstepcallback subroutine:req .byte 0xa6 .byte \subroutine .endm - .macro setmaplayoutindex index + .macro setmaplayoutindex index:req .byte 0xa7 .2byte \index .endm - .macro setobjectpriority index, map, priority + .macro setobjectpriority index:req, map:req, priority:req .byte 0xa8 .2byte \index map \map .byte \priority .endm - .macro resetobjectpriority index, map + .macro resetobjectpriority index:req, map:req .byte 0xa9 .2byte \index map \map .endm - .macro createvobject sprite, byte2, x, y, elevation, direction + .macro createvobject sprite:req, byte2:req, x:req, y:req, elevation:req, direction:req .byte 0xaa .byte \sprite .byte \byte2 @@ -1157,21 +1192,21 @@ .byte \direction .endm - .macro turnvobject index, direction + .macro turnvobject index:req, direction:req .byte 0xab .byte \index .byte \direction .endm @ Opens the door metatile at (X, Y) with an animation. - .macro opendoor x, y + .macro opendoor x:req, y:req .byte 0xac .2byte \x .2byte \y .endm @ Closes the door metatile at (X, Y) with an animation. - .macro closedoor x, y + .macro closedoor x:req, y:req .byte 0xad .2byte \x .2byte \y @@ -1183,14 +1218,14 @@ .endm @ Sets the door tile at (x, y) to be open without an animation. - .macro setdooropen x, y + .macro setdooropen x:req, y:req .byte 0xaf .2byte \x .2byte \y .endm @ Sets the door tile at (x, y) to be closed without an animation. - .macro setdoorclosed2 x, y + .macro setdoorclosed2 x:req, y:req .byte 0xb0 .2byte \x .2byte \y @@ -1206,23 +1241,23 @@ .byte 0xb2 .endm - .macro checkcoins out + .macro checkcoins out:req .byte 0xb3 .2byte \out .endm - .macro givecoins count + .macro givecoins count:req .byte 0xb4 .2byte \count .endm - .macro takecoins word + .macro takecoins word:req .byte 0xb5 .2byte \word .endm @ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle. - .macro setwildbattle species, level, item + .macro setwildbattle species:req, level:req, item:req .byte 0xb6 .2byte \species .byte \level @@ -1234,78 +1269,78 @@ .byte 0xb7 .endm - .macro setvaddress long + .macro setvaddress long:req .byte 0xb8 .4byte \long .endm - .macro vgoto pointer + .macro vgoto pointer:req .byte 0xb9 .4byte \pointer .endm - .macro vcall pointer + .macro vcall pointer:req .byte 0xba .4byte \pointer .endm - .macro vgoto_if byte, pointer + .macro vgoto_if byte:req, pointer:req .byte 0xbb .byte \byte .4byte \pointer .endm - .macro vcall_if byte, pointer + .macro vcall_if byte:req, pointer:req .byte 0xbc .byte \byte .4byte \pointer .endm - .macro vmessage pointer + .macro vmessage pointer:req .byte 0xbd .4byte \pointer .endm - .macro vloadptr pointer + .macro vloadptr pointer:req .byte 0xbe .4byte \pointer .endm - .macro vbufferstring byte, pointer + .macro vbufferstring byte:req, pointer:req .byte 0xbf .byte \byte .4byte \pointer .endm @ Spawns a secondary box showing how many Coins the player has. - .macro showcoinsbox x, y + .macro showcoinsbox x:req, y:req .byte 0xc0 .byte \x .byte \y .endm @ Hides the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. - .macro hidecoinsbox x, y + .macro hidecoinsbox x:req, y:req .byte 0xc1 .byte \x .byte \y .endm @ Updates the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. - .macro updatecoinsbox x, y + .macro updatecoinsbox x:req, y:req .byte 0xc2 .byte \x .byte \y .endm @ Increases the value of the specified game stat by 1. The stat's value will not be allowed to exceed 0x00FFFFFF. - .macro incrementgamestat stat + .macro incrementgamestat stat:req .byte 0xc3 .byte \stat .endm @ Sets the destination that using an Escape Rope or Dig will take the player to. - .macro setescapewarp map, warp, x, y + .macro setescapewarp map:req, warp:req, x:req, y:req .byte 0xc4 map \map .byte \warp @@ -1319,20 +1354,20 @@ .endm @ Writes the name of the specified (box) PC box to the specified buffer. - .macro bufferboxname out, box + .macro bufferboxname out:req, box:req .byte 0xc6 .byte \out .2byte \box .endm @ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, 0xFF resets the color to the default for the current OW's gender, and all other values produce black text. - .macro textcolor color + .macro textcolor color:req .byte 0xc7 .byte \color .endm @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened. - .macro loadhelp pointer + .macro loadhelp pointer:req .byte 0xc8 .4byte \pointer .endm @@ -1353,20 +1388,20 @@ .endm @ Compares the value of a hidden variable to a dword. - .macro comparehiddenvar a, value + .macro comparehiddenvar a:req, value:req .byte 0xcc .byte \a .4byte \value .endm @ Makes the Pokemon in the specified slot of the player's party obedient. It will not randomly disobey orders in battle. - .macro setmonobedient slot + .macro setmonobedient slot:req .byte 0xcd .2byte \slot .endm - @ Checks if the Pokemon in the specified slot of the player's party is obedient. If the Pokemon is disobedient, 0x0001 is written to script variable 0x800D (LASTRESULT). If the Pokemon is obedient (or if the specified slot is empty or invalid), 0x0000 is written. - .macro checkmonobedience slot + @ Checks if the Pokemon in the specified slot of the player's party is obedient. If the Pokemon is disobedient, VAR_RESULT is TRUE. If the Pokemon is obedient (or if the specified slot is empty or invalid), VAR_RESULT is FALSE. + .macro checkmonobedience slot:req .byte 0xce .2byte \slot .endm @@ -1377,13 +1412,13 @@ .endm @ Sets worldmapflag to 1. This allows the player to Fly to the corresponding map, if that map has a flightspot. - .macro setworldmapflag worldmapflag + .macro setworldmapflag worldmapflag:req .byte 0xd0 .2byte \worldmapflag .endm @ Clone of warpteleport? It is apparently only used in FR/LG, and only with specials.[source] - .macro warpteleport2 map, warp, x, y + .macro warpteleport2 map:req, warp:req, x:req, y:req .byte 0xd1 map \map .byte \warp @@ -1392,18 +1427,18 @@ .endm @ Changes the location where the player caught the Pokemon in the specified slot of their party. - .macro setmonmetlocation slot, location + .macro setmonmetlocation slot:req, location:req .byte 0xd2 .2byte \slot .byte \location .endm - .macro getbraillestringwidth pointer + .macro getbraillestringwidth pointer:req .byte 0xd3 .4byte \pointer .endm - .macro bufferitemnameplural out, item, quantity + .macro bufferitemnameplural out:req, item:req, quantity:req .byte 0xd4 .byte \out .2byte \item @@ -1413,63 +1448,152 @@ @ Supplementary - .macro goto_if_eq dest - goto_if eq, \dest + .macro goto_if_unset flag:req, dest:req + checkflag \flag + goto_if FALSE, \dest .endm - .macro switch var - copyvar 0x8000, \var + .macro goto_if_set flag:req, dest:req + checkflag \flag + goto_if TRUE, \dest .endm - .macro case condition, dest - compare_var_to_value VAR_0x8000, \condition + .macro goto_if_lt dest:req @ LESS THAN + goto_if 0, \dest + .endm + + .macro goto_if_eq dest:req @ EQUAL + goto_if 1, \dest + .endm + + .macro goto_if_gt dest:req @ GREATER THAN + goto_if 2, \dest + .endm + + .macro goto_if_le dest:req @ LESS THAN OR EQUAL + goto_if 3, \dest + .endm + + .macro goto_if_ge dest:req @ GREATER THAN OR EQUAL + goto_if 4, \dest + .endm + + .macro goto_if_ne dest:req @ NOT EQUAL + goto_if 5, \dest + .endm + + .macro call_if_unset flag:req, dest:req + checkflag \flag + call_if FALSE, \dest + .endm + + .macro call_if_set flag:req, dest:req + checkflag \flag + call_if TRUE, \dest + .endm + + .macro call_if_lt dest:req @ LESS THAN + call_if 0, \dest + .endm + + .macro call_if_eq dest:req @ EQUAL + call_if 1, \dest + .endm + + .macro call_if_gt dest:req @ GREATER THAN + call_if 2, \dest + .endm + + .macro call_if_le dest:req @ LESS THAN OR EQUAL + call_if 3, \dest + .endm + + .macro call_if_ge dest:req @ GREATER THAN OR EQUAL + call_if 4, \dest + .endm + + .macro call_if_ne dest:req @ NOT EQUAL + call_if 5, \dest + .endm + + .macro vgoto_if_eq dest:req + vgoto_if TRUE, \dest + .endm + + .macro vgoto_if_ne dest:req + vgoto_if FALSE, \dest + .endm + + .macro vgoto_if_set flag:req, dest:req + checkflag \flag + vgoto_if TRUE, \dest + .endm + + .macro vgoto_if_unset flag:req, dest:req + checkflag \flag + vgoto_if FALSE, \dest + .endm + + .macro switch var:req + copyvar VAR_0x8000, \var + .endm + + .macro case condition:req, dest:req + compare VAR_0x8000, \condition goto_if_eq \dest .endm - .macro msgbox text, type=4 + .macro msgbox text:req, type=MSGBOX_DEFAULT loadword 0, \text callstd \type .endm - @ Message box types + @ Callstd ids + STD_OBTAIN_ITEM = 0 + STD_FIND_ITEM = 1 + MSGBOX_NPC = 2 MSGBOX_SIGN = 3 MSGBOX_DEFAULT = 4 MSGBOX_YESNO = 5 MSGBOX_AUTOCLOSE = 6 + STD_OBTAIN_DECOR = 7 + STD_PUT_ITEM_AWAY = 8 + STD_RECEIVED_ITEM = 9 + YES = 1 NO = 0 - @ Other callstd function names - STD_OBTAIN_ITEM = 0 - STD_FIND_ITEM = 1 - STD_PUT_ITEM_AWAY = 8 - - .macro giveitem item, amount=1 - setorcopyvar 0x8000, \item - setorcopyvar 0x8001, \amount + .macro giveitem item:req, amount=1 + setorcopyvar VAR_0x8000, \item + setorcopyvar VAR_0x8001, \amount callstd STD_OBTAIN_ITEM .endm - .macro finditem item, amount=1 - setorcopyvar 0x8000, \item - setorcopyvar 0x8001, \amount + .macro finditem item:req, amount=1 + setorcopyvar VAR_0x8000, \item + setorcopyvar VAR_0x8001, \amount callstd STD_FIND_ITEM .endm - .macro putitemaway item, amount=1 - setorcopyvar 0x8000, \item - setorcopyvar 0x8001, \amount + .macro putitemaway item:req, amount=1 + setorcopyvar VAR_0x8000, \item + setorcopyvar VAR_0x8001, \amount callstd STD_PUT_ITEM_AWAY .endm - .macro giveitemfanfaremsg msg, item, amount=1, fanfare=MUS_FANFA1 + .macro giveitem_msg msg:req, item:req, amount=1, fanfare=MUS_FANFA1 + additem \item, \amount + msgreceiveditem \msg, \item, \amount, \fanfare + .endm + + .macro msgreceiveditem msg:req, item:req, amount=1, fanfare=MUS_FANFA1 loadword 0, \msg - setorcopyvar 0x8000, \item - setorcopyvar 0x8001, \amount - setorcopyvar 0x8002, \fanfare - callstd 9 + setorcopyvar VAR_0x8000, \item + setorcopyvar VAR_0x8001, \amount + setorcopyvar VAR_0x8002, \fanfare + callstd STD_RECEIVED_ITEM .endm .macro famechecker person:req, index:req, function=SetFlavorTextFlagFromSpecialVars diff --git a/data/event_scripts.s b/data/event_scripts.s index 2ff7dc61a..5aa68edf4 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -68,7 +68,7 @@ gStdScripts:: @ 8160450 .4byte Std_MsgboxAutoclose .4byte Std_ObtainDecoration .4byte Std_PutItemAway - .4byte gStdScript_ItemMessageAndFanfare + .4byte Std_ReceivedItem gStdScriptsEnd:: .include "data/maps/UnknownMap_00_00/scripts.inc" @@ -1175,7 +1175,7 @@ EventScript_1A651A:: @ 81A651A special sub_81130A8 specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 0 - call_if eq, EventScript_1A653B + call_if_eq EventScript_1A653B call EventScript_1A6541 return @@ -1258,7 +1258,7 @@ gUnknown_81A6C32:: @ 81A6C32 msgbox Text_ATownMap special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 fadescreen 1 special Special_TownMap waitstate @@ -1503,7 +1503,7 @@ gUnknown_81A7702:: @ 81A7702 textcolor 3 msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1A778A + goto_if_eq EventScript_1A778A setvar VAR_0x8004, 14 call EventScript_1A6AC0 lock @@ -1511,11 +1511,11 @@ gUnknown_81A7702:: @ 81A7702 specialvar VAR_0x8008, Special_GetMartClerkObjectId textcolor 0 compare VAR_0x8004, 0 - goto_if eq, EventScript_1A774D + goto_if_eq EventScript_1A774D compare VAR_RESULT, 0 - goto_if eq, EventScript_1A778A + goto_if_eq EventScript_1A778A compare VAR_RESULT, 1 - goto_if eq, EventScript_1A778C + goto_if_eq EventScript_1A778C end EventScript_1A774D:: @ 81A774D @@ -1610,10 +1610,9 @@ EventScript_1A7AE0:: @ 81A7AE0 EventScript_1A7AE2:: @ 81A7AE2 msgbox Text_177460, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1A7B70 + goto_if_eq EventScript_1A7B70 msgbox Text_17747B - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - goto_if TRUE, EventScript_1A7B3B + goto_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B3B setflag FLAG_POKEMON_MANSION_SWITCH_STATE switch VAR_0x8004 case 0, EventScript_1A7B7A @@ -1836,7 +1835,7 @@ EventScript_1A80FE:: @ 81A80FE .include "data/scripts/silphco_doors.inc" EventScript_1A8C27:: @ 81A8C27 - countpokemon + getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT return @@ -1852,16 +1851,14 @@ EventScript_1A8C33:: @ 81A8C33 EventScript_1A8C3C:: @ 81A8C3C bufferboxname 0, VAR_0x4037 getspeciesname 1, VAR_TEMP_1 - checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if FALSE, EventScript_1A8C57 - checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if TRUE, EventScript_1A8C82 + call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C57 + call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C82 return EventScript_1A8C57:: @ 81A8C57 specialvar VAR_RESULT, sub_80CC7B4 compare VAR_RESULT, 1 - goto_if eq, EventScript_1A8C70 + goto_if_eq EventScript_1A8C70 msgbox Text_1A5CF1 return @@ -1874,7 +1871,7 @@ EventScript_1A8C70:: @ 81A8C70 EventScript_1A8C82:: @ 81A8C82 specialvar VAR_RESULT, sub_80CC7B4 compare VAR_RESULT, 1 - goto_if eq, EventScript_1A8C9B + goto_if_eq EventScript_1A8C9B msgbox Text_1A5D31 return @@ -1993,13 +1990,12 @@ ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 lock faceplayer - checkflag FLAG_GOT_VS_SEEKER - goto_if TRUE, EventScript_1A8D3F + goto_if_set FLAG_GOT_VS_SEEKER, EventScript_1A8D3F msgbox Text_194234 setflag FLAG_GOT_VS_SEEKER giveitem ITEM_VS_SEEKER compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 msgbox Text_19430F release end @@ -2015,9 +2011,9 @@ EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 waitse call EventScript_GiveItem compare VAR_0x8007, 1 - goto_if eq, EventScript_DigUpItemPutInPocket + goto_if_eq EventScript_DigUpItemPutInPocket compare VAR_0x8007, 0 - goto_if eq, EventScript_DigUpItemBagIsFull + goto_if_eq EventScript_DigUpItemBagIsFull end EventScript_DigUpItemPutInPocket:: @@ -2042,10 +2038,8 @@ EventScript_AfterWhiteOutHeal:: @ 81A8D97 textcolor 1 msgbox Text_1A5E89 call EventScript_PkmnCenterNurse_TakeAndHealPkmn - checkflag FLAG_DEFEATED_BROCK - call_if FALSE, EventScript_1A8DC6 - checkflag FLAG_DEFEATED_BROCK - call_if TRUE, EventScript_1A8DCF + call_if_unset FLAG_DEFEATED_BROCK, EventScript_1A8DC6 + call_if_set FLAG_DEFEATED_BROCK, EventScript_1A8DCF applymovement VAR_LAST_TALKED, Movement_1A666C waitmovement 0 fadedefaultbgm @@ -2078,16 +2072,16 @@ EventScript_PoisonWhiteOut:: @ 81A8DFD special ExecuteWhiteOut waitstate compare VAR_RESULT, 1 - goto_if eq, EventScript_1A8E11 + goto_if_eq EventScript_1A8E11 releaseall end EventScript_1A8E11:: @ 81A8E11 checkmoney 1, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A8E2E + goto_if_eq EventScript_1A8E2E compare VAR_RESULT, 1 - goto_if eq, EventScript_1A8E3C + goto_if_eq EventScript_1A8E3C end EventScript_1A8E2E:: @ 81A8E2E @@ -2149,8 +2143,7 @@ EventScript_1A8EC0:: @ 81A8EC0 .include "data/scripts/static_pokemon.inc" EventScript_1A925E:: @ 81A925E - checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_1A77A9 setweather 11 doweather return @@ -2186,10 +2179,10 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 showmoneybox 0, 0, 0 msgbox gUnknown_81B1D7D, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1B2926 + goto_if_eq EventScript_1B2926 checkmoney 50, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_1B292B + goto_if_eq EventScript_1B292B playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 @@ -2258,10 +2251,8 @@ EventScript_1B292B:: @ 81B292B FourIsland_House2_EventScript_1B2938:: @ 81B2938 lock specialvar VAR_0x8008, Special_StickerLadyGetBragFlags - checkflag FLAG_MET_STICKER_LADY - goto_if FALSE, EventScript_1B2951 - checkflag FLAG_MET_STICKER_LADY - goto_if TRUE, EventScript_1B2994 + goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951 + goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994 end EventScript_1B2951:: @ 81B2951 @@ -2275,7 +2266,7 @@ EventScript_1B2951:: @ 81B2951 applymovement 1, Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 - goto_if eq, EventScript_1B2B8E + goto_if_eq EventScript_1B2B8E message gUnknown_81B1EF8 waitmessage goto EventScript_1B29D0 @@ -2288,10 +2279,10 @@ EventScript_1B2994:: @ 81B2994 waitmovement 0 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 compare VAR_0x8008, 0 - goto_if eq, EventScript_1B29C6 + goto_if_eq EventScript_1B29C6 message gUnknown_81B2025 waitmessage goto EventScript_1B29D0 @@ -2383,18 +2374,18 @@ EventScript_1B2B8E:: @ 81B2B8E EventScript_1B2B98:: @ 81B2B98 compare VAR_0x8004, 39 - goto_if le, EventScript_1B2BC5 + goto_if_le EventScript_1B2BC5 compare VAR_0x8004, 99 - goto_if le, EventScript_1B2BE3 + goto_if_le EventScript_1B2BE3 compare VAR_0x8004, 199 - goto_if le, EventScript_1B2C01 + goto_if_le EventScript_1B2C01 compare VAR_0x8004, 200 - goto_if ge, EventScript_1B2C1F + goto_if_ge EventScript_1B2C1F end EventScript_1B2BC5:: @ 81B2BC5 compare VAR_HOF_BRAG_STATE, 1 - goto_if eq, EventScript_1B2C3D + goto_if_eq EventScript_1B2C3D setvar VAR_HOF_BRAG_STATE, 1 msgbox gUnknown_81B206E goto EventScript_1B2C51 @@ -2404,7 +2395,7 @@ EventScript_1B2BE2:: @ 81B2BE2 EventScript_1B2BE3:: @ 81B2BE3 compare VAR_HOF_BRAG_STATE, 2 - goto_if eq, EventScript_1B2C3D + goto_if_eq EventScript_1B2C3D setvar VAR_HOF_BRAG_STATE, 2 msgbox gUnknown_81B20CF goto EventScript_1B2C51 @@ -2414,7 +2405,7 @@ EventScript_1B2C00:: @ 81B2C00 EventScript_1B2C01:: @ 81B2C01 compare VAR_HOF_BRAG_STATE, 3 - goto_if eq, EventScript_1B2C3D + goto_if_eq EventScript_1B2C3D setvar VAR_HOF_BRAG_STATE, 3 msgbox gUnknown_81B2133 goto EventScript_1B2C51 @@ -2424,7 +2415,7 @@ EventScript_1B2C1E:: @ 81B2C1E EventScript_1B2C1F:: @ 81B2C1F compare VAR_HOF_BRAG_STATE, 4 - goto_if eq, EventScript_1B2C47 + goto_if_eq EventScript_1B2C47 setvar VAR_HOF_BRAG_STATE, 4 msgbox gUnknown_81B21C4 goto EventScript_1B2C51 @@ -2454,18 +2445,18 @@ EventScript_1B2C51:: @ 81B2C51 EventScript_1B2C62:: @ 81B2C62 compare VAR_0x8005, 99 - goto_if le, EventScript_1B2C8F + goto_if_le EventScript_1B2C8F compare VAR_0x8005, 199 - goto_if le, EventScript_1B2CAD + goto_if_le EventScript_1B2CAD compare VAR_0x8005, 299 - goto_if le, EventScript_1B2CCB + goto_if_le EventScript_1B2CCB compare VAR_0x8005, 300 - goto_if ge, EventScript_1B2CE9 + goto_if_ge EventScript_1B2CE9 end EventScript_1B2C8F:: @ 81B2C8F compare VAR_EGG_BRAG_STATE, 1 - goto_if eq, EventScript_1B2D07 + goto_if_eq EventScript_1B2D07 setvar VAR_EGG_BRAG_STATE, 1 msgbox gUnknown_81B2308 goto EventScript_1B2D1B @@ -2475,7 +2466,7 @@ EventScript_1B2CAC:: @ 81B2CAC EventScript_1B2CAD:: @ 81B2CAD compare VAR_EGG_BRAG_STATE, 2 - goto_if eq, EventScript_1B2D07 + goto_if_eq EventScript_1B2D07 setvar VAR_EGG_BRAG_STATE, 2 msgbox gUnknown_81B2372 goto EventScript_1B2D1B @@ -2485,7 +2476,7 @@ EventScript_1B2CCA:: @ 81B2CCA EventScript_1B2CCB:: @ 81B2CCB compare VAR_EGG_BRAG_STATE, 3 - goto_if eq, EventScript_1B2D07 + goto_if_eq EventScript_1B2D07 setvar VAR_EGG_BRAG_STATE, 3 msgbox gUnknown_81B23E0 goto EventScript_1B2D1B @@ -2495,7 +2486,7 @@ EventScript_1B2CE8:: @ 81B2CE8 EventScript_1B2CE9:: @ 81B2CE9 compare VAR_EGG_BRAG_STATE, 4 - goto_if eq, EventScript_1B2D11 + goto_if_eq EventScript_1B2D11 setvar VAR_EGG_BRAG_STATE, 4 msgbox gUnknown_81B2448 goto EventScript_1B2D1B @@ -2525,18 +2516,18 @@ EventScript_1B2D1B:: @ 81B2D1B EventScript_1B2D2C:: @ 81B2D2C compare VAR_0x8006, 19 - goto_if le, EventScript_1B2D59 + goto_if_le EventScript_1B2D59 compare VAR_0x8006, 49 - goto_if le, EventScript_1B2D77 + goto_if_le EventScript_1B2D77 compare VAR_0x8006, 99 - goto_if le, EventScript_1B2D95 + goto_if_le EventScript_1B2D95 compare VAR_0x8006, 100 - goto_if ge, EventScript_1B2DB3 + goto_if_ge EventScript_1B2DB3 end EventScript_1B2D59:: @ 81B2D59 compare VAR_LINK_WIN_BRAG_STATE, 1 - goto_if eq, EventScript_1B2DD1 + goto_if_eq EventScript_1B2DD1 setvar VAR_LINK_WIN_BRAG_STATE, 1 msgbox gUnknown_81B25A7 goto EventScript_1B2DE5 @@ -2546,7 +2537,7 @@ EventScript_1B2D76:: @ 81B2D76 EventScript_1B2D77:: @ 81B2D77 compare VAR_LINK_WIN_BRAG_STATE, 2 - goto_if eq, EventScript_1B2DD1 + goto_if_eq EventScript_1B2DD1 setvar VAR_LINK_WIN_BRAG_STATE, 2 msgbox gUnknown_81B2609 goto EventScript_1B2DE5 @@ -2556,7 +2547,7 @@ EventScript_1B2D94:: @ 81B2D94 EventScript_1B2D95:: @ 81B2D95 compare VAR_LINK_WIN_BRAG_STATE, 3 - goto_if eq, EventScript_1B2DD1 + goto_if_eq EventScript_1B2DD1 setvar VAR_LINK_WIN_BRAG_STATE, 3 msgbox gUnknown_81B267B goto EventScript_1B2DE5 @@ -2566,7 +2557,7 @@ EventScript_1B2DB2:: @ 81B2DB2 EventScript_1B2DB3:: @ 81B2DB3 compare VAR_LINK_WIN_BRAG_STATE, 4 - goto_if eq, EventScript_1B2DDB + goto_if_eq EventScript_1B2DDB setvar VAR_LINK_WIN_BRAG_STATE, 4 msgbox gUnknown_81B26F6 goto EventScript_1B2DE5 @@ -2626,7 +2617,7 @@ EventScript_SafariRetire:: @ 81BFBAA lockall msgbox Text_1BFBE9, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if eq, EventScript_1BFBC0 + goto_if_eq EventScript_1BFBC0 releaseall end diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 582d33d57..8d12c5458 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -13,10 +13,8 @@ BirthIsland_Exterior_OnTransition:: @ 8165217 setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 setvar VAR_DEOXYS_INTERACTION_NUM, 0 - checkflag FLAG_FOUGHT_DEOXYS - call_if TRUE, EventScript_16523C - checkflag FLAG_FOUGHT_DEOXYS - call_if FALSE, EventScript_165243 + call_if_set FLAG_FOUGHT_DEOXYS, EventScript_16523C + call_if_unset FLAG_FOUGHT_DEOXYS, EventScript_165243 end EventScript_16523C:: @ 816523C @@ -25,21 +23,19 @@ EventScript_16523C:: @ 816523C return EventScript_165243:: @ 8165243 - checkflag FLAG_DEOXYS_FLEW_AWAY - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_1A77A9 clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE clearflag FLAG_SYS_DEOXYS_AWAKENED return BirthIsland_Exterior_OnResume:: @ 8165253 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_16525D + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_16525D end EventScript_16525D:: @ 816525D specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject 2 return @@ -48,7 +44,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 faceplayer special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special Special_DeoxysSound waitstate @@ -97,11 +93,11 @@ EventScript_1652C0:: @ 81652C0 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16533A + goto_if_eq EventScript_16533A compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_165348 + goto_if_eq EventScript_165348 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_165348 + goto_if_eq EventScript_165348 setflag FLAG_FOUGHT_DEOXYS release end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 11a685e53..f5afb1851 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -4,17 +4,14 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 lock faceplayer - checkflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF - goto_if TRUE, EventScript_16C36A - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_16C374 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16C36A + goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374 + goto_if_set FLAG_GOT_TEA, EventScript_16C36A msgbox gUnknown_81960C9 setflag FLAG_GOT_TEA giveitem ITEM_TEA compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 msgbox gUnknown_8196109 release end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 5bdf8bf20..e8d1bef2b 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -18,7 +18,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 faceplayer specialvar VAR_RESULT, HasAllKantoMons compare VAR_RESULT, 1 - goto_if eq, EventScript_16C412 + goto_if_eq EventScript_16C412 msgbox gUnknown_8196356 release end @@ -33,7 +33,7 @@ EventScript_16C418:: @ 816C418 delay 60 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special Special_ShowDiploma waitstate release diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 2e6e09d48..4271cff79 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -9,13 +9,13 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D lock faceplayer setvar VAR_TEMP_1, SPECIES_EEVEE - givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 + givemon SPECIES_EEVEE, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if eq, EventScript_16C4A6 + goto_if_eq EventScript_16C4A6 compare VAR_RESULT, 1 - goto_if eq, EventScript_16C4DA + goto_if_eq EventScript_16C4DA compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C release end @@ -28,7 +28,7 @@ EventScript_16C4A6:: @ 816C4A6 getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16C514 + goto_if_eq EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16C514 @@ -43,7 +43,7 @@ EventScript_16C4DA:: @ 816C4DA getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16C509 + goto_if_eq EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 end diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index a9a7ec544..24cc47519 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou @@ -44,7 +44,7 @@ Items_16BB38:: @ 816BB38 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index c55eee6b7..57d7469a6 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 19f21c149..88aced082 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou @@ -42,7 +42,7 @@ Items_16BC84:: @ 816BC84 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 06963d348..8a3d77577 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -4,8 +4,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_1A535C @@ -62,7 +61,7 @@ EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 4 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 4 goto EventScript_16C30E @@ -72,7 +71,7 @@ EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 5 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 5 goto EventScript_16C30E @@ -82,7 +81,7 @@ EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 6 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 6 goto EventScript_16C30E @@ -92,7 +91,7 @@ EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 7 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 7 goto EventScript_16C30E @@ -102,7 +101,7 @@ EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 8 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 8 goto EventScript_16C30E diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 0668a0287..e6341f5d9 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -4,13 +4,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer call EventScript_16BCF6 compare VAR_TEMP_1, 0 - goto_if eq, EventScript_16C00E + goto_if_eq EventScript_16C00E goto EventScript_16BD3E end @@ -18,13 +18,13 @@ EventScript_16BCF6:: @ 816BCF6 setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 compare VAR_RESULT, 1 - call_if eq, EventScript_16BD2C + call_if_eq EventScript_16BD2C checkitem ITEM_SODA_POP, 1 compare VAR_RESULT, 1 - call_if eq, EventScript_16BD32 + call_if_eq EventScript_16BD32 checkitem ITEM_LEMONADE, 1 compare VAR_RESULT, 1 - call_if eq, EventScript_16BD38 + call_if_eq EventScript_16BD38 return EventScript_16BD2C:: @ 816BD2C @@ -42,7 +42,7 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16C00C + goto_if_eq EventScript_16C00C textcolor 3 message Text_195D5F waitmessage @@ -121,8 +121,7 @@ EventScript_16BED7:: @ 816BED7 EventScript_16BF19:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 - checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195D75 goto EventScript_16BF7C end @@ -130,8 +129,7 @@ EventScript_16BF19:: @ 816BF19 EventScript_16BF3A:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 - checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195E33 goto EventScript_16BF7C end @@ -139,8 +137,7 @@ EventScript_16BF3A:: @ 816BF3A EventScript_16BF5B:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 - checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195EBF goto EventScript_16BF7C end @@ -151,8 +148,8 @@ EventScript_16BF7C:: @ 816BF7C removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16C002 - additem VAR_0x8009, 1 + goto_if_eq EventScript_16C002 + additem VAR_0x8009 textcolor 3 playfanfare MUS_FANFA1 message Text_ReceivedItemFromLittleGirl @@ -161,11 +158,11 @@ EventScript_16BF7C:: @ 816BF7C putitemaway VAR_0x8009 call EventScript_1A6675 compare VAR_0x8008, ITEM_FRESH_WATER - call_if eq, EventScript_16BFDE + call_if_eq EventScript_16BFDE compare VAR_0x8008, ITEM_SODA_POP - call_if eq, EventScript_16BFEA + call_if_eq EventScript_16BFEA compare VAR_0x8008, ITEM_LEMONADE - call_if eq, EventScript_16BFF6 + call_if_eq EventScript_16BFF6 release end @@ -262,21 +259,21 @@ EventScript_16C0C4:: @ 816C0C4 EventScript_16C0CB:: @ 816C0CB compare VAR_RESULT, 0 - goto_if eq, EventScript_16C131 + goto_if_eq EventScript_16C131 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16C13F + goto_if_eq EventScript_16C13F compare VAR_TEMP_1, 0 - call_if eq, EventScript_16C0B6 + call_if_eq EventScript_16C0B6 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16C0BD + call_if_eq EventScript_16C0BD compare VAR_TEMP_1, 2 - call_if eq, EventScript_16C0C4 + call_if_eq EventScript_16C0C4 updatemoneybox 0, 0, 0 getitemname 0, VAR_TEMP_0 playse SE_JIHANKI msgbox gUnknown_8196076 - additem VAR_TEMP_0, 1 + additem VAR_TEMP_0 goto EventScript_16C125 end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index eb242f2e6..17756a332 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -3,8 +3,7 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 .byte 0 CeladonCity_GameCorner_OnLoad:: @ 816C64C - checkflag FLAG_OPENED_ROCKET_HIDEOUT - call_if FALSE, EventScript_16C656 + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656 end EventScript_16C656:: @ 816C656 @@ -22,7 +21,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 @@ -39,21 +38,20 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D end EventScript_16C6E6:: @ 816C6E6 - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C790 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790 compare VAR_0x8009, 0 - goto_if eq, EventScript_16C734 + goto_if_eq EventScript_16C734 compare VAR_0x8009, 1 - goto_if eq, EventScript_16C706 + goto_if_eq EventScript_16C706 end EventScript_16C706:: @ 816C706 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9500 - goto_if ge, EventScript_16C79E + goto_if_ge EventScript_16C79E checkmoney 10000, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16C7AC + goto_if_eq EventScript_16C7AC givecoins 500 takemoney 10000, 0 goto EventScript_16C762 @@ -62,10 +60,10 @@ EventScript_16C706:: @ 816C706 EventScript_16C734:: @ 816C734 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9950 - goto_if ge, EventScript_16C79E + goto_if_ge EventScript_16C79E checkmoney 1000, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16C7AC + goto_if_eq EventScript_16C7AC givecoins 50 takemoney 1000, 0 goto EventScript_16C762 @@ -129,14 +127,12 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 lock faceplayer - checkflag FLAG_GOT_10_COINS_FROM_GAMBLER - goto_if TRUE, EventScript_16C849 + goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849 msgbox gUnknown_8196AF3 - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C839 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9990 - goto_if ge, EventScript_16C82B + goto_if_ge EventScript_16C82B givecoins 10 textcolor 3 msgbox gUnknown_8196B0D @@ -165,8 +161,7 @@ EventScript_16C849:: @ 816C849 CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 lock faceplayer - checkflag FLAG_DEFEATED_ERIKA - goto_if TRUE, EventScript_16C870 + goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870 msgbox gUnknown_8196BAD goto EventScript_16C7CA end @@ -193,14 +188,12 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E lock faceplayer - checkflag FLAG_GOT_20_COINS_FROM_GAMBLER - goto_if TRUE, EventScript_16C8F0 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0 msgbox gUnknown_8196D2B - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C839 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9980 - goto_if ge, EventScript_16C8E2 + goto_if_ge EventScript_16C8E2 givecoins 20 textcolor 3 msgbox gUnknown_8196D47 @@ -223,14 +216,12 @@ EventScript_16C8F0:: @ 816C8F0 CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE lock faceplayer - checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 - goto_if TRUE, EventScript_16C950 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950 msgbox gUnknown_8196DB7 - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C839 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9980 - goto_if ge, EventScript_16C942 + goto_if_ge EventScript_16C942 givecoins 20 textcolor 3 msgbox gUnknown_8196DF8 @@ -261,11 +252,10 @@ EventScript_16C96A:: @ 816C96A end EventScript_16C96C:: @ 816C96C - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CAA0 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16C96A + goto_if_eq EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 @@ -410,8 +400,7 @@ EventScript_16CAA0:: @ 816CAA0 CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA lockall msgbox gUnknown_8196EDC - checkflag FLAG_OPENED_ROCKET_HIDEOUT - call_if FALSE, EventScript_16CABE + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE releaseall end @@ -427,7 +416,7 @@ EventScript_16CABE:: @ 816CABE return CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10 msgbox gUnknown_8196E9B, 6 end @@ -435,9 +424,9 @@ EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16CB34 + call_if_eq EventScript_16CB34 compare VAR_FACING, DIR_WEST - call_if ne, EventScript_16CB3F + call_if_ne EventScript_16CB3F removeobject 11 release end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 92987068e..7eb986640 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -12,11 +12,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CBB2 @@ -110,10 +109,10 @@ EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16CC10 + goto_if_eq EventScript_16CC10 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if lt, EventScript_16CDA5 + goto_if_lt EventScript_16CDA5 textcolor 3 switch VAR_TEMP_1 case SPECIES_ABRA, EventScript_16CCD4 @@ -126,10 +125,10 @@ EventScript_16CC65:: @ 816CC65 EventScript_16CCD4:: @ 816CCD4 .ifdef FIRERED - givemon VAR_TEMP_1, 9, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 9, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 7, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 7, ITEM_NONE .endif .endif goto EventScript_16CD52 @@ -137,10 +136,10 @@ EventScript_16CCD4:: @ 816CCD4 EventScript_16CCE9:: @ 816CCE9 .ifdef FIRERED - givemon VAR_TEMP_1, 8, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 8, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 12, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 12, ITEM_NONE .endif .endif goto EventScript_16CD52 @@ -148,43 +147,43 @@ EventScript_16CCE9:: @ 816CCE9 EventScript_16CCFE:: @ 816CCFE .ifdef FIRERED - givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 24, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 24, ITEM_NONE .endif .endif goto EventScript_16CD52 end EventScript_16CD13:: @ 816CD13 - givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 25, ITEM_NONE goto EventScript_16CD52 end EventScript_16CD28:: @ 816CD28 .ifdef FIRERED - givemon VAR_TEMP_1, 26, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 26, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE .endif .endif goto EventScript_16CD52 end EventScript_16CD3D:: @ 816CD3D - givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE goto EventScript_16CD52 end EventScript_16CD52:: @ 816CD52 compare VAR_RESULT, 0 - goto_if eq, EventScript_16CDB3 + goto_if_eq EventScript_16CDB3 compare VAR_RESULT, 1 - goto_if eq, EventScript_16CDE0 + goto_if_eq EventScript_16CDE0 compare VAR_RESULT, 2 - goto_if eq, EventScript_16CD74 + goto_if_eq EventScript_16CD74 end EventScript_16CD74:: @ 816CD74 @@ -195,7 +194,7 @@ EventScript_16CD74:: @ 816CD74 end EventScript_16CD83:: @ 816CD83 - countpokemon + getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT call EventScript_1A74EB @@ -223,7 +222,7 @@ EventScript_16CDB3:: @ 816CDB3 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16CD83 + goto_if_eq EventScript_16CD83 goto EventScript_16CC10 end @@ -237,7 +236,7 @@ EventScript_16CDE0:: @ 816CDE0 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16CE12 + goto_if_eq EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 end @@ -250,11 +249,10 @@ EventScript_16CE12:: @ 816CE12 CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CE47 @@ -312,7 +310,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16CC10 + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -320,7 +318,7 @@ EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16CC10 + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -328,10 +326,10 @@ EventScript_16CF3F:: @ 816CF3F getitemname 0, VAR_TEMP_1 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if lt, EventScript_16CDA5 + goto_if_lt EventScript_16CDA5 checkitemspace VAR_TEMP_1, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16CF79 + goto_if_eq EventScript_16CF79 takecoins VAR_TEMP_2 updatecoinsbox 0, 5 giveitem VAR_TEMP_1 @@ -348,11 +346,10 @@ EventScript_16CF79:: @ 816CF79 CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CFB2 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index d7c14ecd3..4948ace5f 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -3,9 +3,8 @@ CeladonCity_Gym_MapScripts:: @ 816D060 CeladonCity_Gym_EventScript_16D061:: @ 816D061 famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0 - checkflag FLAG_GOT_TM19_FROM_ERIKA - goto_if FALSE, EventScript_16D0C6 + trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC + goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6 famechecker FAMECHECKER_ERIKA, 4 msgbox gUnknown_81972B8 release @@ -24,9 +23,8 @@ EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D107 - additem ITEM_TM19, 1 - giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19 + goto_if_eq EventScript_16D107 + giveitem_msg gUnknown_81973BA, ITEM_TM19 setflag FLAG_GOT_TM19_FROM_ERIKA msgbox gUnknown_81973D7 release @@ -38,46 +36,45 @@ EventScript_16D107:: @ 816D107 end CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4 + trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4 msgbox gUnknown_81974D6, 6 end CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF + trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF famechecker FAMECHECKER_ERIKA, 2 msgbox gUnknown_8197708, 6 end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB + trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB msgbox gUnknown_81975D1, 6 end CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C + trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C msgbox gUnknown_8197527, 6 end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660 + trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660 famechecker FAMECHECKER_ERIKA, 3 msgbox gUnknown_8197664, 6 end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A + trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A msgbox gUnknown_8197788, 6 end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832 + trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832 msgbox gUnknown_819783E, 6 end CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall - checkflag FLAG_BADGE04_GET - goto_if TRUE, EventScript_16D1E0 + goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0 msgbox gUnknown_8197874 releaseall end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 9b85b36f3..d6ba4496c 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -12,14 +12,12 @@ CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if TRUE, EventScript_16D24B + goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D241 - additem ITEM_COIN_CASE, 1 - giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE + goto_if_eq EventScript_16D241 + giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_GOT_COIN_CASE release end diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 036f564a5..b252bf306 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -4,20 +4,18 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE .byte 0 CeruleanCave_B1F_OnResume:: @ 81624C9 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_1624D3 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1624D3 end EventScript_1624D3:: @ 81624D3 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject VAR_LAST_TALKED return CeruleanCave_B1F_OnTransition:: @ 81624E7 - checkflag FLAG_FOUGHT_MEWTWO - call_if FALSE, EventScript_1624F1 + call_if_unset FLAG_FOUGHT_MEWTWO, EventScript_1624F1 end EventScript_1624F1:: @ 81624F1 @@ -27,7 +25,7 @@ EventScript_1624F1:: @ 81624F1 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -46,11 +44,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_162558 + goto_if_eq EventScript_162558 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_162561 + goto_if_eq EventScript_162561 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_162561 + goto_if_eq EventScript_162561 setflag FLAG_FOUGHT_MEWTWO release end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 6edb5737e..ef102064b 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -4,8 +4,7 @@ CeruleanCity_MapScripts:: @ 8166471 CeruleanCity_OnTransition:: @ 8166477 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY - checkflag FLAG_GOT_SS_TICKET - call_if FALSE, EventScript_166484 + call_if_unset FLAG_GOT_SS_TICKET, EventScript_166484 end EventScript_166484:: @ 8166484 @@ -44,21 +43,21 @@ EventScript_1664CC:: @ 81664CC msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_166582 + call_if_eq EventScript_166582 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_16658D + call_if_eq EventScript_16658D compare VAR_STARTER_MON, 0 - call_if eq, EventScript_166598 + call_if_eq EventScript_166598 famechecker FAMECHECKER_BILL, 0 msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1665A3 + call_if_eq EventScript_1665A3 compare VAR_TEMP_1, 1 - call_if eq, EventScript_1665A3 + call_if_eq EventScript_1665A3 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1665B5 + call_if_eq EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 setflag FLAG_GOT_FAME_CHECKER @@ -73,15 +72,15 @@ EventScript_1664CC:: @ 81664CC end EventScript_166582:: @ 8166582 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, Text_17EB71 return EventScript_16658D:: @ 816658D - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, Text_17EB71 return EventScript_166598:: @ 8166598 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, Text_17EB71 return EventScript_1665A3:: @ 81665A3 @@ -172,12 +171,12 @@ CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5 - goto_if eq, EventScript_16662E + goto_if_eq EventScript_16662E message Text_17EE0E waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -186,9 +185,8 @@ EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_166677 - additem ITEM_TM28, 1 - giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 + goto_if_eq EventScript_166677 + giveitem_msg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED closemessage fadescreen 1 @@ -228,7 +226,7 @@ EventScript_1666C3:: @ 81666C3 textcolor 0 msgbox Text_17EE0E setvar VAR_LAST_TALKED, 2 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -246,8 +244,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7 CeruleanCity_EventScript_1666FE:: @ 81666FE lock faceplayer - checkflag FLAG_GOT_SS_TICKET - goto_if TRUE, EventScript_166713 + goto_if_set FLAG_GOT_SS_TICKET, EventScript_166713 msgbox gUnknown_817F01D release end @@ -284,11 +281,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F random 3 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - call_if eq, EventScript_1667B0 + call_if_eq EventScript_1667B0 compare VAR_0x8008, 1 - call_if eq, EventScript_1667B6 + call_if_eq EventScript_1667B6 compare VAR_0x8008, 2 - call_if eq, EventScript_1667BC + call_if_eq EventScript_1667BC waitmessage delay 40 playse SE_PIN @@ -296,11 +293,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F waitmovement 0 delay 30 compare VAR_0x8008, 0 - call_if eq, EventScript_1667C2 + call_if_eq EventScript_1667C2 compare VAR_0x8008, 1 - call_if eq, EventScript_1667CB + call_if_eq EventScript_1667CB compare VAR_0x8008, 2 - call_if eq, EventScript_1667D4 + call_if_eq EventScript_1667D4 release end @@ -333,13 +330,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD random 4 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - call_if eq, EventScript_166814 + call_if_eq EventScript_166814 compare VAR_0x8008, 1 - call_if eq, EventScript_16681D + call_if_eq EventScript_16681D compare VAR_0x8008, 2 - call_if eq, EventScript_166826 + call_if_eq EventScript_166826 compare VAR_0x8008, 3 - call_if eq, EventScript_16682F + call_if_eq EventScript_16682F release end diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 75ebd4b6b..9c137f644 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -4,10 +4,8 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD lock faceplayer - checkflag FLAG_GOT_BICYCLE - goto_if TRUE, EventScript_16AC58 - checkflag FLAG_GOT_BIKE_VOUCHER - goto_if TRUE, EventScript_16AC22 + goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC58 + goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16AC22 showmoneybox 0, 0, 0 message Text_192755 waitmessage @@ -31,9 +29,9 @@ EventScript_16AC15:: @ 816AC15 EventScript_16AC22:: @ 816AC22 msgbox gUnknown_81927B2 - giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5 + msgreceiveditem gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5 setflag FLAG_GOT_BICYCLE - additem ITEM_BICYCLE, 1 + additem ITEM_BICYCLE removeitem ITEM_BIKE_VOUCHER, 1 msgbox gUnknown_819280E release @@ -56,8 +54,7 @@ CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 lock faceplayer - checkflag FLAG_GOT_BICYCLE - goto_if TRUE, EventScript_16AC8A + goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC8A msgbox gUnknown_8192937 release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index fedec7e89..0da4f93a7 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -3,9 +3,8 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 - checkflag FLAG_GOT_TM03_FROM_MISTY - goto_if FALSE, EventScript_16AAF9 + trainerbattle_single TRAINER_LEADER_MISTY, Text_1921EF, Text_19242D, EventScript_16AAD3, NO_MUSIC + goto_if_unset FLAG_GOT_TM03_FROM_MISTY, EventScript_16AAF9 msgbox gUnknown_81922BF release end @@ -23,9 +22,8 @@ EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AB3A - additem ITEM_TM03, 1 - giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 + goto_if_eq EventScript_16AB3A + giveitem_msg gUnknown_81923F1, ITEM_TM03 setflag FLAG_GOT_TM03_FROM_MISTY msgbox gUnknown_81922BF release @@ -37,12 +35,12 @@ EventScript_16AB3A:: @ 816AB3A end CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0 + trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0 msgbox gUnknown_81924E4, 6 end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547 + trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, Text_192524, Text_192547 famechecker FAMECHECKER_MISTY, 2 msgbox gUnknown_8192556, 6 end @@ -50,8 +48,7 @@ CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F lock faceplayer - checkflag FLAG_DEFEATED_MISTY - goto_if TRUE, EventScript_16AB94 + goto_if_set FLAG_DEFEATED_MISTY, EventScript_16AB94 msgbox gUnknown_81925AC release end @@ -63,8 +60,7 @@ EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall - checkflag FLAG_BADGE02_GET - goto_if TRUE, EventScript_16ABB2 + goto_if_set FLAG_BADGE02_GET, EventScript_16ABB2 msgbox gUnknown_81926E1 releaseall end diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index bdd52e3b0..630b4b919 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -4,8 +4,7 @@ CeruleanCity_House2_MapScripts:: @ 816A975 CeruleanCity_House2_EventScript_16A976:: @ 816A976 lock faceplayer - checkflag FLAG_GOT_TM28_FROM_ROCKET - goto_if TRUE, EventScript_16A98B + goto_if_set FLAG_GOT_TM28_FROM_ROCKET, EventScript_16A98B msgbox gUnknown_8191E13 release end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 13ec2b2fd..9d02b8743 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -10,17 +10,16 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 faceplayer setvar VAR_0x8008, 1 call EventScript_1A8CAD - checkflag FLAG_DID_ZYNX_TRADE - goto_if TRUE, EventScript_16AA23 + goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16AA0B + goto_if_eq EventScript_16AA0B call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16AA0B + goto_if_ge EventScript_16AA0B call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16AA15 + goto_if_ne EventScript_16AA15 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D setflag FLAG_DID_ZYNX_TRADE diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index a720d9098..432f1a9f3 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -4,25 +4,25 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8004, 0 - goto_if eq, EventScript_CeruleanCity_House4_NoNews + goto_if_eq EventScript_CeruleanCity_House4_NoNews compare VAR_0x8004, 1 - goto_if eq, EventScript_CeruleanCity_House4_News1 + goto_if_eq EventScript_CeruleanCity_House4_News1 compare VAR_0x8004, 2 - goto_if eq, EventScript_CeruleanCity_House4_News2 + goto_if_eq EventScript_CeruleanCity_House4_News2 compare VAR_0x8004, 3 - goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread + goto_if_eq EventScript_CeruleanCity_House4_NewsNotSpread compare VAR_0x8004, 4 - goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1 + goto_if_eq EventScript_CeruleanCity_House4_NewsSpread1 compare VAR_0x8004, 5 - goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2 + goto_if_eq EventScript_CeruleanCity_House4_NewsSpread2 compare VAR_0x8004, 6 - goto_if eq, EventScript_CeruleanCity_House4_NewsDone + goto_if_eq EventScript_CeruleanCity_House4_NewsDone end EventScript_CeruleanCity_House4_NoNews:: @ 816AD59 @@ -35,7 +35,7 @@ EventScript_CeruleanCity_House4_News1:: @ 816AD63 msgbox gUnknown_8192B43 giveitem VAR_0x8008 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end @@ -44,7 +44,7 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89 msgbox gUnknown_8192C07 giveitem VAR_0x8008, 4 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end @@ -60,7 +60,7 @@ EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3 msgbox gUnknown_8192D4B giveitem VAR_0x8008 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end @@ -69,7 +69,7 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9 msgbox gUnknown_8192DE3 giveitem VAR_0x8008, 4 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index cad1e3f47..3a37f94be 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -4,18 +4,16 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 lock faceplayer - checkflag FLAG_GOT_POWDER_JAR - goto_if TRUE, EventScript_16AEB7 + goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16AEAD - checkflag FLAG_SYS_GOT_BERRY_POUCH - goto_if FALSE, EventScript_16AEA3 + goto_if_eq EventScript_16AEAD + goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_GOT_POWDER_JAR giveitem ITEM_POWDER_JAR compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 msgbox gUnknown_8193033 release end @@ -144,20 +142,20 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16AEC8 + goto_if_eq EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B0CC + goto_if_eq EventScript_16B0CC giveitem VAR_0x8008 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B0BF + goto_if_eq EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16AEC8 + goto_if_eq EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 release @@ -178,7 +176,7 @@ CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_814EA7C waitstate releaseall diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index ccac24aed..d51b2f96e 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -12,7 +12,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index fa5546852..9c07369b7 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -7,11 +7,11 @@ CinnabarIsland_OnTransition:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1 - call_if eq, EventScript_166F24 + call_if_eq EventScript_166F24 compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3 - call_if eq, EventScript_166F52 + call_if_eq EventScript_166F52 compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 - call_if eq, EventScript_166F0B + call_if_eq EventScript_166F0B end EventScript_166F0B:: @ 8166F0B @@ -25,7 +25,7 @@ EventScript_166F0B:: @ 8166F0B EventScript_166F24:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 18 - goto_if ge, EventScript_166F4A + goto_if_ge EventScript_166F4A setflag FLAG_TEMP_2 setobjectxyperm 3, 18, 12 setobjectmovementtype 3, 7 @@ -42,8 +42,7 @@ EventScript_166F52:: @ 8166F52 return EventScript_166F5E:: @ 8166F5E - checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY - goto_if TRUE, EventScript_166F68 + goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, EventScript_166F68 return EventScript_166F68:: @ 8166F68 @@ -93,25 +92,21 @@ Movement_166FC6:: @ 8166FC6 EventScript_166FCD:: @ 8166FCD lockall textcolor 0 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167032 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_16703D + call_if_unset FLAG_TEMP_2, EventScript_167032 + call_if_set FLAG_TEMP_2, EventScript_16703D playse SE_PIN applymovement 3, Movement_ExclamationMark waitmovement 0 applymovement 3, Movement_Delay48 waitmovement 0 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167048 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167053 + call_if_unset FLAG_TEMP_2, EventScript_167048 + call_if_set FLAG_TEMP_2, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_167068 + goto_if_eq EventScript_167068 compare VAR_RESULT, 0 - goto_if eq, EventScript_167078 + goto_if_eq EventScript_167078 end EventScript_167032:: @ 8167032 @@ -146,10 +141,8 @@ EventScript_167068:: @ 8167068 EventScript_167078:: @ 8167078 msgbox gUnknown_8180DF8 closemessage - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1670A0 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_1670B3 + call_if_unset FLAG_TEMP_2, EventScript_1670A0 + call_if_set FLAG_TEMP_2, EventScript_1670B3 removeobject 3 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL @@ -201,19 +194,14 @@ Movement_1670E2:: @ 81670E2 step_end EventScript_1670E6:: @ 81670E6 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167142 + call_if_set FLAG_TEMP_2, EventScript_167142 addobject 4 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167154 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167166 + call_if_unset FLAG_TEMP_2, EventScript_167154 + call_if_set FLAG_TEMP_2, EventScript_167166 msgbox gUnknown_8180EAD closemessage - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167171 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167183 + call_if_unset FLAG_TEMP_2, EventScript_167171 + call_if_set FLAG_TEMP_2, EventScript_167183 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 removeobject 3 delay 40 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 03fbf26f0..2de722229 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -3,20 +3,13 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B .byte 0 CinnabarIsland_Gym_OnLoad:: @ 816D951 - checkflag FLAG_DEFEATED_BLAINE - goto_if TRUE, EventScript_16D991 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - call_if TRUE, EventScript_16D9B0 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - call_if TRUE, EventScript_16D9B6 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - call_if TRUE, EventScript_16D9BC - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - call_if TRUE, EventScript_16D9C2 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - call_if TRUE, EventScript_16D9C8 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - call_if TRUE, EventScript_16D9CE + goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16D991 + call_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16D9B0 + call_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16D9B6 + call_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16D9BC + call_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16D9C2 + call_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16D9C8 + call_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16D9CE end EventScript_16D991:: @ 816D991 @@ -54,9 +47,8 @@ EventScript_16D9CE:: @ 816D9CE CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06 - checkflag FLAG_GOT_TM38_FROM_BLAINE - goto_if FALSE, EventScript_16DA34 + trainerbattle_single TRAINER_LEADER_BLAINE, Text_199543, Text_1995FA, EventScript_16DA06, NO_MUSIC + goto_if_unset FLAG_GOT_TM38_FROM_BLAINE, EventScript_16DA34 msgbox gUnknown_819971D release end @@ -76,9 +68,8 @@ EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DA75 - additem ITEM_TM38, 1 - giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 + goto_if_eq EventScript_16DA75 + giveitem_msg gUnknown_81996FF, ITEM_TM38 setflag FLAG_GOT_TM38_FROM_BLAINE msgbox gUnknown_8199652 release @@ -90,18 +81,17 @@ EventScript_16DA75:: @ 816DA75 end CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6 + trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6 msgbox gUnknown_81997EA, 6 end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 + trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1 msgbox gUnknown_8199911, 6 end EventScript_16DAB1:: @ 816DAB1 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - call_if FALSE, EventScript_16DABC + call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DABC release end @@ -110,14 +100,13 @@ EventScript_16DABC:: @ 816DABC return CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA + trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA famechecker FAMECHECKER_BLAINE, 2 msgbox gUnknown_81999DF, 6 end EventScript_16DAEA:: @ 816DAEA - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - call_if FALSE, EventScript_16DAF5 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DAF5 release end @@ -126,13 +115,12 @@ EventScript_16DAF5:: @ 816DAF5 return CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16 + trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16 msgbox gUnknown_8199B27, 6 end EventScript_16DB16:: @ 816DB16 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - call_if FALSE, EventScript_16DB21 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DB21 release end @@ -141,13 +129,12 @@ EventScript_16DB21:: @ 816DB21 return CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42 + trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42 msgbox gUnknown_819987D, 6 end EventScript_16DB42:: @ 816DB42 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - call_if FALSE, EventScript_16DB4D + call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DB4D release end @@ -156,13 +143,12 @@ EventScript_16DB4D:: @ 816DB4D return CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E + trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E msgbox gUnknown_8199986, 6 end EventScript_16DB6E:: @ 816DB6E - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - call_if FALSE, EventScript_16DB79 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DB79 release end @@ -171,13 +157,12 @@ EventScript_16DB79:: @ 816DB79 return CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A + trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A msgbox gUnknown_8199AC9, 6 end EventScript_16DB9A:: @ 816DB9A - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - call_if FALSE, EventScript_16DBA5 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DBA5 release end @@ -188,8 +173,7 @@ EventScript_16DBA5:: @ 816DBA5 CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB lock faceplayer - checkflag FLAG_DEFEATED_BLAINE - goto_if TRUE, EventScript_16DBC0 + goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16DBC0 msgbox gUnknown_8199B81 release end @@ -201,8 +185,7 @@ EventScript_16DBC0:: @ 816DBC0 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA lockall - checkflag FLAG_BADGE07_GET - goto_if TRUE, EventScript_16DBDE + goto_if_set FLAG_BADGE07_GET, EventScript_16DBDE msgbox gUnknown_8199C29 releaseall end @@ -228,9 +211,9 @@ EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DC43 + goto_if_eq EventScript_16DC43 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DC6A + goto_if_eq EventScript_16DC6A end EventScript_16DC27:: @ 816DC27 @@ -249,8 +232,7 @@ EventScript_16DC34:: @ 816DC34 EventScript_16DC43:: @ 816DC43 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -270,20 +252,19 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_QUINN - goto_if lt, EventScript_16DC7A + goto_if_lt EventScript_16DC7A releaseall end EventScript_16DC7A:: @ 816DC7A compare VAR_TEMP_1, 0 - call_if eq, EventScript_16DCB4 + call_if_eq EventScript_16DCB4 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16DCC6 + call_if_eq EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_QUINN, 0, Text_199870 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_QUINN, Text_199870 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -325,15 +306,14 @@ EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DD41 + goto_if_eq EventScript_16DD41 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DD1C + goto_if_eq EventScript_16DD1C end EventScript_16DD1C:: @ 816DD1C call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -349,20 +329,19 @@ EventScript_16DD31:: @ 816DD31 EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_AVERY - goto_if lt, EventScript_16DD51 + goto_if_lt EventScript_16DD51 releaseall end EventScript_16DD51:: @ 816DD51 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16DD8B + call_if_eq EventScript_16DD8B compare VAR_TEMP_1, 1 - call_if eq, EventScript_16DD9D + call_if_eq EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, Text_1998ED + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -413,15 +392,14 @@ EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DE1F + goto_if_eq EventScript_16DE1F compare VAR_RESULT, 0 - goto_if eq, EventScript_16DDFA + goto_if_eq EventScript_16DDFA end EventScript_16DDFA:: @ 816DDFA call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -437,20 +415,19 @@ EventScript_16DE0F:: @ 816DE0F EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_RAMON - goto_if lt, EventScript_16DE2F + goto_if_lt EventScript_16DE2F releaseall end EventScript_16DE2F:: @ 816DE2F compare VAR_TEMP_1, 0 - call_if eq, EventScript_16DE69 + call_if_eq EventScript_16DE69 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16DE7B + call_if_eq EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_RAMON, 0, Text_199973 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_RAMON, Text_199973 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -492,15 +469,14 @@ EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DEF6 + goto_if_eq EventScript_16DEF6 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DED1 + goto_if_eq EventScript_16DED1 end EventScript_16DED1:: @ 816DED1 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -516,20 +492,19 @@ EventScript_16DEE6:: @ 816DEE6 EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_DEREK - goto_if lt, EventScript_16DF06 + goto_if_lt EventScript_16DF06 releaseall end EventScript_16DF06:: @ 816DF06 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16DF40 + call_if_eq EventScript_16DF40 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16DF52 + call_if_eq EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, Text_1999DB + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -571,15 +546,14 @@ EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DFA8 + goto_if_eq EventScript_16DFA8 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DFCD + goto_if_eq EventScript_16DFCD end EventScript_16DFA8:: @ 816DFA8 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -595,20 +569,19 @@ EventScript_16DFBD:: @ 816DFBD EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_DUSTY - goto_if lt, EventScript_16DFDD + goto_if_lt EventScript_16DFDD releaseall end EventScript_16DFDD:: @ 816DFDD compare VAR_TEMP_1, 0 - call_if eq, EventScript_16E017 + call_if_eq EventScript_16E017 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16E029 + call_if_eq EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, Text_199AB9 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -650,15 +623,14 @@ EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16E0A4 + goto_if_eq EventScript_16E0A4 compare VAR_RESULT, 0 - goto_if eq, EventScript_16E07F + goto_if_eq EventScript_16E07F end EventScript_16E07F:: @ 816E07F call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 call EventScript_16E094 releaseall end @@ -674,20 +646,19 @@ EventScript_16E094:: @ 816E094 EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_ZAC - goto_if lt, EventScript_16E0B4 + goto_if_lt EventScript_16E0B4 releaseall end EventScript_16E0B4:: @ 816E0B4 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16E0EE + call_if_eq EventScript_16E0EE compare VAR_TEMP_1, 1 - call_if eq, EventScript_16E100 + call_if_eq EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, Text_199B16 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 call EventScript_16E094 releaseall end diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index b6bb33d34..75dc94f46 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -12,7 +12,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index ba6ab7d60..3fc84f92f 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -31,7 +31,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E9A5 + goto_if_eq EventScript_16E9A5 msgbox gUnknown_819A785 closemessage playbgm MUS_ANNAI, 1 @@ -40,11 +40,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_16E96F + call_if_eq EventScript_16E96F compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16E981 + call_if_eq EventScript_16E981 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16E993 + call_if_eq EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 89b8f9f09..d11407f14 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -4,7 +4,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - call_if eq, EventScript_16E285 + call_if_eq EventScript_16E285 end EventScript_16E285:: @ 816E285 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index fba30d1e8..c0dc92ca0 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -6,17 +6,16 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 faceplayer setvar VAR_0x8008, 8 call EventScript_1A8CAD - checkflag FLAG_DID_SEELOR_TRADE - goto_if TRUE, EventScript_16E473 + goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E45B + goto_if_eq EventScript_16E45B call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16E45B + goto_if_ge EventScript_16E45B call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16E465 + goto_if_ne EventScript_16E465 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_SEELOR_TRADE @@ -43,48 +42,41 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D lock faceplayer setvar VAR_RESULT, 0 - checkflag FLAG_REVIVED_AMBER - call_if TRUE, EventScript_16E8A1 + call_if_set FLAG_REVIVED_AMBER, EventScript_16E8A1 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E897 + goto_if_eq EventScript_16E897 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 - goto_if eq, EventScript_16E736 + goto_if_eq EventScript_16E736 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - goto_if eq, EventScript_16E72C + goto_if_eq EventScript_16E72C call EventScript_16E4EC compare VAR_RESULT, 1 - goto_if eq, EventScript_16E544 + goto_if_eq EventScript_16E544 call EventScript_16E504 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E586 + goto_if_eq EventScript_16E586 call EventScript_16E51C compare VAR_RESULT, 1 - goto_if eq, EventScript_16E5C8 + goto_if_eq EventScript_16E5C8 msgbox gUnknown_819A282 goto EventScript_16E53A end EventScript_16E4EC:: @ 816E4EC - checkflag FLAG_GOT_HELIX_FOSSIL - goto_if FALSE, EventScript_16E534 - checkflag FLAG_REVIVED_HELIX - goto_if TRUE, EventScript_16E534 + goto_if_unset FLAG_GOT_HELIX_FOSSIL, EventScript_16E534 + goto_if_set FLAG_REVIVED_HELIX, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E504:: @ 816E504 - checkflag FLAG_GOT_DOME_FOSSIL - goto_if FALSE, EventScript_16E534 - checkflag FLAG_REVIVED_DOME - goto_if TRUE, EventScript_16E534 + goto_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_16E534 + goto_if_set FLAG_REVIVED_DOME, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E51C:: @ 816E51C - checkflag FLAG_GOT_OLD_AMBER - goto_if FALSE, EventScript_16E534 - checkflag FLAG_REVIVED_AMBER - goto_if TRUE, EventScript_16E534 + goto_if_unset FLAG_GOT_OLD_AMBER, EventScript_16E534 + goto_if_set FLAG_REVIVED_AMBER, EventScript_16E534 setvar VAR_RESULT, 1 return @@ -102,7 +94,7 @@ EventScript_16E544:: @ 816E544 waitmessage call EventScript_16E51C compare VAR_RESULT, 1 - goto_if eq, EventScript_16E5FA + goto_if_eq EventScript_16E5FA multichoice 0, 0, MULTICHOICE_HELIX, FALSE switch VAR_RESULT case 0, EventScript_16E668 @@ -115,7 +107,7 @@ EventScript_16E586:: @ 816E586 waitmessage call EventScript_16E51C compare VAR_RESULT, 1 - goto_if eq, EventScript_16E631 + goto_if_eq EventScript_16E631 multichoice 0, 0, MULTICHOICE_DOME, FALSE switch VAR_RESULT case 0, EventScript_16E6A6 @@ -156,7 +148,7 @@ EventScript_16E668:: @ 816E668 getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_HELIX_FOSSIL, 1 @@ -171,7 +163,7 @@ EventScript_16E6A6:: @ 816E6A6 getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_DOME_FOSSIL, 1 @@ -186,7 +178,7 @@ EventScript_16E6E4:: @ 816E6E4 getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_OLD_AMBER, 1 @@ -208,53 +200,53 @@ EventScript_16E72C:: @ 816E72C EventScript_16E736:: @ 816E736 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 - goto_if eq, EventScript_16E758 + goto_if_eq EventScript_16E758 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 - goto_if eq, EventScript_16E79D + goto_if_eq EventScript_16E79D compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 - goto_if eq, EventScript_16E7E2 + goto_if_eq EventScript_16E7E2 end EventScript_16E758:: @ 816E758 setvar VAR_TEMP_1, SPECIES_OMANYTE getspeciesname 0, SPECIES_OMANYTE msgbox gUnknown_819A34F - givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 + givemon SPECIES_OMANYTE, 5, ITEM_NONE compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_REVIVED_HELIX compare VAR_RESULT, 0 - goto_if eq, EventScript_16E827 + goto_if_eq EventScript_16E827 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E79D:: @ 816E79D setvar VAR_TEMP_1, SPECIES_KABUTO getspeciesname 0, SPECIES_KABUTO msgbox gUnknown_819A34F - givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 + givemon SPECIES_KABUTO, 5, ITEM_NONE compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_REVIVED_DOME compare VAR_RESULT, 0 - goto_if eq, EventScript_16E827 + goto_if_eq EventScript_16E827 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E7E2:: @ 816E7E2 setvar VAR_TEMP_1, SPECIES_AERODACTYL getspeciesname 0, SPECIES_AERODACTYL msgbox gUnknown_819A34F - givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 + givemon SPECIES_AERODACTYL, 5, ITEM_NONE compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_REVIVED_AMBER compare VAR_RESULT, 0 - goto_if eq, EventScript_16E827 + goto_if_eq EventScript_16E827 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E827:: @ 816E827 @@ -266,7 +258,7 @@ EventScript_16E827:: @ 816E827 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E895 + goto_if_eq EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16E895 @@ -281,7 +273,7 @@ EventScript_16E85B:: @ 816E85B setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E88A + goto_if_eq EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A end @@ -301,21 +293,17 @@ EventScript_16E897:: @ 816E897 end EventScript_16E8A1:: @ 816E8A1 - checkflag FLAG_GOT_HELIX_FOSSIL - goto_if TRUE, EventScript_16E8B9 - checkflag FLAG_GOT_DOME_FOSSIL - goto_if TRUE, EventScript_16E8C8 + goto_if_set FLAG_GOT_HELIX_FOSSIL, EventScript_16E8B9 + goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_16E8C8 goto EventScript_16E534 end EventScript_16E8B9:: @ 816E8B9 - checkflag FLAG_REVIVED_HELIX - goto_if FALSE, EventScript_16E534 + goto_if_unset FLAG_REVIVED_HELIX, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E8C8:: @ 816E8C8 - checkflag FLAG_REVIVED_DOME - goto_if FALSE, EventScript_16E534 + goto_if_unset FLAG_REVIVED_DOME, EventScript_16E534 setvar VAR_RESULT, 1 return diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 5eaf24fa4..96af461d3 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -10,17 +10,16 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 faceplayer setvar VAR_0x8008, 6 call EventScript_1A8CAD - checkflag FLAG_DID_ESPHERE_TRADE - goto_if TRUE, EventScript_16E334 + goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E31C + goto_if_eq EventScript_16E31C call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16E31C + goto_if_ge EventScript_16E31C call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16E326 + goto_if_ne EventScript_16E326 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D setflag FLAG_DID_ESPHERE_TRADE @@ -50,21 +49,20 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - checkflag FLAG_DID_TANGENY_TRADE - goto_if TRUE, EventScript_16E3D4 + goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E3BC + goto_if_eq EventScript_16E3BC special Special_ChooseMonFromParty waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 6 - goto_if ge, EventScript_16E3BC + goto_if_ge EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16E3C6 + goto_if_ne EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 62880594c..1f608669b 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 .byte 0 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42 + trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42 msgbox gUnknown_817CF54, 6 end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 54dc63546..c4ddc2423 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -5,7 +5,7 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D FiveIsland_LostCave_Room10_OnResume:: @ 8164C38 checktrainerflag TRAINER_LADY_SELPHY - call_if eq, EventScript_164C42 + call_if_eq EventScript_164C42 end EventScript_164C42:: @ 8164C42 @@ -27,8 +27,8 @@ EventScript_164C52:: @ 8164C52 msgbox gUnknown_817D062 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_164CB6 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_LADY_SELPHY, 0, Text_17D086 + goto_if_eq EventScript_164CB6 + trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086 msgbox gUnknown_817D0B2 closemessage call EventScript_164CA5 diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 28913bb80..6beca99ec 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 .byte 0 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_LAURA, 0, Text_17CFC1, Text_17CFFB + trainerbattle_single TRAINER_PSYCHIC_LAURA, Text_17CFC1, Text_17CFFB msgbox gUnknown_817D037, 6 end diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 11283c81b..bf9844b12 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -3,16 +3,13 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 .byte 0 FiveIsland_Meadow_OnLoad:: @ 8168938 - checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE - call_if TRUE, EventScript_168983 + call_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168983 end FiveIsland_Meadow_EventScript_168942:: @ 8168942 lockall - checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE - goto_if TRUE, EventScript_168979 - checkflag FLAG_LEARNED_YES_NAH_CHANSEY - goto_if TRUE, EventScript_16895F + goto_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168979 + goto_if_set FLAG_LEARNED_YES_NAH_CHANSEY, EventScript_16895F msgbox gUnknown_818AB8E releaseall end @@ -39,16 +36,16 @@ EventScript_168983:: @ 8168983 return FiveIsland_Meadow_EventScript_16898D:: @ 816898D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, Text_18AC88, Text_18ACB3 msgbox gUnknown_818ACC5, 6 end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, Text_18ACF0, Text_18AD39 msgbox gUnknown_818AD59, 6 end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, Text_18ADC6, Text_18ADFB msgbox gUnknown_818AE16, 6 end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 5bc9fbeea..9e3c0d8e1 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -3,10 +3,8 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 lock - checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168A18 - checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168A22 + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168A18 + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168A22 msgbox gUnknown_818B02E closemessage applymovement 1, Movement_FacePlayer @@ -28,7 +26,7 @@ EventScript_168A22:: @ 8168A22 msgbox gUnknown_818B282 giveitem ITEM_TM42 compare VAR_RESULT, 0 - goto_if eq, EventScript_168AFE + goto_if_eq EventScript_168AFE call EventScript_168AE8 release end @@ -36,24 +34,22 @@ EventScript_168A22:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lockall - checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168B0B - checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168B0B + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 compare VAR_RESULT, 1 - goto_if eq, EventScript_168A86 + goto_if_eq EventScript_168A86 releaseall end EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_168A9B + goto_if_eq EventScript_168A9B releaseall end @@ -70,7 +66,7 @@ EventScript_168A9B:: @ 8168A9B msgbox gUnknown_818B171 giveitem ITEM_TM42 compare VAR_RESULT, 0 - goto_if eq, EventScript_168AFE + goto_if_eq EventScript_168AFE call EventScript_168AE8 releaseall end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 87b7cda7b..e8c30c862 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -4,16 +4,15 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_172043 + goto_if_set FLAG_TEMP_2, EventScript_172043 compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF - goto_if eq, EventScript_171F0B + goto_if_eq EventScript_171F0B compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE - goto_if ne, EventScript_171F19 + goto_if_ne EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE end @@ -33,7 +32,7 @@ EventScript_171F19:: @ 8171F19 copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare VAR_RESULT, 1 - goto_if eq, EventScript_171F34 + goto_if_eq EventScript_171F34 goto EventScript_171EFE end @@ -53,18 +52,18 @@ EventScript_171F34:: @ 8171F34 msgbox gUnknown_81A4566 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_171FCD + call_if_eq EventScript_171FCD compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_171FE9 + call_if_eq EventScript_171FE9 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_171FFE + call_if_eq EventScript_171FFE compare VAR_FACING, DIR_WEST - call_if eq, EventScript_17201A + call_if_eq EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E giveitem VAR_RESORT_GORGEOUS_REWARD compare VAR_RESULT, 0 - goto_if eq, EventScript_172025 + goto_if_eq EventScript_172025 setflag FLAG_TEMP_2 setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 release diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 0050e2f93..d3d5f7fba 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -9,7 +9,7 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D checktrainerflag TRAINER_TEAM_ROCKET_ADMIN - call_if eq, EventScript_163F47 + call_if_eq EventScript_163F47 end EventScript_163F47:: @ 8163F47 @@ -19,8 +19,7 @@ EventScript_163F47:: @ 8163F47 FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A lockall - checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE - goto_if TRUE, EventScript_163F6E + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_163F6E msgbox gUnknown_817B4E3 releaseall end @@ -43,9 +42,8 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 end FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_163FB7 + trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7 msgbox gUnknown_817BCA3, 6 end @@ -62,24 +60,24 @@ EventScript_163FCD:: @ 8163FCD end FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_47, 0, Text_17B54D, Text_17B585 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585 msgbox gUnknown_817B5A6, 6 end FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_48, 0, Text_17B677, Text_17B6D9 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9 msgbox gUnknown_817B6EF, 6 end FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN_2, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F msgbox gUnknown_817BA64, 6 end EventScript_16402F:: @ 816402F getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 24 - call_if le, EventScript_164065 + call_if_le EventScript_164065 msgbox gUnknown_817BA64 closemessage fadescreen 1 @@ -100,12 +98,12 @@ EventScript_164065:: @ 8164065 return FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_42, 0, Text_17B5D6, Text_17B62F + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F msgbox gUnknown_817B642, 6 end FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2 msgbox gUnknown_817B7FA, 6 end @@ -113,36 +111,36 @@ EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, DIR_NORTH - call_if eq, EventScript_16412E + call_if_eq EventScript_16412E msgbox gUnknown_817B7AE closemessage compare VAR_0x8004, 24 - call_if le, EventScript_164144 + call_if_le EventScript_164144 compare VAR_0x8004, 25 - call_if eq, EventScript_16414F + call_if_eq EventScript_16414F compare VAR_0x8004, 26 - call_if eq, EventScript_16415A + call_if_eq EventScript_16415A compare VAR_0x8004, 27 - call_if eq, EventScript_16415A + call_if_eq EventScript_16415A playse SE_PIN call EventScript_163F47 special DrawWholeMapView waitse compare VAR_0x8004, 24 - call_if le, EventScript_164165 + call_if_le EventScript_164165 compare VAR_0x8004, 25 - call_if eq, EventScript_164165 + call_if_eq EventScript_164165 compare VAR_0x8004, 26 - call_if eq, EventScript_164165 + call_if_eq EventScript_164165 compare VAR_0x8004, 27 - call_if eq, EventScript_164170 + call_if_eq EventScript_164170 msgbox gUnknown_817B7FA release end EventScript_16412E:: @ 816412E compare VAR_0x8004, 27 - goto_if eq, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index def665782..605b05065 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -4,18 +4,16 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_GOT_TOGEPI_EGG - goto_if TRUE, EventScript_1688E3 - checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG - goto_if TRUE, EventScript_16892C + goto_if_set FLAG_GOT_TOGEPI_EGG, EventScript_1688E3 + goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, Special_GetLeadMonFriendship compare VAR_RESULT, 6 - goto_if eq, EventScript_1688AC + goto_if_eq EventScript_1688AC msgbox gUnknown_818A88F release end @@ -32,9 +30,9 @@ EventScript_1688AC:: @ 81688AC end EventScript_1688BA:: @ 81688BA - countpokemon - compare VAR_RESULT, 6 - goto_if eq, EventScript_16891F + getpartysize + compare VAR_RESULT, PARTY_SIZE + goto_if_eq EventScript_16891F setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 @@ -51,12 +49,12 @@ EventScript_1688E3:: @ 81688E3 setvar VAR_0x8004, SPECIES_TOGEPI specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID compare VAR_RESULT, 1 - goto_if eq, EventScript_168895 + goto_if_eq EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID compare VAR_RESULT, 1 - goto_if eq, EventScript_168895 + goto_if_eq EventScript_168895 msgbox gUnknown_818A9C0 release end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 074e92f3f..890891c10 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -6,7 +6,7 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_OnTransition:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare VAR_MAP_SCENE_FOUR_ISLAND, 0 - call_if eq, EventScript_167CCD + call_if_eq EventScript_167CCD call EventScript_167CD1 end @@ -15,8 +15,7 @@ EventScript_167CCD:: @ 8167CCD return EventScript_167CD1:: @ 8167CD1 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if FALSE, EventScript_167CE1 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1 setobjectxyperm 1, 16, 14 EventScript_167CE1:: @ 8167CE1 @@ -73,18 +72,18 @@ Movement_167D52:: @ 8167D52 FourIsland_EventScript_167D55:: @ 8167D55 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 1 - goto_if eq, EventScript_167D9B + goto_if_eq EventScript_167D9B compare VAR_RESULT, 2 - goto_if eq, EventScript_167E0C + goto_if_eq EventScript_167E0C compare VAR_RESULT, 3 - goto_if eq, EventScript_167E19 + goto_if_eq EventScript_167E19 msgbox gUnknown_81BF555 release end @@ -92,10 +91,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_167DD1 + goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_167DD1 + goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare @@ -105,7 +104,7 @@ EventScript_167D9B:: @ 8167D9B EventScript_167DD1:: @ 8167DD1 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 - goto_if ne, EventScript_167DEB + goto_if_ne EventScript_167DEB msgbox gUnknown_81BF6F0 release end @@ -142,8 +141,7 @@ EventScript_167E19:: @ 8167E19 FourIsland_EventScript_167E2E:: @ 8167E2E lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_167E43 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43 msgbox gUnknown_8182A2B release end diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index a7bb1bade..54c60cb56 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -4,7 +4,7 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88 compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 - call_if eq, EventScript_163D94 + call_if_eq EventScript_163D94 end EventScript_163D94:: @ 8163D94 @@ -46,7 +46,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 textcolor 0 msgbox gUnknown_817B20B setvar VAR_LAST_TALKED, 4 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_45, 0, Text_17B251 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251 applymovement 3, Movement_163F1B waitmovement 0 textcolor 1 diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index a2fa3215c..c39cc1da9 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -9,10 +9,8 @@ FourIsland_LoreleisHouse_OnTransition:: @ 8171C54 FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 lock faceplayer - checkflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE - goto_if TRUE, EventScript_171C83 - checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE - goto_if TRUE, EventScript_171C76 + goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83 + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76 msgbox gUnknown_81A3826 release end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index b2e3b5bb4..5074a4f39 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD FourIsland_Mart_EventScript_171CAE:: @ 8171CAE special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 18dcf65fa..3d5409e19 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -4,19 +4,19 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 1 - goto_if eq, EventScript_171A2E + goto_if_eq EventScript_171A2E compare VAR_RESULT, 2 - goto_if eq, EventScript_171A52 + goto_if_eq EventScript_171A52 compare VAR_RESULT, 3 - goto_if eq, EventScript_171B86 + goto_if_eq EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171993 + goto_if_eq EventScript_171993 msgbox gUnknown_81BF916 release end @@ -24,16 +24,16 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 EventScript_171993:: @ 8171993 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 1 - goto_if eq, EventScript_171A1A + goto_if_eq EventScript_171A1A msgbox gUnknown_81BF839 fadescreen 1 special ChooseSendDaycareMon waitstate compare VAR_0x8004, 6 - goto_if ge, EventScript_1719F7 + goto_if_ge EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare VAR_RESULT, 0 - goto_if eq, EventScript_171A24 + goto_if_eq EventScript_171A24 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 @@ -43,7 +43,7 @@ EventScript_171993:: @ 8171993 incrementgamestat GAME_STAT_USED_DAYCARE specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 - goto_if eq, EventScript_171A01 + goto_if_eq EventScript_171A01 release end @@ -55,7 +55,7 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171993 + goto_if_eq EventScript_171993 goto EventScript_1719F7 end @@ -81,7 +81,7 @@ EventScript_171A38:: @ 8171A38 EventScript_171A41:: @ 8171A41 specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare compare VAR_RESULT, 0 - call_if ne, EventScript_171A38 + call_if_ne EventScript_171A38 return EventScript_171A52:: @ 8171A52 @@ -90,26 +90,26 @@ EventScript_171A52:: @ 8171A52 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171993 + goto_if_eq EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171A90 + goto_if_eq EventScript_171A90 goto EventScript_1719F7 end EventScript_171A90:: @ 8171A90 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 - goto_if eq, EventScript_171B67 + goto_if_eq EventScript_171B67 specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare VAR_RESULT, 2 - goto_if eq, EventScript_171ACF + goto_if_eq EventScript_171ACF special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare VAR_RESULT, 2 - goto_if eq, EventScript_1719F7 + goto_if_eq EventScript_1719F7 goto EventScript_171ACF end @@ -117,14 +117,14 @@ EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171AEB + goto_if_eq EventScript_171AEB goto EventScript_1719F7 end EventScript_171AEB:: @ 8171AEB specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare VAR_RESULT, 1 - goto_if eq, EventScript_171B05 + goto_if_eq EventScript_171B05 msgbox gUnknown_81BF932 release end @@ -144,14 +144,14 @@ EventScript_171B05:: @ 8171B05 waitmoncry specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 - goto_if eq, EventScript_171B4E + goto_if_eq EventScript_171B4E goto EventScript_1719F7 end EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171A90 + goto_if_eq EventScript_171A90 goto EventScript_1719F7 end @@ -193,7 +193,7 @@ EventScript_171B86:: @ 8171B86 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171A90 + goto_if_eq EventScript_171A90 msgbox gUnknown_81BF976 release end @@ -202,7 +202,7 @@ EventScript_171BBF:: @ 8171BBF special ShowDaycareLevelMenu waitstate compare VAR_RESULT, 2 - goto_if eq, EventScript_1719F7 + goto_if_eq EventScript_1719F7 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare msgbox gUnknown_81BFA67 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 7f26b03f3..15c3330d7 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -4,10 +4,8 @@ FuchsiaCity_MapScripts:: @ 8166D75 FuchsiaCity_OnTransition:: @ 8166D7B setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY - checkflag FLAG_GOT_DOME_FOSSIL - call_if TRUE, EventScript_166D91 - checkflag FLAG_GOT_DOME_FOSSIL - call_if FALSE, EventScript_166D97 + call_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166D91 + call_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_166D97 end EventScript_166D91:: @ 8166D91 @@ -121,8 +119,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83 FuchsiaCity_EventScript_166E9C:: @ 8166E9C lockall - checkflag FLAG_GOT_DOME_FOSSIL - goto_if TRUE, EventScript_166EBE + goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166EBE setvar VAR_0x8004, SPECIES_KABUTO special Special_SetSeenMon drawmonpic SPECIES_KABUTO, 10, 3 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index f4c0c1625..f0d1e1a01 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -4,15 +4,13 @@ FuchsiaCity_Building1_MapScripts:: @ 816D74B FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C lock faceplayer - checkflag FLAG_GOT_HM04 - goto_if TRUE, EventScript_16D7FA - checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH - goto_if TRUE, EventScript_16D780 + goto_if_set FLAG_GOT_HM04, EventScript_16D7FA + goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if eq, EventScript_16D7E8 + call_if_eq EventScript_16D7E8 compare VAR_RESULT, 0 - call_if eq, EventScript_16D7F1 + call_if_eq EventScript_16D7F1 release end @@ -26,11 +24,10 @@ EventScript_16D780:: @ 816D780 call EventScript_1A6675 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_16D7D6 + call_if_eq EventScript_16D7D6 compare VAR_RESULT, 1 - call_if eq, EventScript_16D7DF - additem ITEM_HM04, 1 - giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 + call_if_eq EventScript_16D7DF + giveitem_msg gUnknown_8199068, ITEM_HM04 setflag FLAG_GOT_HM04 removeitem ITEM_GOLD_TEETH, 1 release diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 21bb1e306..38e4190ce 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -3,9 +3,8 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580 - checkflag FLAG_GOT_TM06_FROM_KOGA - goto_if FALSE, EventScript_16D5A6 + trainerbattle_single TRAINER_LEADER_KOGA, Text_19832E, Text_198444, EventScript_16D580, NO_MUSIC + goto_if_unset FLAG_GOT_TM06_FROM_KOGA, EventScript_16D5A6 msgbox gUnknown_8198481 release end @@ -23,9 +22,8 @@ EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D5E7 - additem ITEM_TM06, 1 - giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 + goto_if_eq EventScript_16D5E7 + giveitem_msg gUnknown_819858F, ITEM_TM06 setflag FLAG_GOT_TM06_FROM_KOGA msgbox gUnknown_81985AB release @@ -37,41 +35,40 @@ EventScript_16D5E7:: @ 816D5E7 end FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6 + trainerbattle_single TRAINER_TAMER_PHIL, Text_198866, Text_1988B6 msgbox gUnknown_81988CB, 6 end FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F + trainerbattle_single TRAINER_TAMER_EDGAR, Text_19891F, Text_19897F msgbox gUnknown_8198985, 6 end FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779 + trainerbattle_single TRAINER_JUGGLER_KIRK, Text_19871E, Text_198779 famechecker FAMECHECKER_KOGA, 2 msgbox gUnknown_8198787, 6 end FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA + trainerbattle_single TRAINER_JUGGLER_SHAWN, Text_1989A1, Text_1989EA msgbox gUnknown_8198A10, 6 end FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4 + trainerbattle_single TRAINER_JUGGLER_KAYDEN, Text_198629, Text_1986B4 msgbox gUnknown_81986C9, 6 end FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812 + trainerbattle_single TRAINER_JUGGLER_NATE, Text_1987E8, Text_198812 msgbox gUnknown_8198825, 6 end FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 lock faceplayer - checkflag FLAG_DEFEATED_KOGA - goto_if TRUE, EventScript_16D69D + goto_if_set FLAG_DEFEATED_KOGA, EventScript_16D69D msgbox gUnknown_8198A5E release end @@ -83,8 +80,7 @@ EventScript_16D69D:: @ 816D69D FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 lockall - checkflag FLAG_BADGE05_GET - goto_if TRUE, EventScript_16D6BB + goto_if_set FLAG_BADGE05_GET, EventScript_16D6BB msgbox gUnknown_8198B4B releaseall end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index e8116fc69..d0f842a0e 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -4,11 +4,10 @@ FuchsiaCity_House2_MapScripts:: @ 816D816 FuchsiaCity_House2_EventScript_16D817:: @ 816D817 lock faceplayer - checkflag FLAG_GOT_GOOD_ROD - goto_if TRUE, EventScript_16D83F + goto_if_set FLAG_GOT_GOOD_ROD, EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16D849 + goto_if_eq EventScript_16D849 msgbox gUnknown_8199337 release end @@ -22,9 +21,8 @@ EventScript_16D849:: @ 816D849 msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D88A - additem ITEM_GOOD_ROD, 1 - giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD + goto_if_eq EventScript_16D88A + giveitem_msg gUnknown_819925E, ITEM_GOOD_ROD msgbox gUnknown_8199296 setflag FLAG_GOT_GOOD_ROD release diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 058fc44f6..99af39686 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -6,7 +6,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 faceplayer msgbox gUnknown_81993B9, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16D8B0 + goto_if_eq EventScript_16D8B0 goto EventScript_16D941 end @@ -15,23 +15,23 @@ EventScript_16D8B0:: @ 816D8B0 special Special_ChooseMonFromParty waitstate compare VAR_0x8004, 6 - goto_if ge, EventScript_16D941 + goto_if_ge EventScript_16D941 special IsSelectedMonEgg compare VAR_RESULT, 1 - goto_if eq, EventScript_16D937 + goto_if_eq EventScript_16D937 special ScrSpecial_CountPokemonMoves compare VAR_RESULT, 1 - goto_if eq, EventScript_16D92A + goto_if_eq EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 special SelectMove fadescreen 0 compare VAR_0x8005, 4 - goto_if eq, EventScript_16D8B0 + goto_if_eq EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16D919 + goto_if_eq EventScript_16D919 goto EventScript_16D941 end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index 824cdefe7..85390e4a0 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -12,7 +12,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 2ec411238..f04639875 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -39,7 +39,7 @@ EventScript_16D312:: @ 816D312 textcolor 0 msgbox gUnknown_8197E1A, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16D345 + goto_if_eq EventScript_16D345 msgbox gUnknown_8197E48 closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362 @@ -103,7 +103,7 @@ EventScript_16D391:: @ 816D391 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16D3CA + goto_if_eq EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A end @@ -112,7 +112,7 @@ EventScript_16D3CA:: @ 816D3CA call EventScript_16D462 checkmoney 500, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D48C + goto_if_eq EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 msgbox gUnknown_8197D07 @@ -125,11 +125,11 @@ EventScript_16D3CA:: @ 816D3CA closemessage hidemoneybox 0, 0 compare VAR_TEMP_2, 0 - call_if eq, EventScript_16D44C + call_if_eq EventScript_16D44C compare VAR_TEMP_2, 1 - call_if eq, EventScript_16D441 + call_if_eq EventScript_16D441 compare VAR_TEMP_2, 2 - call_if eq, EventScript_16D457 + call_if_eq EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 @@ -152,12 +152,12 @@ EventScript_16D457:: @ 816D457 return EventScript_16D462:: @ 816D462 - countpokemon - compare VAR_RESULT, 6 - goto_if ne, EventScript_1A77A9 + getpartysize + compare VAR_RESULT, PARTY_SIZE + goto_if_ne EventScript_1A77A9 specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon compare VAR_RESULT, 1 - goto_if eq, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 msgbox gUnknown_81BFEAC goto EventScript_16D49A end @@ -201,7 +201,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16D4D6 + goto_if_eq EventScript_16D4D6 msgbox gUnknown_819809E release end diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index a24aa524a..bc9827037 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -6,7 +6,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_OnTransition:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 - call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic + call_if_eq EventScript_IndigoPlateau_Exterior_PlayCreditsMusic end EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 00a11018f..09647da0b 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -7,12 +7,11 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 - call_if eq, EventScript_16EA79 + call_if_eq EventScript_16EA79 end EventScript_16EA79:: @ 816EA79 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1A77A9 setobjectxyperm 4, 4, 2 return @@ -21,14 +20,13 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 - goto_if eq, EventScript_16EAA6 + goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 release end EventScript_16EAA6:: @ 816EAA6 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_16EAB9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16EAB9 msgbox gUnknown_819A943 release end @@ -45,7 +43,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 7cbba172b..97c308549 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -13,7 +13,7 @@ LavenderTown_EventScript_16687D:: @ 816687D faceplayer msgbox gUnknown_817F52E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16689C + goto_if_eq EventScript_16689C msgbox gUnknown_817F568 release end diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index 2469d4503..d57871971 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -4,8 +4,7 @@ LavenderTown_House1_MapScripts:: @ 816B232 LavenderTown_House1_EventScript_16B233:: @ 816B233 lock faceplayer - checkflag FLAG_RESCUED_MR_FUJI - goto_if TRUE, EventScript_16B248 + goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B248 msgbox gUnknown_819397D release end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 3b5cd8d4c..21cbd52db 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -6,9 +6,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 faceplayer msgbox gUnknown_8193A4B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16B287 + goto_if_eq EventScript_16B287 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B2AA + goto_if_eq EventScript_16B2AA end EventScript_16B287:: @ 816B287 @@ -16,9 +16,9 @@ EventScript_16B287:: @ 816B287 special Special_ChooseMonFromParty waitstate compare VAR_0x8004, 6 - goto_if lt, EventScript_16B2B4 + goto_if_lt EventScript_16B2B4 compare VAR_0x8004, 6 - goto_if ge, EventScript_16B2AA + goto_if_ge EventScript_16B2AA end EventScript_16B2AA:: @ 816B2AA @@ -29,20 +29,20 @@ EventScript_16B2AA:: @ 816B2AA EventScript_16B2B4:: @ 816B2B4 specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare VAR_RESULT, SPECIES_EGG - goto_if eq, EventScript_16B307 + goto_if_eq EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare VAR_RESULT, 1 - goto_if eq, EventScript_16B311 + goto_if_eq EventScript_16B311 specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_if eq, EventScript_16B311 + goto_if_eq EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16B31B + goto_if_eq EventScript_16B31B compare VAR_RESULT, 0 - goto_if eq, EventScript_16B2AA + goto_if_eq EventScript_16B2AA end EventScript_16B307:: @ 816B307 @@ -61,7 +61,7 @@ EventScript_16B31B:: @ 816B31B specialvar VAR_RESULT, NameRaterWasNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_if eq, EventScript_16B345 + goto_if_eq EventScript_16B345 msgbox gUnknown_8193BF0 release end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 47c1b2df8..a09858f03 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -16,7 +16,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362 LavenderTown_Mart_EventScript_16B36B:: @ 816B36B special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 328ba64de..a8c35b814 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -4,15 +4,13 @@ LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149 LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A lock faceplayer - checkflag FLAG_GOT_POKE_FLUTE - goto_if TRUE, EventScript_16B196 + goto_if_set FLAG_GOT_POKE_FLUTE, EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B1A0 + goto_if_eq EventScript_16B1A0 setflag FLAG_GOT_POKE_FLUTE - additem ITEM_POKE_FLUTE, 1 - giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 + giveitem_msg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 msgbox gUnknown_81937E5 release end @@ -42,8 +40,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC lock faceplayer - checkflag FLAG_RESCUED_MR_FUJI - goto_if TRUE, EventScript_16B1E1 + goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B1E1 msgbox gUnknown_81935ED release end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 44ca7e479..00209f3c9 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -6,7 +6,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946 MtEmber_Exterior_OnTransition:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 - call_if eq, EventScript_163960 + call_if_eq EventScript_163960 end EventScript_163960:: @ 8163960 @@ -16,7 +16,7 @@ EventScript_163960:: @ 8163960 MtEmber_Exterior_OnLoad:: @ 8163969 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - call_if ge, EventScript_163975 + call_if_ge EventScript_163975 end EventScript_163975:: @ 8163975 @@ -26,9 +26,9 @@ EventScript_163975:: @ 8163975 MtEmber_Exterior_EventScript_16397F:: @ 816397F lock checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if eq, EventScript_16399E + goto_if_eq EventScript_16399E compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if eq, EventScript_1639A8 + goto_if_eq EventScript_1639A8 msgbox gUnknown_817A82A release end @@ -43,10 +43,10 @@ EventScript_1639A8:: @ 81639A8 waitmovement 0 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA06 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_43, 0, Text_17AA34 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, Text_17AA34 msgbox gUnknown_817AA3F checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if eq, EventScript_1639DB + goto_if_eq EventScript_1639DB release end @@ -64,9 +64,9 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if eq, EventScript_163A1B + goto_if_eq EventScript_163A1B compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if eq, EventScript_163A25 + goto_if_eq EventScript_163A25 msgbox gUnknown_817A88C closemessage applymovement 3, Movement_FaceOriginalDirection @@ -82,10 +82,10 @@ EventScript_163A1B:: @ 8163A1B EventScript_163A25:: @ 8163A25 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA56 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_44, 0, Text_17AA8A + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, Text_17AA8A msgbox gUnknown_817AA99 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if eq, EventScript_1639DB + goto_if_eq EventScript_1639DB release end @@ -116,16 +116,16 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E end MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_LOGAN, 0, Text_17AB73, Text_17ABAA + trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, Text_17AB73, Text_17ABAA msgbox gUnknown_817ABD8, 6 end MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_BETH, 0, Text_17AC55, Text_17AC82 + trainerbattle_single TRAINER_PKMN_RANGER_BETH, Text_17AC55, Text_17AC82 msgbox gUnknown_817ACA2, 6 end MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_JOCELYN, 0, Text_17AD06, Text_17AD6B + trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, Text_17AD06, Text_17AD6B msgbox gUnknown_817AD89, 6 end diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 17d276620..59fb37bf3 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -7,7 +7,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 faceplayer setflag FLAG_GOT_RUBY removeobject 1 - additem ITEM_RUBY, 1 - giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5 + giveitem_msg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5 release end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 102fa72a5..45d2f76e0 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -4,20 +4,18 @@ MtEmber_Summit_MapScripts:: @ 8163AFC .byte 0 MtEmber_Summit_OnResume:: @ 8163B07 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_163B11 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163B11 end EventScript_163B11:: @ 8163B11 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject VAR_LAST_TALKED return MtEmber_Summit_OnTransition:: @ 8163B25 - checkflag FLAG_FOUGHT_MOLTRES - call_if FALSE, EventScript_163B2F + call_if_unset FLAG_FOUGHT_MOLTRES, EventScript_163B2F end EventScript_163B2F:: @ 8163B2F @@ -27,7 +25,7 @@ EventScript_163B2F:: @ 8163B2F MtEmber_Summit_EventScript_163B33:: @ 8163B33 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -46,11 +44,11 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_163B96 + goto_if_eq EventScript_163B96 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163B9F + goto_if_eq EventScript_163B9F compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163B9F + goto_if_eq EventScript_163B9F setflag FLAG_FOUGHT_MOLTRES release end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index f2c50be17..b4506a56c 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -11,36 +11,36 @@ MtMoon_1F_EventScript_1605EE:: @ 81605EE end MtMoon_1F_EventScript_1605F7:: @ 81605F7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_MARCOS, 0, Text_17279D, Text_1727CB + trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB msgbox gUnknown_81727DF, 6 end MtMoon_1F_EventScript_16060E:: @ 816060E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOSH, 0, Text_17281D, Text_172844 + trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844 msgbox gUnknown_8172863, 6 end MtMoon_1F_EventScript_160625:: @ 8160625 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MIRIAM, 0, Text_172896, Text_1728C3 + trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3 msgbox gUnknown_81728D2, 6 end MtMoon_1F_EventScript_16063C:: @ 816063C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_IRIS, 0, Text_172972, Text_1729A4 + trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4 msgbox gUnknown_81729AC, 6 end MtMoon_1F_EventScript_160653:: @ 8160653 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_JOVAN, 0, Text_17290B, Text_172927 + trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927 msgbox gUnknown_817293C, 6 end MtMoon_1F_EventScript_16066A:: @ 816066A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KENT, 0, Text_1729EA, Text_172A1A + trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A msgbox gUnknown_8172A26, 6 end MtMoon_1F_EventScript_160681:: @ 8160681 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ROBBY, 0, Text_172A55, Text_172A8F + trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F msgbox gUnknown_8172A97, 6 end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 3d2e317e2..cb37f0cbf 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -3,8 +3,7 @@ MtMoon_B2F_MapScripts:: @ 8160699 .byte 0 MtMoon_B2F_OnTransition:: @ 816069F - checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - call_if FALSE, EventScript_1606A9 + call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9 end EventScript_1606A9:: @ 81606A9 @@ -23,10 +22,9 @@ MtMoon_B2F_EventScript_1606B0:: @ 81606B0 MtMoon_B2F_EventScript_1606C2:: @ 81606C2 lock faceplayer - checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - goto_if TRUE, EventScript_160707 + goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707 checktrainerflag TRAINER_SUPER_NERD_MIGUEL - goto_if eq, EventScript_160711 + goto_if_eq EventScript_160711 call EventScript_1606DD release end @@ -38,7 +36,7 @@ EventScript_1606DD:: @ 81606DD playbgm MUS_EXEYE, 0 waitbuttonpress setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99 + trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99 setvar VAR_MAP_SCENE_MT_MOON_B2F, 1 msgbox gUnknown_8172BAB return @@ -58,10 +56,9 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1607DE + goto_if_eq EventScript_1607DE removeobject 1 - additem ITEM_DOME_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -91,10 +88,9 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1607DE + goto_if_eq EventScript_1607DE removeobject 2 - additem ITEM_HELIX_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -123,21 +119,21 @@ Movement_1607E0:: @ 81607E0 step_end MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8 msgbox gUnknown_8172CCB, 6 end MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46 msgbox gUnknown_8172D51, 6 end MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF msgbox gUnknown_8172DC1, 6 end MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E msgbox gUnknown_8172E4B, 6 end diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 86981b393..a013d6707 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -4,10 +4,8 @@ NavelRock_Base_MapScripts:: @ 81650E7 .byte 0 NavelRock_Base_OnTransition:: @ 81650F2 - checkflag FLAG_FOUGHT_LUGIA - call_if TRUE, EventScript_165105 - checkflag FLAG_FOUGHT_LUGIA - call_if FALSE, EventScript_165109 + call_if_set FLAG_FOUGHT_LUGIA, EventScript_165105 + call_if_unset FLAG_FOUGHT_LUGIA, EventScript_165109 end EventScript_165105:: @ 8165105 @@ -15,27 +13,25 @@ EventScript_165105:: @ 8165105 return EventScript_165109:: @ 8165109 - checkflag FLAG_LUGIA_FLEW_AWAY - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_1A77A9 clearflag FLAG_HIDE_LUGIA return NavelRock_Base_OnResume:: @ 8165116 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_165120 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_165120 end EventScript_165120:: @ 8165120 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject 1 return NavelRock_Base_EventScript_165134:: @ 8165134 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -70,11 +66,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_1651D9 + goto_if_eq EventScript_1651D9 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_1651E7 + goto_if_eq EventScript_1651E7 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_1651E7 + goto_if_eq EventScript_1651E7 setflag FLAG_FOUGHT_LUGIA release end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 065fdfa42..0f6f7ec04 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -4,10 +4,8 @@ NavelRock_Summit_MapScripts:: @ 8164F9F .byte 0 NavelRock_Summit_OnTransition:: @ 8164FAA - checkflag FLAG_FOUGHT_HO_OH - call_if TRUE, EventScript_164FBD - checkflag FLAG_FOUGHT_HO_OH - call_if FALSE, EventScript_164FC6 + call_if_set FLAG_FOUGHT_HO_OH, EventScript_164FBD + call_if_unset FLAG_FOUGHT_HO_OH, EventScript_164FC6 end EventScript_164FBD:: @ 8164FBD @@ -17,28 +15,26 @@ EventScript_164FBD:: @ 8164FBD EventScript_164FC6:: @ 8164FC6 setvar VAR_TEMP_1, 1 - checkflag FLAG_HO_OH_FLEW_AWAY - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_HO_OH_FLEW_AWAY, EventScript_1A77A9 setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return NavelRock_Summit_OnResume:: @ 8164FDD - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_164FE7 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_164FE7 end EventScript_164FE7:: @ 8164FE7 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject 1 return NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lockall setvar VAR_TEMP_1, 1 @@ -75,11 +71,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_1650B4 + goto_if_eq EventScript_1650B4 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_1650C2 + goto_if_eq EventScript_1650C2 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_1650C2 + goto_if_eq EventScript_1650C2 setflag FLAG_FOUGHT_HO_OH releaseall end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 3e6f39413..eae7004c8 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -83,10 +83,8 @@ Movement_167514:: @ 8167514 OneIsland_EventScript_167517:: @ 8167517 lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_16753F - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_167535 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16753F + goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_167535 msgbox gUnknown_818174E release end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index a4bd33e22..c0f9e08ed 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -28,8 +28,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 lock faceplayer - checkflag FLAG_GOT_HM06 - goto_if TRUE, EventScript_1653C5 + goto_if_set FLAG_GOT_HM06, EventScript_1653C5 msgbox gUnknown_817D622 giveitem ITEM_HM06 setflag FLAG_GOT_HM06 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index bb4d46273..fac29facf 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -7,9 +7,8 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - call_if ge, EventScript_170C22 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_170C36 + call_if_ge EventScript_170C22 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_170C36 end EventScript_170C22:: @ 8170C22 @@ -29,11 +28,11 @@ EventScript_170C36:: @ 8170C36 OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - call_if eq, EventScript_170C73 + call_if_eq EventScript_170C73 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 - call_if eq, EventScript_170C79 + call_if_eq EventScript_170C79 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 - call_if eq, EventScript_170C90 + call_if_eq EventScript_170C90 end EventScript_170C73:: @ 8170C73 @@ -84,10 +83,8 @@ EventScript_170CB1:: @ 8170CB1 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_170E34 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_170E3D + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_170E34 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_170E3D applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A0E17 @@ -104,18 +101,17 @@ EventScript_170CB1:: @ 8170CB1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A0FB1 - giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 - additem ITEM_METEORITE, 1 + msgreceiveditem gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 + additem ITEM_METEORITE applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A1113 - additem ITEM_TRI_PASS, 1 - giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 + giveitem_msg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if ge, EventScript_170E46 + call_if_ge EventScript_170E46 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if lt, EventScript_170E58 + call_if_lt EventScript_170E58 setflag FLAG_SYS_SEVII_MAP_123 msgbox gUnknown_81A1230 closemessage @@ -148,8 +144,7 @@ EventScript_170E46:: @ 8170E46 EventScript_170E58:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - additem ITEM_TOWN_MAP, 1 - giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 return Movement_170E7D:: @ 8170E7D @@ -192,8 +187,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D lock - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_170EB1 + goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_170EB1 msgbox gUnknown_81A1266 release end @@ -209,22 +203,20 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 - goto_if eq, EventScript_170F35 + goto_if_eq EventScript_170F35 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - goto_if eq, EventScript_170F9B - checkflag FLAG_RECOVERED_SAPPHIRE - goto_if TRUE, EventScript_170FA5 + goto_if_eq EventScript_170F9B + goto_if_set FLAG_RECOVERED_SAPPHIRE, EventScript_170FA5 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if eq, EventScript_17103A - checkflag FLAG_GOT_RUBY - goto_if TRUE, EventScript_171044 + goto_if_eq EventScript_17103A + goto_if_set FLAG_GOT_RUBY, EventScript_171044 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if eq, EventScript_1710F2 + goto_if_eq EventScript_1710F2 specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 - goto_if eq, EventScript_1710FC + goto_if_eq EventScript_1710FC compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - goto_if eq, EventScript_171134 + goto_if_eq EventScript_171134 msgbox gUnknown_81A1321 closemessage applymovement 3, Movement_FaceOriginalDirection @@ -236,9 +228,9 @@ EventScript_170F35:: @ 8170F35 msgbox gUnknown_81A1EBD random 3 compare VAR_RESULT, 0 - goto_if eq, EventScript_170F6D + goto_if_eq EventScript_170F6D compare VAR_RESULT, 1 - goto_if eq, EventScript_170F84 + goto_if_eq EventScript_170F84 famechecker FAMECHECKER_BILL, 5 msgbox gUnknown_81A2076 release @@ -325,14 +317,14 @@ EventScript_171044:: @ 8171044 waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_171099 + goto_if_eq EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_171099 + goto_if_eq EventScript_171099 goto EventScript_1710B2 end @@ -341,7 +333,7 @@ EventScript_1710B2:: @ 81710B2 removeitem ITEM_RUBY, 1 removeitem ITEM_TRI_PASS, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - additem ITEM_RAINBOW_PASS, 1 + additem ITEM_RAINBOW_PASS setflag FLAG_SYS_SEVII_MAP_4567 textcolor 3 playfanfare MUS_FAN5 @@ -404,8 +396,7 @@ OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_17116F + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_17116F msgbox gUnknown_81A218D release end @@ -417,10 +408,8 @@ EventScript_17116F:: @ 817116F OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 lockall - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_1711A0 - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_171196 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1711A0 + goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_171196 msgbox gUnknown_81A223F releaseall end @@ -467,13 +456,13 @@ EventScript_1711DA:: @ 81711DA msgbox gUnknown_81A13B8 closemessage compare VAR_TEMP_1, 1 - call_if eq, EventScript_1712E4 + call_if_eq EventScript_1712E4 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1712EF + call_if_eq EventScript_1712EF compare VAR_TEMP_1, 3 - call_if eq, EventScript_1712FA + call_if_eq EventScript_1712FA compare VAR_TEMP_1, 4 - call_if eq, EventScript_171305 + call_if_eq EventScript_171305 delay 10 msgbox gUnknown_81A13CB applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 831c17dde..1925cabd4 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -5,19 +5,17 @@ PalletTown_MapScripts:: @ 816545A PalletTown_OnTransition:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN - checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - call_if TRUE, EventScript_165488 + call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_165488 compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 - call_if eq, EventScript_1654A8 + call_if_eq EventScript_1654A8 compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - call_if eq, EventScript_1654A2 + call_if_eq EventScript_1654A2 end EventScript_165488:: @ 8165488 - checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - goto_if FALSE, EventScript_1A77A9 + goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_1A77A9 compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if ge, EventScript_1A77A9 + goto_if_ge EventScript_1A77A9 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return @@ -26,8 +24,7 @@ EventScript_1654A2:: @ 81654A2 return EventScript_1654A8:: @ 81654A8 - checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - goto_if TRUE, EventScript_1654BD + goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_1654BD setobjectxyperm 1, 5, 15 setobjectmovementtype 1, 7 return @@ -50,8 +47,7 @@ EventScript_1654D8:: @ 81654D8 addobject 3 applymovement 3, Movement_1655AF waitmovement 0 - checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if FALSE, EventScript_1655A1 + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1655A1 msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount @@ -60,7 +56,7 @@ EventScript_1654D8:: @ 81654D8 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare VAR_0x8009, 60 - goto_if lt, EventScript_165593 + goto_if_lt EventScript_165593 msgbox gUnknown_817D9AA closemessage playbgm MUS_ANNAI, 0 @@ -200,17 +196,17 @@ EventScript_165605:: @ 8165605 delay 30 addobject 3 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1656B8 + call_if_eq EventScript_1656B8 compare VAR_TEMP_1, 1 - call_if eq, EventScript_1656C3 + call_if_eq EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1656CE + call_if_eq EventScript_1656CE compare VAR_TEMP_1, 1 - call_if eq, EventScript_1656E0 + call_if_eq EventScript_1656E0 opendoor 16, 13 waitdooranim applymovement 3, Movement_16572E @@ -375,13 +371,12 @@ Movement_165758:: @ 8165758 PalletTown_EventScript_16575C:: @ 816575C lock compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 - goto_if eq, EventScript_1657ED + goto_if_eq EventScript_1657ED compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if eq, EventScript_165815 + goto_if_eq EventScript_165815 compare VAR_TEMP_2, 1 - goto_if eq, EventScript_1658C2 - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_165801 + goto_if_eq EventScript_1658C2 + goto_if_set FLAG_TEMP_2, EventScript_165801 msgbox gUnknown_81B1C8B applymovement 1, Movement_FacePlayer waitmovement 0 @@ -393,9 +388,9 @@ PalletTown_EventScript_16575C:: @ 816575C msgbox gUnknown_81B1C9F closemessage compare VAR_FACING, DIR_EAST - call_if eq, EventScript_1657D7 + call_if_eq EventScript_1657D7 compare VAR_FACING, DIR_EAST - call_if ne, EventScript_1657E2 + call_if_ne EventScript_1657E2 moveobjectoffscreen 1 setflag FLAG_TEMP_2 release diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 7a76bab27..d9c3729ae 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -4,9 +4,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 PalletTown_GarysHouse_OnTransition:: @ 8168D2D compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if lt, EventScript_168D44 + call_if_lt EventScript_168D44 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if ge, EventScript_168D50 + call_if_ge EventScript_168D50 end EventScript_168D44:: @ 8168D44 @@ -22,16 +22,15 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 lock faceplayer famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_168DB9 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_168DB9 compare VAR_TEMP_1, 1 - goto_if eq, EventScript_168EEC + goto_if_eq EventScript_168EEC compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - goto_if eq, EventScript_168F59 + goto_if_eq EventScript_168F59 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 - goto_if eq, EventScript_168EF6 + goto_if_eq EventScript_168EF6 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - goto_if ge, EventScript_168DAF + goto_if_ge EventScript_168DAF msgbox gUnknown_818D58C closemessage applymovement 1, Movement_FaceOriginalDirection @@ -47,23 +46,23 @@ EventScript_168DAF:: @ 8168DAF EventScript_168DB9:: @ 8168DB9 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 - goto_if lt, EventScript_168E46 + goto_if_lt EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_168E3C + goto_if_eq EventScript_168E3C msgbox gUnknown_818D8B2 special Special_ChooseMonFromParty waitstate lock faceplayer compare VAR_0x8004, 6 - goto_if ge, EventScript_168E3C + goto_if_ge EventScript_168E3C specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare VAR_RESULT, SPECIES_EGG - goto_if eq, EventScript_168E32 + goto_if_eq EventScript_168E32 msgbox gUnknown_818D8CC closemessage fadescreen 1 @@ -144,7 +143,7 @@ EventScript_168EF6:: @ 8168EF6 closemessage checkitemspace ITEM_TOWN_MAP, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_168F4F + goto_if_eq EventScript_168F4F applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 removeobject 2 @@ -153,8 +152,7 @@ EventScript_168EF6:: @ 8168EF6 applymovement 1, Movement_FacePlayer waitmovement 0 delay 12 - additem ITEM_TOWN_MAP, 1 - giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5 release end diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 999cd7dbb..29c4ff710 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -4,13 +4,12 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 lock faceplayer - checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB - goto_if TRUE, EventScript_168C4A + goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_168C38 + call_if_eq EventScript_168C38 compare VAR_RESULT, 1 - call_if eq, EventScript_168C41 + call_if_eq EventScript_168C41 closemessage applymovement 1, Movement_FaceOriginalDirection waitmovement 0 @@ -36,7 +35,7 @@ EventScript_168C4A:: @ 8168C4A PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall compare VAR_FACING, DIR_NORTH - goto_if eq, EventScript_168C78 + goto_if_eq EventScript_168C78 msgbox gUnknown_818D4F9 releaseall end @@ -44,9 +43,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 EventScript_168C78:: @ 8168C78 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_168C91 + call_if_eq EventScript_168C91 compare VAR_RESULT, 1 - call_if eq, EventScript_168C9A + call_if_eq EventScript_168C9A releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index b954f7ef7..983e1b1d3 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -5,7 +5,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 - call_if eq, EventScript_168CBA + call_if_eq EventScript_168CBA end EventScript_168CBA:: @ 8168CBA @@ -33,7 +33,7 @@ gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 special Special_SetSomeVariable diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 858b12d8c..8e20d3cab 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -7,13 +7,12 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E setflag FLAG_VISITED_OAKS_LAB compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - call_if eq, EventScript_168FC6 + call_if_eq EventScript_168FC6 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - call_if eq, EventScript_168FD5 + call_if_eq EventScript_168FD5 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - call_if eq, EventScript_168FC0 - checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - call_if TRUE, EventScript_168FBC + call_if_eq EventScript_168FC0 + call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_168FBC end EventScript_168FBC:: @ 8168FBC @@ -67,32 +66,32 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169174 + call_if_eq EventScript_169174 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1691BB + call_if_eq EventScript_1691BB compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169194 + call_if_eq EventScript_169194 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169194 + call_if_eq EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1691DB + call_if_eq EventScript_1691DB compare VAR_FACING, DIR_WEST - call_if eq, EventScript_1691E6 + call_if_eq EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1691F1 + call_if_eq EventScript_1691F1 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1691FC + call_if_eq EventScript_1691FC compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169215 + call_if_eq EventScript_169215 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169227 + call_if_eq EventScript_169227 addobject 9 addobject 10 delay 30 @@ -102,13 +101,13 @@ EventScript_169035:: @ 8169035 removeobject 10 delay 30 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169845 + call_if_eq EventScript_169845 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169850 + call_if_eq EventScript_169850 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16985B + call_if_eq EventScript_16985B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16986D + call_if_eq EventScript_16986D textcolor 3 playfanfare MUS_FAN5 message Text_18F0E8 @@ -121,13 +120,13 @@ EventScript_169035:: @ 8169035 closemessage playbgm MUS_RIVAL2, 0 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169B69 + call_if_eq EventScript_169B69 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 @@ -312,20 +311,20 @@ EventScript_16930B:: @ 816930B applymovement 4, Movement_FaceDown waitmovement 0 compare VAR_STARTER_MON, 0 - goto_if eq, EventScript_1693D2 + goto_if_eq EventScript_1693D2 compare VAR_STARTER_MON, 1 - goto_if eq, EventScript_16944D + goto_if_eq EventScript_16944D compare VAR_STARTER_MON, 2 - goto_if eq, EventScript_16935A + goto_if_eq EventScript_16935A end EventScript_16935A:: @ 816935A compare VAR_TEMP_2, 1 - goto_if eq, EventScript_16937C + goto_if_eq EventScript_16937C compare VAR_TEMP_2, 2 - goto_if eq, EventScript_16938C + goto_if_eq EventScript_16938C compare VAR_TEMP_2, 3 - goto_if eq, EventScript_16939C + goto_if_eq EventScript_16939C end EventScript_16937C:: @ 816937C @@ -347,7 +346,7 @@ EventScript_16939C:: @ 816939C end EventScript_1693AC:: @ 81693AC - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -377,11 +376,11 @@ Movement_1693CD:: @ 81693CD EventScript_1693D2:: @ 81693D2 compare VAR_TEMP_2, 1 - goto_if eq, EventScript_1693F4 + goto_if_eq EventScript_1693F4 compare VAR_TEMP_2, 2 - goto_if eq, EventScript_169404 + goto_if_eq EventScript_169404 compare VAR_TEMP_2, 3 - goto_if eq, EventScript_169414 + goto_if_eq EventScript_169414 end EventScript_1693F4:: @ 81693F4 @@ -403,7 +402,7 @@ EventScript_169414:: @ 8169414 end EventScript_169424:: @ 8169424 - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -436,11 +435,11 @@ Movement_169447:: @ 8169447 EventScript_16944D:: @ 816944D compare VAR_TEMP_2, 1 - goto_if eq, EventScript_16946F + goto_if_eq EventScript_16946F compare VAR_TEMP_2, 2 - goto_if eq, EventScript_16947F + goto_if_eq EventScript_16947F compare VAR_TEMP_2, 3 - goto_if eq, EventScript_16948F + goto_if_eq EventScript_16948F end EventScript_16946F:: @ 816946F @@ -462,7 +461,7 @@ EventScript_16948F:: @ 816948F end EventScript_16949F:: @ 816949F - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -493,11 +492,11 @@ EventScript_1694C2:: @ 81694C2 closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_2, 1 - call_if eq, EventScript_169504 + call_if_eq EventScript_169504 compare VAR_TEMP_2, 2 - call_if eq, EventScript_169516 + call_if_eq EventScript_169516 compare VAR_TEMP_2, 3 - call_if eq, EventScript_169528 + call_if_eq EventScript_169528 removeobject 8 playse SE_KAIDAN fadedefaultbgm @@ -575,9 +574,9 @@ PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if eq, EventScript_16958B + goto_if_eq EventScript_16958B compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169581 + goto_if_eq EventScript_169581 msgbox gUnknown_818DC67 release end @@ -595,24 +594,22 @@ EventScript_16958B:: @ 816958B PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_169600 + goto_if_set FLAG_TEMP_2, EventScript_169600 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 - goto_if eq, EventScript_169903 + goto_if_eq EventScript_169903 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - goto_if eq, EventScript_169A6E - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_1699CE + goto_if_eq EventScript_169A6E + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1699CE compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 - goto_if eq, EventScript_169903 + goto_if_eq EventScript_169903 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if eq, EventScript_1698D6 + goto_if_eq EventScript_1698D6 compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if ge, EventScript_16961E + goto_if_ge EventScript_16961E compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - goto_if eq, EventScript_169614 + goto_if_eq EventScript_169614 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if eq, EventScript_16960A + goto_if_eq EventScript_16960A msgbox gUnknown_818E116 release end @@ -646,13 +643,13 @@ EventScript_16961E:: @ 816961E msgbox gUnknown_818DE8D closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169A82 + call_if_eq EventScript_169A82 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169AC1 + call_if_eq EventScript_169AC1 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169A9E + call_if_eq EventScript_169A9E compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169A9E + call_if_eq EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 closemessage @@ -663,23 +660,23 @@ EventScript_16961E:: @ 816961E applymovement 4, Movement_Delay48 waitmovement 0 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169ADD + call_if_eq EventScript_169ADD compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169B14 + call_if_eq EventScript_169B14 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169AF5 + call_if_eq EventScript_169AF5 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169B86 + call_if_eq EventScript_169B86 msgbox gUnknown_818E508 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169882 + call_if_eq EventScript_169882 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_16988D + call_if_eq EventScript_16988D compare VAR_FACING, DIR_EAST - call_if eq, EventScript_1698A6 + call_if_eq EventScript_1698A6 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_1698B8 + call_if_eq EventScript_1698B8 msgbox gUnknown_818E536 closemessage delay 40 @@ -692,13 +689,13 @@ EventScript_16961E:: @ 816961E removeobject 10 delay 25 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169845 + call_if_eq EventScript_169845 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169850 + call_if_eq EventScript_169850 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16985B + call_if_eq EventScript_16985B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16986D + call_if_eq EventScript_16986D delay 10 textcolor 3 playfanfare MUS_FAN5 @@ -710,31 +707,30 @@ EventScript_16961E:: @ 816961E special sub_810B810 setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 msgbox gUnknown_818E612 - additem ITEM_POKE_BALL, 5 - giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 + giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 msgbox gUnknown_818E6D0 famechecker FAMECHECKER_OAK, 1 msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169B33 + call_if_eq EventScript_169B33 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169B45 + call_if_eq EventScript_169B45 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169B57 + call_if_eq EventScript_169B57 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169B57 + call_if_eq EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169B69 + call_if_eq EventScript_169B69 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 @@ -840,14 +836,13 @@ EventScript_1698D6:: @ 81698D6 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare VAR_0x8009, 1 - goto_if eq, EventScript_1699FB + goto_if_eq EventScript_1699FB goto EventScript_169903 end EventScript_169903:: @ 8169903 call EventScript_1A737B - checkflag FLAG_OAK_SAW_DEX_COMPLETION - goto_if TRUE, EventScript_169913 + goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913 release end @@ -857,13 +852,13 @@ EventScript_169913:: @ 8169913 message Text_1A7291 waitmessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169964 + call_if_eq EventScript_169964 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_16996F + call_if_eq EventScript_16996F compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16997A + call_if_eq EventScript_16997A compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169985 + call_if_eq EventScript_169985 applymovement 4, Movement_FacePlayer waitmovement 0 closemessage @@ -971,9 +966,8 @@ EventScript_1699CE:: @ 81699CE call EventScript_1A737B closemessage compare VAR_0x8009, 60 - goto_if lt, EventScript_1699F9 - checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if FALSE, EventScript_1699F9 + goto_if_lt EventScript_1699F9 + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1699F9 delay 30 msgbox gUnknown_818EDF5 goto EventScript_169035 @@ -986,28 +980,25 @@ EventScript_1699F9:: @ 81699F9 EventScript_1699FB:: @ 81699FB special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 - checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK - goto_if TRUE, EventScript_169A6E - checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - goto_if TRUE, EventScript_169A78 + goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E + goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78 checkitem ITEM_POKE_BALL, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_169A34 + goto_if_eq EventScript_169A34 goto EventScript_169A6E end EventScript_169A34:: @ 8169A34 compare VAR_MAP_SCENE_ROUTE22, 2 - goto_if ge, EventScript_169A45 + goto_if_ge EventScript_169A45 goto EventScript_169A6E end EventScript_169A45:: @ 8169A45 msgbox gUnknown_818E89C - additem ITEM_POKE_BALL, 5 - giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 + giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL release end @@ -1154,9 +1145,9 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if ge, EventScript_169DE4 + goto_if_ge EventScript_169DE4 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1167,35 +1158,35 @@ EventScript_169BE1:: @ 8169BE1 drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if eq, EventScript_OakDescribesBulbasaur + goto_if_eq EventScript_OakDescribesBulbasaur compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if eq, EventScript_OakDescribesCharmander + goto_if_eq EventScript_OakDescribesCharmander compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if eq, EventScript_OakDescribesSquirtle + goto_if_eq EventScript_OakDescribesSquirtle end EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_ThisPokeIsRealyEnergetic + goto_if_eq EventScript_ThisPokeIsRealyEnergetic compare VAR_RESULT, 0 - goto_if eq, EventScript_DeclinedStarter + goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_ThisPokeIsRealyEnergetic + goto_if_eq EventScript_ThisPokeIsRealyEnergetic compare VAR_RESULT, 0 - goto_if eq, EventScript_DeclinedStarter + goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_ThisPokeIsRealyEnergetic + goto_if_eq EventScript_ThisPokeIsRealyEnergetic compare VAR_RESULT, 0 - goto_if eq, EventScript_DeclinedStarter + goto_if_eq EventScript_DeclinedStarter end EventScript_DeclinedStarter:: @ 8169C71 @@ -1210,7 +1201,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 call EventScript_1A6675 setflag FLAG_SYS_POKEMON_GET setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE, 0, 0, 0 + givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES message Text_18E30D @@ -1219,9 +1210,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_GiveNicknameToStarter + goto_if_eq EventScript_GiveNicknameToStarter compare VAR_RESULT, 0 - goto_if eq, EventScript_SkipGiveNicknameToStarter + goto_if_eq EventScript_SkipGiveNicknameToStarter end EventScript_GiveNicknameToStarter:: @ 8169CCC @@ -1233,11 +1224,11 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC EventScript_SkipGiveNicknameToStarter:: @ 8169CDC closemessage compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if eq, EventScript_RivalWalksToCharmander + goto_if_eq EventScript_RivalWalksToCharmander compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if eq, EventScript_RivalWalksToSquirtle + goto_if_eq EventScript_RivalWalksToSquirtle compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if eq, EventScript_RivalWalksToBulbasaur + goto_if_eq EventScript_RivalWalksToBulbasaur end EventScript_RivalWalksToCharmander:: @ 8169CFF @@ -1269,8 +1260,7 @@ Movement_RivalTakesHisStarter:: @ 8169D2F playfanfare MUS_FAN5 waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - call_if TRUE, EventScript_169D5C + call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_169D5C release end @@ -1314,9 +1304,9 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if ge, EventScript_169DE4 + goto_if_ge EventScript_169DE4 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1329,9 +1319,9 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if ge, EventScript_169DE4 + goto_if_ge EventScript_169DE4 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1344,8 +1334,7 @@ EventScript_169DE4:: @ 8169DE4 PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_169E03 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E03 msgbox gUnknown_818EBE6 release end @@ -1359,8 +1348,7 @@ EventScript_169E03:: @ 8169E03 PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_169E2F + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E2F msgbox gUnknown_818EBE6 release end @@ -1394,7 +1382,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if ge, EventScript_169E90 + goto_if_ge EventScript_169E90 msgbox gUnknown_818EA84 releaseall end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 8b196334c..4f9cef868 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -14,7 +14,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D closemessage playbgm MUS_ANNAI, 0 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_165BD3 + call_if_eq EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -446,11 +446,11 @@ EventScript_165DBE:: @ 8165DBE closemessage playbgm MUS_ANNAI, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_165E0A + call_if_eq EventScript_165E0A compare VAR_TEMP_1, 1 - call_if eq, EventScript_165E26 + call_if_eq EventScript_165E26 compare VAR_TEMP_1, 2 - call_if eq, EventScript_165E42 + call_if_eq EventScript_165E42 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -1033,19 +1033,19 @@ PewterCity_EventScript_16607E:: @ 816607E faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_166136 + goto_if_eq EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 playbgm MUS_ANNAI, 0 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1660EE + call_if_eq EventScript_1660EE compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_166100 + call_if_eq EventScript_166100 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_166112 + call_if_eq EventScript_166112 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_166124 + call_if_eq EventScript_166124 msgbox gUnknown_817E5AC closemessage delay 10 @@ -1352,7 +1352,7 @@ PewterCity_EventScript_166244:: @ 8166244 faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_166263 + goto_if_eq EventScript_166263 msgbox gUnknown_817E644 release end @@ -1417,11 +1417,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1 EventScript_1662DE:: @ 81662DE textcolor 0 compare VAR_TEMP_1, 1 - call_if eq, EventScript_1663CA + call_if_eq EventScript_1663CA compare VAR_TEMP_1, 2 - call_if eq, EventScript_1663CA + call_if_eq EventScript_1663CA compare VAR_TEMP_1, 3 - call_if eq, EventScript_1663CA + call_if_eq EventScript_1663CA waitse playse SE_PIN applymovement 7, Movement_ExclamationMark @@ -1430,13 +1430,13 @@ EventScript_1662DE:: @ 81662DE waitmovement 0 msgbox gUnknown_817E902 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1663D5 + call_if_eq EventScript_1663D5 compare VAR_TEMP_1, 1 - call_if eq, EventScript_1663DA + call_if_eq EventScript_1663DA compare VAR_TEMP_1, 2 - call_if eq, EventScript_1663E6 + call_if_eq EventScript_1663E6 compare VAR_TEMP_1, 3 - call_if eq, EventScript_1663FC + call_if_eq EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 playfanfare MUS_FAN5 @@ -1452,13 +1452,13 @@ EventScript_1662DE:: @ 81662DE msgbox gUnknown_817EA06 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_166412 + call_if_eq EventScript_166412 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16641D + call_if_eq EventScript_16641D compare VAR_TEMP_1, 2 - call_if eq, EventScript_166428 + call_if_eq EventScript_166428 compare VAR_TEMP_1, 3 - call_if eq, EventScript_166433 + call_if_eq EventScript_166433 delay 30 textcolor 3 msgbox gUnknown_817EA36 diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 906a53650..540cf7965 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -3,9 +3,8 @@ PewterCity_Gym_MapScripts:: @ 816A592 PewterCity_Gym_EventScript_16A593:: @ 816A593 famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 - checkflag FLAG_GOT_TM39_FROM_BROCK - goto_if FALSE, EventScript_16A5F3 + trainerbattle_single TRAINER_LEADER_BROCK, Text_190CD4, Text_190E4F, EventScript_16A5C5, NO_MUSIC + goto_if_unset FLAG_GOT_TM39_FROM_BROCK, EventScript_16A5F3 msgbox gUnknown_819110F release end @@ -25,9 +24,8 @@ EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A634 - additem ITEM_TM39, 1 - giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 + goto_if_eq EventScript_16A634 + giveitem_msg gUnknown_8190FDB, ITEM_TM39 setflag FLAG_GOT_TM39_FROM_BROCK msgbox gUnknown_8190FF8 release @@ -39,20 +37,19 @@ EventScript_16A634:: @ 816A634 end PewterCity_Gym_EventScript_16A63E:: @ 816A63E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_LIAM, 0, Text_1911EC, Text_191237 + trainerbattle_single TRAINER_CAMPER_LIAM, Text_1911EC, Text_191237 msgbox gUnknown_819126B, 6 end PewterCity_Gym_EventScript_16A655:: @ 816A655 lock faceplayer - checkflag FLAG_DEFEATED_BROCK - goto_if TRUE, EventScript_16A67F + goto_if_set FLAG_DEFEATED_BROCK, EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16A689 + goto_if_eq EventScript_16A689 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A697 + goto_if_eq EventScript_16A697 end EventScript_16A67F:: @ 816A67F @@ -77,8 +74,7 @@ EventScript_16A6A5:: @ 816A6A5 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF lockall - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_16A6C3 + goto_if_set FLAG_BADGE01_GET, EventScript_16A6C3 msgbox gUnknown_819146E releaseall end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 31ab70f51..72b021f20 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -12,7 +12,7 @@ PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 3fdeee10c..be0f797f3 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -5,11 +5,11 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B lock faceplayer compare VAR_FACING, DIR_WEST - goto_if eq, EventScript_16A348 + goto_if_eq EventScript_16A348 compare VAR_FACING, DIR_SOUTH - goto_if eq, EventScript_16A348 + goto_if_eq EventScript_16A348 compare VAR_FACING, DIR_NORTH - goto_if eq, EventScript_16A348 + goto_if_eq EventScript_16A348 msgbox gUnknown_8190539 release end @@ -17,9 +17,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16A367 + goto_if_eq EventScript_16A367 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A37B + goto_if_eq EventScript_16A37B end EventScript_16A367:: @ 816A367 @@ -65,7 +65,7 @@ EventScript_16A3D1:: @ 816A3D1 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16A402 + goto_if_eq EventScript_16A402 msgbox gUnknown_81904F9 closemessage hidemoneybox 0, 0 @@ -77,14 +77,14 @@ EventScript_16A3D1:: @ 816A3D1 EventScript_16A402:: @ 816A402 checkmoney 50, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A476 + goto_if_eq EventScript_16A476 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16A455 + call_if_eq EventScript_16A455 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16A460 + call_if_eq EventScript_16A460 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16A46B + call_if_eq EventScript_16A46B playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 @@ -152,16 +152,14 @@ PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE lock faceplayer - checkflag FLAG_GOT_OLD_AMBER - goto_if TRUE, EventScript_16A4FF + goto_if_set FLAG_GOT_OLD_AMBER, EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A4F5 + goto_if_eq EventScript_16A4F5 setflag FLAG_GOT_OLD_AMBER removeobject 4 - additem ITEM_OLD_AMBER, 1 - giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 + giveitem_msg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 release end diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 56816cd76..62293c1ec 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -11,10 +11,9 @@ PokemonLeague_AgathasRoom_OnResume:: @ 8162825 end PokemonLeague_AgathasRoom_OnLoad:: @ 8162830 - checkflag FLAG_DEFEATED_AGATHA - call_if TRUE, EventScript_16284B + call_if_set FLAG_DEFEATED_AGATHA, EventScript_16284B compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 - call_if eq, EventScript_162845 + call_if_eq EventScript_162845 end EventScript_162845:: @ 8162845 @@ -48,21 +47,16 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 lock faceplayer famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_AGATHA - goto_if TRUE, EventScript_162911 + goto_if_set FLAG_DEFEATED_AGATHA, EventScript_162911 famechecker FAMECHECKER_AGATHA, 0 famechecker FAMECHECKER_AGATHA, 4 famechecker FAMECHECKER_OAK, 4 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_1628E9 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_1628F2 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1628E9 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_1628F2 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_1628FB - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162906 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1628FB + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162906 clearflag FLAG_TEMP_5 goto EventScript_16291B @@ -78,11 +72,11 @@ EventScript_1628F2:: @ 81628F2 return EventScript_1628FB:: @ 81628FB - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA, 0, Text_1786D7 + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, Text_1786D7 return EventScript_162906:: @ 8162906 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA_2, 0, Text_1786D7 + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, Text_1786D7 return EventScript_162911:: @ 8162911 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 2f3fd90a1..709b5ab03 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -11,10 +11,9 @@ PokemonLeague_BrunosRoom_OnResume:: @ 816269A end PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5 - checkflag FLAG_DEFEATED_BRUNO - call_if TRUE, EventScript_1626C0 + call_if_set FLAG_DEFEATED_BRUNO, EventScript_1626C0 compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2 - call_if eq, EventScript_1626BA + call_if_eq EventScript_1626BA end EventScript_1626BA:: @ 81626BA @@ -48,20 +47,15 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC lock faceplayer famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_BRUNO - goto_if TRUE, EventScript_162779 + goto_if_set FLAG_DEFEATED_BRUNO, EventScript_162779 famechecker FAMECHECKER_BRUNO, 0 famechecker FAMECHECKER_BRUNO, 1 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_162751 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_16275A + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162751 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_16275A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162763 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_16276E + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162763 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16276E clearflag FLAG_TEMP_5 goto EventScript_1627B0 @@ -77,24 +71,24 @@ EventScript_16275A:: @ 816275A return EventScript_162763:: @ 8162763 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO, 0, Text_178409 + trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, Text_178409 return EventScript_16276E:: @ 816276E - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO_2, 0, Text_178409 + trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, Text_178409 return EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1627FA + call_if_eq EventScript_1627FA compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1627EF + call_if_eq EventScript_1627EF compare VAR_FACING, DIR_WEST - call_if eq, EventScript_162805 + call_if_eq EventScript_162805 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_162805 + call_if_eq EventScript_162805 release end @@ -104,13 +98,13 @@ EventScript_1627B0:: @ 81627B0 msgbox gUnknown_8178420 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1627FA + call_if_eq EventScript_1627FA compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1627EF + call_if_eq EventScript_1627EF compare VAR_FACING, DIR_WEST - call_if eq, EventScript_162805 + call_if_eq EventScript_162805 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_162805 + call_if_eq EventScript_162805 release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 87754a660..010dd4402 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -8,32 +8,32 @@ PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_162B1E + call_if_eq EventScript_162B1E compare VAR_STARTER_MON, 1 - call_if eq, EventScript_162B31 + call_if_eq EventScript_162B31 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_162B44 + call_if_eq EventScript_162B44 end EventScript_162B1E:: @ 8162B1E checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B31:: @ 8162B31 checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B44:: @ 8162B44 checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B57:: @ 8162B57 @@ -59,20 +59,16 @@ EventScript_162B76:: @ 8162B76 applymovement OBJ_EVENT_ID_PLAYER, Movement_162D07 waitmovement 0 delay 20 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_162CB3 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_162CBC + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_162C68 + goto_if_eq EventScript_162C68 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162C6F - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162C91 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C6F + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C91 setflag FLAG_TEMP_4 clearflag FLAG_TEMP_5 setflag FLAG_DEFEATED_CHAMP @@ -117,20 +113,20 @@ EventScript_162C68:: @ 8162C68 EventScript_162C6F:: @ 8162C6F compare VAR_STARTER_MON, 2 - call_if eq, EventScript_162CC5 + call_if_eq EventScript_162CC5 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_162CD0 + call_if_eq EventScript_162CD0 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_162CDB + call_if_eq EventScript_162CDB return EventScript_162C91:: @ 8162C91 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_162CE6 + call_if_eq EventScript_162CE6 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_162CF1 + call_if_eq EventScript_162CF1 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_162CFC + call_if_eq EventScript_162CFC return EventScript_162CB3:: @ 8162CB3 @@ -142,27 +138,27 @@ EventScript_162CBC:: @ 8162CBC return EventScript_162CC5:: @ 8162CC5 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_SQUIRTLE, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, Text_178E3F return EventScript_162CD0:: @ 8162CD0 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_BULBASAUR, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, Text_178E3F return EventScript_162CDB:: @ 8162CDB - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_CHARMANDER, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, Text_178E3F return EventScript_162CE6:: @ 8162CE6 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_SQUIRTLE, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, Text_178E3F return EventScript_162CF1:: @ 8162CF1 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_BULBASAUR, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, Text_178E3F return EventScript_162CFC:: @ 8162CFC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_CHARMANDER, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, Text_178E3F return Movement_162D07:: @ 8162D07 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index d082de03b..8c6b9924e 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -12,9 +12,8 @@ PokemonLeague_LancesRoom_OnResume:: @ 8162942 PokemonLeague_LancesRoom_OnLoad:: @ 816294D compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4 - call_if eq, EventScript_162962 - checkflag FLAG_DEFEATED_LANCE - call_if TRUE, EventScript_162968 + call_if_eq EventScript_162962 + call_if_set FLAG_DEFEATED_LANCE, EventScript_162968 end EventScript_162962:: @ 8162962 @@ -102,20 +101,15 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 lock faceplayer famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_LANCE - goto_if TRUE, EventScript_162AA1 + goto_if_set FLAG_DEFEATED_LANCE, EventScript_162AA1 famechecker FAMECHECKER_LANCE, 0 famechecker FAMECHECKER_LANCE, 1 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_162A79 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_162A82 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162A79 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162A82 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162A8B - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162A96 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A8B + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A96 clearflag FLAG_TEMP_5 goto EventScript_162AAB @@ -131,11 +125,11 @@ EventScript_162A82:: @ 8162A82 return EventScript_162A8B:: @ 8162A8B - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE, 0, Text_178A15 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, Text_178A15 return EventScript_162A96:: @ 8162A96 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE_2, 0, Text_178A15 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, Text_178A15 return EventScript_162AA1:: @ 8162AA1 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 449bd9f9a..e95ecfd98 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -12,10 +12,9 @@ PokemonLeague_LoreleisRoom_OnResume:: @ 8162586 end PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591 - checkflag FLAG_DEFEATED_LORELEI - call_if TRUE, EventScript_1625AC + call_if_set FLAG_DEFEATED_LORELEI, EventScript_1625AC compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1 - call_if eq, EventScript_1625A6 + call_if_eq EventScript_1625A6 end EventScript_1625A6:: @ 81625A6 @@ -53,20 +52,15 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC lock faceplayer famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_LORELEI - goto_if TRUE, EventScript_162669 + goto_if_set FLAG_DEFEATED_LORELEI, EventScript_162669 famechecker FAMECHECKER_LORELEI, 0 famechecker FAMECHECKER_LORELEI, 1 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162641 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_16264A + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162641 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16264A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162653 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_16265E + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162653 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16265E clearflag FLAG_TEMP_5 goto EventScript_162673 @@ -82,11 +76,11 @@ EventScript_16264A:: @ 816264A return EventScript_162653:: @ 8162653 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI, 0, Text_178191 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, Text_178191 return EventScript_16265E:: @ 816265E - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI_2, 0, Text_178191 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, Text_178191 return EventScript_162669:: @ 8162669 diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index cacbe77da..42fe1d0b1 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -4,8 +4,7 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 .byte 0 PokemonMansion_1F_OnLoad:: @ 8162204 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7B7A + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B7A end PokemonMansion_1F_OnTransition:: @ 816220E @@ -23,11 +22,11 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 end PokemonMansion_1F_EventScript_162226:: @ 8162226 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TED, 0, Text_177364, Text_177391 + trainerbattle_single TRAINER_SCIENTIST_TED, Text_177364, Text_177391 msgbox gUnknown_8177397, 6 end PokemonMansion_1F_EventScript_16223D:: @ 816223D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOHNSON, 0, Text_1773C6, Text_1773FD + trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, Text_1773C6, Text_1773FD msgbox gUnknown_8177418, 6 end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index 965993fc8..bc80d5344 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -3,8 +3,7 @@ PokemonMansion_2F_MapScripts:: @ 8162254 .byte 0 PokemonMansion_2F_OnLoad:: @ 816225A - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7D3E + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7D3E end PokemonMansion_2F_EventScript_162264:: @ 8162264 @@ -26,6 +25,6 @@ PokemonMansion_2F_EventScript_162281:: @ 8162281 end PokemonMansion_2F_EventScript_16228A:: @ 816228A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_ARNIE, 0, Text_177498, Text_1774CB + trainerbattle_single TRAINER_BURGLAR_ARNIE, Text_177498, Text_1774CB msgbox gUnknown_81774E3, 6 end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 141c63c7e..ff194f1ec 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -3,8 +3,7 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 .byte 0 PokemonMansion_3F_OnLoad:: @ 81622A7 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7E72 + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7E72 end PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 @@ -22,11 +21,11 @@ PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 end PokemonMansion_3F_EventScript_1622CE:: @ 81622CE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_SIMON, 0, Text_1775E7, Text_177602 + trainerbattle_single TRAINER_BURGLAR_SIMON, Text_1775E7, Text_177602 msgbox gUnknown_8177608, 6 end PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_BRAYDON, 0, Text_177628, Text_177643 + trainerbattle_single TRAINER_SCIENTIST_BRAYDON, Text_177628, Text_177643 msgbox gUnknown_8177657, 6 end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 7d1e70692..db087a466 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -3,8 +3,7 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC .byte 0 PokemonMansion_B1F_OnLoad:: @ 8162302 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7F4C + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7F4C end PokemonMansion_B1F_EventScript_16230C:: @ 816230C @@ -22,11 +21,11 @@ PokemonMansion_B1F_EventScript_162320:: @ 8162320 end PokemonMansion_B1F_EventScript_162329:: @ 8162329 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_LEWIS, 0, Text_1776C0, Text_1776D7 + trainerbattle_single TRAINER_BURGLAR_LEWIS, Text_1776C0, Text_1776D7 msgbox gUnknown_81776DE, 6 end PokemonMansion_B1F_EventScript_162340:: @ 8162340 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_IVAN, 0, Text_177720, Text_177757 + trainerbattle_single TRAINER_SCIENTIST_IVAN, Text_177720, Text_177757 msgbox gUnknown_817776A, 6 end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index 35e34047e..01686671a 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -23,7 +23,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A faceplayer checkplayergender compare VAR_RESULT, 0 - goto_if eq, EventScript_163272 + goto_if_eq EventScript_163272 msgbox gUnknown_8179BFC release end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index eb47508bf..802247402 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -21,9 +21,9 @@ EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_163339 + call_if_eq EventScript_163339 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16334B + call_if_eq EventScript_16334B applymovement 1, Movement_ExclamationMark waitmovement 0 applymovement 1, Movement_Delay48 @@ -31,18 +31,18 @@ EventScript_1632A7:: @ 81632A7 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_16335D + call_if_eq EventScript_16335D compare VAR_STARTER_MON, 1 - call_if eq, EventScript_163368 + call_if_eq EventScript_163368 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_163373 + call_if_eq EventScript_163373 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16337E + call_if_eq EventScript_16337E compare VAR_TEMP_1, 1 - call_if eq, EventScript_163389 + call_if_eq EventScript_163389 playse SE_KAIDAN delay 25 fadedefaultbgm @@ -64,15 +64,15 @@ EventScript_16334B:: @ 816334B return EventScript_16335D:: @ 816335D - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, Text_179D73 return EventScript_163368:: @ 8163368 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, Text_179D73 return EventScript_163373:: @ 8163373 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, Text_179D73 return EventScript_16337E:: @ 816337E diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index 653a4e434..d38b39b66 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_3F_MapScripts:: @ 81633A6 .byte 0 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PATRICIA, 0, Text_179FA0, Text_179FBC + trainerbattle_single TRAINER_CHANNELER_PATRICIA, Text_179FA0, Text_179FBC msgbox gUnknown_8179FD3, 6 end PokemonTower_3F_EventScript_1633BE:: @ 81633BE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_CARLY, 0, Text_179F62, Text_179F72 + trainerbattle_single TRAINER_CHANNELER_CARLY, Text_179F62, Text_179F72 msgbox gUnknown_8179F88, 6 end PokemonTower_3F_EventScript_1633D5:: @ 81633D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_HOPE, 0, Text_179F09, Text_179F21 + trainerbattle_single TRAINER_CHANNELER_HOPE, Text_179F09, Text_179F21 msgbox gUnknown_8179F31, 6 end diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index 7aa23fbe8..c6745eb70 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_4F_MapScripts:: @ 81633EC .byte 0 PokemonTower_4F_EventScript_1633ED:: @ 81633ED - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PAULA, 0, Text_17A004, Text_17A017 + trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017 msgbox gUnknown_817A02B, 6 end PokemonTower_4F_EventScript_163404:: @ 8163404 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_LAUREL, 0, Text_17A046, Text_17A061 + trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061 msgbox gUnknown_817A067, 6 end PokemonTower_4F_EventScript_16341B:: @ 816341B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JODY, 0, Text_17A096, Text_17A0AB + trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB msgbox gUnknown_817A0BB, 6 end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 18dc1aedd..156cfd038 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -22,21 +22,21 @@ PokemonTower_5F_EventScript_163453:: @ 8163453 end PokemonTower_5F_EventScript_16345B:: @ 816345B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TAMMY, 0, Text_17A11F, Text_17A132 + trainerbattle_single TRAINER_CHANNELER_TAMMY, Text_17A11F, Text_17A132 msgbox gUnknown_817A138, 6 end PokemonTower_5F_EventScript_163472:: @ 8163472 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_RUTH, 0, Text_17A150, Text_17A164 + trainerbattle_single TRAINER_CHANNELER_RUTH, Text_17A150, Text_17A164 msgbox gUnknown_817A176, 6 end PokemonTower_5F_EventScript_163489:: @ 8163489 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_KARINA, 0, Text_17A187, Text_17A190 + trainerbattle_single TRAINER_CHANNELER_KARINA, Text_17A187, Text_17A190 msgbox gUnknown_817A194, 6 end PokemonTower_5F_EventScript_1634A0:: @ 81634A0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JANAE, 0, Text_17A1AA, Text_17A1B7 + trainerbattle_single TRAINER_CHANNELER_JANAE, Text_17A1AA, Text_17A1B7 msgbox gUnknown_817A1BD, 6 end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 42c419d8e..3d74508e6 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -7,13 +7,13 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 msgbox gUnknown_817A2F8 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special ScrSpecial_StartMarowakBattle waitstate special sub_8112364 compare VAR_RESULT, 0 - goto_if eq, EventScript_1634F5 + goto_if_eq EventScript_1634F5 applymovement OBJ_EVENT_ID_PLAYER, Movement_163512 waitmovement 0 releaseall @@ -36,16 +36,16 @@ Movement_163512:: @ 8163512 step_end PokemonTower_6F_EventScript_163514:: @ 8163514 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253 + trainerbattle_single TRAINER_CHANNELER_ANGELICA, Text_17A243, Text_17A253 msgbox gUnknown_817A25A, 6 end PokemonTower_6F_EventScript_16352B:: @ 816352B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F + trainerbattle_single TRAINER_CHANNELER_EMILIA, Text_17A272, Text_17A27F msgbox gUnknown_817A293, 6 end PokemonTower_6F_EventScript_163542:: @ 8163542 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC + trainerbattle_single TRAINER_CHANNELER_JENNIFER, Text_17A2C8, Text_17A2DC msgbox gUnknown_817A2E2, 6 end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 73a22762d..5ce28e764 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -16,7 +16,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A end PokemonTower_7F_EventScript_163586:: @ 8163586 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_19, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, Text_17A380, Text_17A3A4, EventScript_1635A1 msgbox gUnknown_817A3AF, 6 end @@ -25,11 +25,11 @@ EventScript_1635A1:: @ 81635A1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 10 - goto_if eq, EventScript_1635E0 + goto_if_eq EventScript_1635E0 compare VAR_0x8004, 11 - goto_if eq, EventScript_1635F0 + goto_if_eq EventScript_1635F0 compare VAR_0x8004, 9 - goto_if eq, EventScript_163600 + goto_if_eq EventScript_163600 applymovement 2, Movement_16362C waitmovement 0 goto EventScript_163616 @@ -103,7 +103,7 @@ Movement_163633:: @ 8163633 step_end PokemonTower_7F_EventScript_16363D:: @ 816363D - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_20, 0, Text_17A3CD, Text_17A466, EventScript_163658 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, Text_17A3CD, Text_17A466, EventScript_163658 msgbox gUnknown_817A477, 6 end @@ -113,9 +113,9 @@ EventScript_163658:: @ 8163658 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 12 - goto_if eq, EventScript_163699 + goto_if_eq EventScript_163699 compare VAR_0x8004, 13 - goto_if eq, EventScript_1636A9 + goto_if_eq EventScript_1636A9 applymovement 3, Movement_1636C6 waitmovement 0 goto EventScript_1636B9 @@ -169,7 +169,7 @@ Movement_1636CD:: @ 81636CD step_end PokemonTower_7F_EventScript_1636D6:: @ 81636D6 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_21, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, Text_17A4CF, Text_17A4EE, EventScript_1636F1 msgbox gUnknown_817A506, 6 end @@ -178,9 +178,9 @@ EventScript_1636F1:: @ 81636F1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 10 - goto_if eq, EventScript_163725 + goto_if_eq EventScript_163725 compare VAR_0x8004, 9 - goto_if eq, EventScript_163735 + goto_if_eq EventScript_163735 applymovement 4, Movement_163754 waitmovement 0 goto EventScript_163745 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index cb9867905..1af3e9e76 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -4,25 +4,21 @@ PowerPlant_MapScripts:: @ 8163764 .byte 0 PowerPlant_OnResume:: @ 816376F - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_163779 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163779 end EventScript_163779:: @ 8163779 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject VAR_LAST_TALKED return PowerPlant_OnTransition:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT - checkflag FLAG_FOUGHT_ZAPDOS - call_if FALSE, EventScript_1637AC - checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 - call_if FALSE, EventScript_1637B0 - checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 - call_if FALSE, EventScript_1637B4 + call_if_unset FLAG_FOUGHT_ZAPDOS, EventScript_1637AC + call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, EventScript_1637B0 + call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, EventScript_1637B4 end EventScript_1637AC:: @ 81637AC @@ -40,7 +36,7 @@ EventScript_1637B4:: @ 81637B4 PowerPlant_EventScript_1637B8:: @ 81637B8 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -59,11 +55,11 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16381B + goto_if_eq EventScript_16381B compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163824 + goto_if_eq EventScript_163824 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163824 + goto_if_eq EventScript_163824 setflag FLAG_FOUGHT_ZAPDOS release end @@ -81,7 +77,7 @@ EventScript_163824:: @ 8163824 PowerPlant_EventScript_16382F:: @ 816382F special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -95,11 +91,11 @@ PowerPlant_EventScript_16382F:: @ 816382F special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_163884 + goto_if_eq EventScript_163884 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163884 + goto_if_eq EventScript_163884 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163884 + goto_if_eq EventScript_163884 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 release end @@ -112,7 +108,7 @@ EventScript_163884:: @ 8163884 PowerPlant_EventScript_16388D:: @ 816388D special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -126,11 +122,11 @@ PowerPlant_EventScript_16388D:: @ 816388D special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_1638E2 + goto_if_eq EventScript_1638E2 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_1638E2 + goto_if_eq EventScript_1638E2 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_1638E2 + goto_if_eq EventScript_1638E2 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 release end diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index e96d22bb1..8049032dd 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -11,36 +11,36 @@ RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 end RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LENNY, 0, Text_179366, Text_179388 + trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388 msgbox gUnknown_8179396, 6 end RockTunnel_1F_EventScript_162E00:: @ 8162E00 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_OLIVER, 0, Text_1793F1, Text_17940E + trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E msgbox gUnknown_817943A, 6 end RockTunnel_1F_EventScript_162E17:: @ 8162E17 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LUCAS, 0, Text_17947B, Text_1794AC + trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC msgbox gUnknown_81794B4, 6 end RockTunnel_1F_EventScript_162E2E:: @ 8162E2E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_ASHTON, 0, Text_1794D4, Text_1794EE + trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE msgbox gUnknown_81794F9, 6 end RockTunnel_1F_EventScript_162E45:: @ 8162E45 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_LEAH, 0, Text_17951C, Text_179547 + trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547 msgbox gUnknown_8179558, 6 end RockTunnel_1F_EventScript_162E5C:: @ 8162E5C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ARIANA, 0, Text_1795E5, Text_179604 + trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604 msgbox gUnknown_8179613, 6 end RockTunnel_1F_EventScript_162E73:: @ 8162E73 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DANA, 0, Text_179577, Text_1795A1 + trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1 msgbox gUnknown_81795B5, 6 end diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 27650f752..39cf01a9b 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -2,41 +2,41 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A .byte 0 RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SOFIA, 0, Text_179657, Text_1796B9 + trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9 msgbox gUnknown_81796CE, 6 end RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARTHA, 0, Text_1798AD, Text_1798DD + trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD msgbox gUnknown_81798E9, 6 end RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DUDLEY, 0, Text_1796E1, Text_179700 + trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700 msgbox gUnknown_8179712, 6 end RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALLEN, 0, Text_179829, Text_179856 + trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856 msgbox gUnknown_817987A, 6 end RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ERIC, 0, Text_179916, Text_179932 + trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932 msgbox gUnknown_817993E, 6 end RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_COOPER, 0, Text_17973A, Text_17975F + trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F msgbox gUnknown_8179777, 6 end RockTunnel_B1F_EventScript_162F15:: @ 8162F15 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_STEVE, 0, Text_1797A4, Text_1797CB + trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB msgbox gUnknown_81797DE, 6 end RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_WINSTON, 0, Text_179968, Text_179997 + trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997 msgbox gUnknown_81799AC, 6 end diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index ee140a736..a5158b6f3 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -5,7 +5,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195 RocketHideout_B1F_OnLoad:: @ 81611A0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 - call_if lt, EventScript_161233 + call_if_lt EventScript_161233 end RocketHideout_B1F_OnTransition:: @ 81611AA @@ -13,27 +13,27 @@ RocketHideout_B1F_OnTransition:: @ 81611AA end RocketHideout_B1F_EventScript_1611AE:: @ 81611AE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_8, 0, Text_174ECA, Text_174EED + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED msgbox gUnknown_8174EFA, 6 end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_9, 0, Text_174F2C, Text_174F60 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60 msgbox gUnknown_8174F66, 6 end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_10, 0, Text_174F94, Text_174FA4 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4 msgbox gUnknown_8174FB3, 6 end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_11, 0, Text_174FE1, Text_174FF8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8 msgbox gUnknown_8175007, 6 end RocketHideout_B1F_EventScript_16120A:: @ 816120A - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_12, 0, Text_17503A, Text_17505A, EventScript_161225 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225 msgbox gUnknown_8175060, 6 end diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 6264371b7..9e6338f9c 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -2,6 +2,6 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 .byte 0 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_13, 0, Text_17508C, Text_1750BF + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF msgbox gUnknown_81750CC, 6 end diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index 5cc7fc7d8..962aa3385 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -2,11 +2,11 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_14, 0, Text_17511A, Text_17514A + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A msgbox gUnknown_817515B, 6 end RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_15, 0, Text_17519E, Text_1751CE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE msgbox gUnknown_81751E0, 6 end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 7adf4ce23..2324e6fc6 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -5,11 +5,11 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 RocketHideout_B4F_OnLoad:: @ 81612EE setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 compare VAR_TEMP_1, 2 - call_if ne, EventScript_16146A + call_if_ne EventScript_16146A end EventScript_161311:: @ 8161311 @@ -24,7 +24,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI, 0, Text_175318 + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318 msgbox gUnknown_817532D fadescreen 1 closemessage @@ -43,12 +43,12 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 removeobject 2 giveitem ITEM_SILPH_SCOPE compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 release end RocketHideout_B4F_EventScript_161381:: @ 8161381 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_18, 0, Text_175488, Text_1754B9, EventScript_16139D + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, Text_175488, Text_1754B9, EventScript_16139D msgbox gUnknown_81754BD release end @@ -67,43 +67,43 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD removeobject 4 giveitem ITEM_LIFT_KEY compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 release end RocketHideout_B4F_EventScript_1613CE:: @ 81613CE - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_16, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9 msgbox gUnknown_817540C, 6 end EventScript_1613E9:: @ 81613E9 setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1614A1 + call_if_eq EventScript_1614A1 compare VAR_TEMP_1, 2 - call_if eq, EventScript_161462 + call_if_eq EventScript_161462 release end RocketHideout_B4F_EventScript_161418:: @ 8161418 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_17, 0, Text_175437, Text_175463, EventScript_161433 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433 msgbox gUnknown_817546A, 6 end EventScript_161433:: @ 8161433 setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1614A1 + call_if_eq EventScript_1614A1 compare VAR_TEMP_1, 2 - call_if eq, EventScript_161462 + call_if_eq EventScript_161462 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 145364418..05e01e27a 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -3,11 +3,9 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 lockall - checkflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT - goto_if FALSE, EventScript_16161B + goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B setvar VAR_0x8004, 2 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_1A535C @@ -54,7 +52,7 @@ EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare VAR_ELEVATOR_FLOOR, 3 - goto_if eq, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 3 goto EventScript_161609 @@ -66,7 +64,7 @@ EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 compare VAR_ELEVATOR_FLOOR, 2 - goto_if eq, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 2 goto EventScript_161609 @@ -78,7 +76,7 @@ EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 compare VAR_ELEVATOR_FLOOR, 0 - goto_if eq, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 0 goto EventScript_161609 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 7b8f1f95e..96e12e7da 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -4,19 +4,18 @@ Route1_MapScripts:: @ 8167EFD Route1_EventScript_167EFE:: @ 8167EFE lock faceplayer - checkflag FLAG_GOT_POTION_ON_ROUTE_1 - goto_if TRUE, EventScript_167F48 + goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48 msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 message Text_ObtainedTheX waitmessage waitfanfare - additem ITEM_POTION, 1 + additem ITEM_POTION msgbox gUnknown_8183387 call EventScript_1A6675 setflag FLAG_GOT_POTION_ON_ROUTE_1 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 7e04196d3..32864b8fb 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -31,23 +31,21 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 lock faceplayer call EventScript_16FCF1 - checkflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE - goto_if TRUE, EventScript_16FCE7 + goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 compare VAR_0x8006, 20 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_EVERSTONE, 1 - giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE msgbox gUnknown_819E7AF release diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index fe9f21907..28222d32a 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -3,8 +3,7 @@ Route11_EastEntrance_2F_MapScripts:: @ 816FD34 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 lockall - checkflag FLAG_WOKE_UP_ROUTE_12_SNORLAX - goto_if TRUE, EventScript_16FD49 + goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, EventScript_16FD49 msgbox gUnknown_819EC8A releaseall end @@ -23,17 +22,16 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C faceplayer setvar VAR_0x8008, 4 call EventScript_1A8CAD - checkflag FLAG_DID_NINA_TRADE - goto_if TRUE, EventScript_16FDCE + goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16FDB6 + goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16FDB6 + goto_if_ge EventScript_16FDB6 call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16FDC0 + goto_if_ne EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_NINA_TRADE @@ -60,23 +58,21 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 lock faceplayer call EventScript_16FE64 - checkflag FLAG_GOT_ITEMFINDER - goto_if TRUE, EventScript_16FE5A + goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FE64 compare VAR_0x8006, 30 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_ITEMFINDER, 1 - giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_GOT_ITEMFINDER msgbox gUnknown_819EB59 release diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index cdd28f02a..5aa50bfc1 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -3,8 +3,7 @@ Route12_MapScripts:: @ 8168000 .byte 0 Route12_OnResume:: @ 8168006 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_168010 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_168010 end EventScript_168010:: @ 8168010 @@ -14,15 +13,14 @@ EventScript_168010:: @ 8168010 Route12_EventScript_168014:: @ 8168014 lock faceplayer - checkflag FLAG_GOT_POKE_FLUTE - goto_if FALSE, EventScript_168099 + goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_168099 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16808D + goto_if_eq EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -36,11 +34,11 @@ Route12_EventScript_168014:: @ 8168014 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16808F + goto_if_eq EventScript_16808F compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_16808F + goto_if_eq EventScript_16808F compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_16808F + goto_if_eq EventScript_16808F release end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 317ffe41c..d69b1a68a 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -4,11 +4,10 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C lock faceplayer - checkflag FLAG_GOT_SUPER_ROD - goto_if TRUE, EventScript_16FF7F + goto_if_set FLAG_GOT_SUPER_ROD, EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16FF34 + goto_if_eq EventScript_16FF34 msgbox gUnknown_819F1FA release end @@ -16,10 +15,10 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16FF75 - additem ITEM_SUPER_ROD, 1 + goto_if_eq EventScript_16FF75 + additem ITEM_SUPER_ROD msgbox gUnknown_819F05B - giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD + msgreceiveditem gUnknown_819F0B2, ITEM_SUPER_ROD setflag FLAG_GOT_SUPER_ROD msgbox gUnknown_819F0EB release @@ -33,28 +32,28 @@ EventScript_16FF75:: @ 816FF75 EventScript_16FF7F:: @ 816FF7F special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare VAR_RESULT, 0 - goto_if eq, EventScript_16FFF5 + goto_if_eq EventScript_16FFF5 special GetMagikarpSizeRecordInfo msgbox gUnknown_819F2DB special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 6 - goto_if ge, EventScript_16FFFF + goto_if_ge EventScript_16FFFF special CompareMagikarpSize compare VAR_RESULT, 1 - goto_if eq, EventScript_170001 + goto_if_eq EventScript_170001 compare VAR_RESULT, 2 - goto_if eq, EventScript_17000B + goto_if_eq EventScript_17000B compare VAR_RESULT, 3 - goto_if eq, EventScript_170031 + goto_if_eq EventScript_170031 compare VAR_RESULT, 4 - goto_if eq, EventScript_17001E + goto_if_eq EventScript_17001E release end @@ -73,15 +72,13 @@ EventScript_170001:: @ 8170001 end EventScript_17000B:: @ 817000B - checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP - goto_if FALSE, EventScript_170031 + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 msgbox gUnknown_819F40A release end EventScript_17001E:: @ 817001E - checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP - goto_if FALSE, EventScript_170031 + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 msgbox gUnknown_819F3CB release end @@ -91,7 +88,7 @@ EventScript_170031:: @ 8170031 msgbox gUnknown_819F31B giveitem ITEM_NET_BALL compare VAR_RESULT, 0 - goto_if eq, EventScript_17005D + goto_if_eq EventScript_17005D msgbox gUnknown_819F395 release end @@ -103,8 +100,7 @@ EventScript_17005D:: @ 817005D Route12_FishingHouse_EventScript_170067:: @ 8170067 lockall - checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP - goto_if TRUE, EventScript_17007B + goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_17007B msgbox gUnknown_819F50C releaseall end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 44c1629fc..1c6014110 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -12,18 +12,16 @@ Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A lock faceplayer - checkflag FLAG_GOT_TM27 - goto_if TRUE, EventScript_16FF01 + goto_if_set FLAG_GOT_TM27, EventScript_16FF01 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_16FEE5 + call_if_eq EventScript_16FEE5 compare VAR_RESULT, 1 - call_if eq, EventScript_16FEEE + call_if_eq EventScript_16FEEE checkitemspace ITEM_TM27, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16FEF7 - additem ITEM_TM27, 1 - giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 + goto_if_eq EventScript_16FEF7 + giveitem_msg gUnknown_819EE9F, ITEM_TM27 msgbox gUnknown_819EEC6 setflag FLAG_GOT_TM27 release diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 09983fed1..3968fc32d 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -21,23 +21,21 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 lock faceplayer call EventScript_170145 - checkflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE - goto_if TRUE, EventScript_17013B + goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_170145 compare VAR_0x8006, 50 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_EXP_SHARE, 1 - giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE msgbox gUnknown_819F71F release diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 4ab510912..837ad0fc7 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -5,8 +5,7 @@ Route16_MapScripts:: @ 81680E5 .byte 0 Route16_OnResume:: @ 81680F5 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_1680FF + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1680FF end EventScript_1680FF:: @ 81680FF @@ -15,7 +14,7 @@ EventScript_1680FF:: @ 81680FF Route16_OnTransition:: @ 8168103 compare VAR_MAP_SCENE_ROUTE16, 1 - call_if eq, EventScript_16810F + call_if_eq EventScript_16810F end EventScript_16810F:: @ 816810F @@ -33,15 +32,14 @@ EventScript_16811D:: @ 816811D Route16_EventScript_168121:: @ 8168121 lock faceplayer - checkflag FLAG_GOT_POKE_FLUTE - goto_if FALSE, EventScript_1681A3 + goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_1681A3 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_168197 + goto_if_eq EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -54,11 +52,11 @@ Route16_EventScript_168121:: @ 8168121 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_168199 + goto_if_eq EventScript_168199 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_168199 + goto_if_eq EventScript_168199 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_168199 + goto_if_eq EventScript_168199 release end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index d6c4c7a9c..dc1271a44 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -4,14 +4,12 @@ Route16_House_MapScripts:: @ 817014E Route16_House_EventScript_17014F:: @ 817014F lock faceplayer - checkflag FLAG_GOT_HM02 - goto_if TRUE, EventScript_1701A5 + goto_if_set FLAG_GOT_HM02, EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_17019B - additem ITEM_HM02, 1 - giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 + goto_if_eq EventScript_17019B + giveitem_msg gUnknown_819F8C0, ITEM_HM02 msgbox gUnknown_819F8E0 setflag FLAG_GOT_HM02 release diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index ecc93ae83..a8abfb255 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -4,8 +4,7 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 clearflag FLAG_SYS_ON_CYCLING_ROAD - checkflag FLAG_GOT_BICYCLE - call_if TRUE, EventScript_1701D5 + call_if_set FLAG_GOT_BICYCLE, EventScript_1701D5 end EventScript_1701D5:: @ 81701D5 @@ -54,13 +53,13 @@ EventScript_170220:: @ 8170220 waitmovement 0 delay 20 compare VAR_0x8008, 1 - call_if eq, EventScript_170279 + call_if_eq EventScript_170279 compare VAR_0x8008, 2 - call_if eq, EventScript_170284 + call_if_eq EventScript_170284 compare VAR_0x8008, 3 - call_if eq, EventScript_17028F + call_if_eq EventScript_17028F compare VAR_0x8008, 4 - call_if eq, EventScript_17029A + call_if_eq EventScript_17029A msgbox gUnknown_819F95F closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_1702B3 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index da054fd84..9b2dd6737 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -21,23 +21,21 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 lock faceplayer call EventScript_17036F - checkflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE - goto_if TRUE, EventScript_170365 + goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F compare VAR_0x8006, 40 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_AMULET_COIN, 1 - giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE msgbox gUnknown_819FC93 release diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index f3e1f1032..c988ccb1b 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -5,7 +5,7 @@ Route18_MapScripts:: @ 81681F6 Route18_OnTransition:: @ 8168201 compare VAR_MAP_SCENE_ROUTE16, 1 - call_if eq, EventScript_16820D + call_if_eq EventScript_16820D end EventScript_16820D:: @ 816820D diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 0be4bc59d..8e8b8a531 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -4,8 +4,7 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 Route18_EastEntrance_1F_OnTransition:: @ 817037E clearflag FLAG_SYS_ON_CYCLING_ROAD - checkflag FLAG_GOT_BICYCLE - call_if TRUE, EventScript_17038B + call_if_set FLAG_GOT_BICYCLE, EventScript_17038B end EventScript_17038B:: @ 817038B @@ -54,13 +53,13 @@ EventScript_1703D6:: @ 81703D6 waitmovement 0 delay 20 compare VAR_0x8008, 1 - call_if eq, EventScript_17042F + call_if_eq EventScript_17042F compare VAR_0x8008, 2 - call_if eq, EventScript_17043A + call_if_eq EventScript_17043A compare VAR_0x8008, 3 - call_if eq, EventScript_170445 + call_if_eq EventScript_170445 compare VAR_0x8008, 4 - call_if eq, EventScript_170450 + call_if_eq EventScript_170450 msgbox gUnknown_819FD0C closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_170469 diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index afe1dd754..8878cfa1f 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -14,17 +14,16 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E faceplayer setvar VAR_0x8008, 5 call EventScript_1A8CAD - checkflag FLAG_DID_MARC_TRADE - goto_if TRUE, EventScript_1704F0 + goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1704D8 + goto_if_eq EventScript_1704D8 call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_1704D8 + goto_if_ge EventScript_1704D8 call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_1704E2 + goto_if_ne EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_MARC_TRADE diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index 1d277231d..2131ca106 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -3,10 +3,8 @@ Route20_MapScripts:: @ 816823B .byte 0 Route20_OnTransition:: @ 8168241 - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if FALSE, EventScript_168254 - checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT - call_if FALSE, EventScript_16826D + call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_168254 + call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_16826D end EventScript_168254:: @ 8168254 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index ad798166c..58380f0e9 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -32,29 +32,29 @@ EventScript_1682BE:: @ 81682BE playbgm MUS_RIVAL1, 0 addobject 1 compare VAR_TEMP_1, 0 - call_if eq, EventScript_168350 + call_if_eq EventScript_168350 compare VAR_TEMP_1, 1 - call_if eq, EventScript_168350 + call_if_eq EventScript_168350 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16835B + call_if_eq EventScript_16835B delay 6 msgbox gUnknown_8188890 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_16836D + call_if_eq EventScript_16836D compare VAR_STARTER_MON, 1 - call_if eq, EventScript_16837C + call_if_eq EventScript_16837C compare VAR_STARTER_MON, 0 - call_if eq, EventScript_16838B + call_if_eq EventScript_16838B msgbox gUnknown_8188974 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16839A + call_if_eq EventScript_16839A compare VAR_TEMP_1, 1 - call_if eq, EventScript_16839A + call_if_eq EventScript_16839A compare VAR_TEMP_1, 2 - call_if eq, EventScript_1683A5 + call_if_eq EventScript_1683A5 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_ROUTE22, 2 @@ -73,15 +73,15 @@ EventScript_16835B:: @ 816835B return EventScript_16836D:: @ 816836D - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A return EventScript_16837C:: @ 816837C - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A return EventScript_16838B:: @ 816838B - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A return EventScript_16839A:: @ 816839A @@ -198,19 +198,19 @@ EventScript_16841F:: @ 816841F playbgm MUS_RIVAL1, 0 addobject 1 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16849C + call_if_eq EventScript_16849C compare VAR_TEMP_1, 1 - call_if eq, EventScript_16849C + call_if_eq EventScript_16849C compare VAR_TEMP_1, 2 - call_if eq, EventScript_1684A7 + call_if_eq EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_1684B9 + call_if_eq EventScript_1684B9 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_1684C4 + call_if_eq EventScript_1684C4 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_1684CF + call_if_eq EventScript_1684CF msgbox gUnknown_8188B29 closemessage delay 10 @@ -235,15 +235,15 @@ EventScript_1684A7:: @ 81684A7 return EventScript_1684B9:: @ 81684B9 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, 0, Text_188B08 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08 return EventScript_1684C4:: @ 81684C4 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, 0, Text_188B08 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08 return EventScript_1684CF:: @ 81684CF - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, 0, Text_188B08 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08 return Movement_1684DA:: @ 81684DA diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 6889e739c..f3239d8dc 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -5,11 +5,11 @@ Route24_EventScript_168620:: @ 8168620 lock faceplayer compare VAR_MAP_SCENE_ROUTE24, 1 - goto_if eq, EventScript_168656 + goto_if_eq EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16864C + goto_if_eq EventScript_16864C call EventScript_1686B9 release end @@ -39,28 +39,27 @@ Route24_EventScript_16866C:: @ 816866C EventScript_168678:: @ 8168678 textcolor 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1686FD + call_if_eq EventScript_1686FD compare VAR_TEMP_1, 1 - call_if eq, EventScript_168708 + call_if_eq EventScript_168708 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_168713 + goto_if_eq EventScript_168713 call EventScript_1686B9 releaseall end EventScript_1686B9:: @ 81686B9 - additem ITEM_NUGGET, 1 - giveitemfanfaremsg gUnknown_8188C93, ITEM_NUGGET + giveitem_msg gUnknown_8188C93, ITEM_NUGGET message Text_188CDB waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, 1 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_6, 0, Text_188DDC + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Text_188DDC msgbox gUnknown_8188DF1 setvar VAR_MAP_SCENE_ROUTE24, 1 return @@ -81,7 +80,7 @@ EventScript_168713:: @ 8168713 applymovement OBJ_EVENT_ID_PLAYER, Movement_168743 waitmovement 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_168733 + call_if_eq EventScript_168733 release end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 3b41eac68..1a35552e4 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -3,10 +3,8 @@ Route25_SeaCottage_MapScripts:: @ 8170523 .byte 0 Route25_SeaCottage_OnTransition:: @ 8170529 - checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE - call_if FALSE, EventScript_17053C - checkflag FLAG_GOT_SS_TICKET - call_if TRUE, EventScript_170547 + call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17053C + call_if_set FLAG_GOT_SS_TICKET, EventScript_170547 end EventScript_17053C:: @ 817053C @@ -21,17 +19,14 @@ EventScript_170547:: @ 8170547 Route25_SeaCottage_EventScript_17054B:: @ 817054B lock faceplayer - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_1706C8 - checkflag FLAG_GOT_SS_TICKET - goto_if TRUE, EventScript_170640 - checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE - goto_if TRUE, EventScript_17064A + goto_if_set FLAG_TEMP_3, EventScript_1706C8 + goto_if_set FLAG_GOT_SS_TICKET, EventScript_170640 + goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17064A checkplayergender compare VAR_RESULT, 0 - goto_if eq, EventScript_170580 + goto_if_eq EventScript_170580 compare VAR_RESULT, 1 - goto_if eq, EventScript_17058E + goto_if_eq EventScript_17058E end EventScript_170580:: @ 8170580 @@ -46,18 +41,18 @@ EventScript_17058E:: @ 817058E EventScript_17059C:: @ 817059C compare VAR_RESULT, 0 - call_if eq, EventScript_170600 + call_if_eq EventScript_170600 msgbox gUnknown_819FFD3 closemessage delay 10 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_17062A + call_if_eq EventScript_17062A compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_170635 + call_if_eq EventScript_170635 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_170635 + call_if_eq EventScript_170635 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_170635 + call_if_eq EventScript_170635 opendoor 10, 3 waitdooranim applymovement 2, Movement_1706DB @@ -73,9 +68,9 @@ EventScript_17059C:: @ 817059C EventScript_170600:: @ 8170600 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_170618 + call_if_eq EventScript_170618 compare VAR_RESULT, 1 - call_if eq, EventScript_170621 + call_if_eq EventScript_170621 return EventScript_170618:: @ 8170618 @@ -105,14 +100,13 @@ EventScript_17064A:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_1706AC + call_if_eq EventScript_1706AC compare VAR_RESULT, 1 - call_if eq, EventScript_1706B5 + call_if_eq EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1706BE - additem ITEM_SS_TICKET, 1 - giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 + goto_if_eq EventScript_1706BE + giveitem_msg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_GOT_SS_TICKET_DUP setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_GOT_SS_TICKET @@ -157,10 +151,8 @@ Movement_1706DB:: @ 81706DB Route25_SeaCottage_EventScript_1706DD:: @ 81706DD lockall - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_1707CA - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_1706FA + goto_if_set FLAG_TEMP_3, EventScript_1707CA + goto_if_set FLAG_TEMP_2, EventScript_1706FA msgbox gUnknown_81A0402 releaseall end diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 002c928ab..dec1a7e0c 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -5,23 +5,21 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F lock faceplayer call EventScript_16F70B - checkflag FLAG_GOT_HM05 - goto_if TRUE, EventScript_16F701 + goto_if_set FLAG_GOT_HM05, EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16F70B compare VAR_0x8006, 10 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_HM05, 1 - giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819D7A1, ITEM_HM05 setflag FLAG_GOT_HM05 msgbox gUnknown_819D7C1 release diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 0f5604fa3..5b92d8298 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -10,17 +10,16 @@ Route2_House_EventScript_16F602:: @ 816F602 faceplayer setvar VAR_0x8008, 0 call EventScript_1A8CAD - checkflag FLAG_DID_MIMIEN_TRADE - goto_if TRUE, EventScript_16F674 + goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16F65C + goto_if_eq EventScript_16F65C call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16F65C + goto_if_ge EventScript_16F65C call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16F666 + goto_if_ne EventScript_16F666 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_MIMIEN_TRADE diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index dbb66acfd..bb8294e6d 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -21,14 +21,13 @@ Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F lock faceplayer - checkflag FLAG_BOUGHT_MAGIKARP - goto_if TRUE, EventScript_16F8A2 + goto_if_set FLAG_BOUGHT_MAGIKARP, EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender compare VAR_RESULT, 0 - goto_if eq, EventScript_16F786 + goto_if_eq EventScript_16F786 compare VAR_RESULT, 1 - goto_if eq, EventScript_16F794 + goto_if_eq EventScript_16F794 end EventScript_16F786:: @ 816F786 @@ -43,26 +42,26 @@ EventScript_16F794:: @ 816F794 EventScript_16F7A2:: @ 816F7A2 compare VAR_RESULT, 0 - goto_if eq, EventScript_16F888 + goto_if_eq EventScript_16F888 checkmoney 500, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16F895 + goto_if_eq EventScript_16F895 textcolor 3 setvar VAR_TEMP_1, 129 - givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 + givemon SPECIES_MAGIKARP, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if eq, EventScript_16F7F6 + goto_if_eq EventScript_16F7F6 compare VAR_RESULT, 1 - goto_if eq, EventScript_16F822 + goto_if_eq EventScript_16F822 compare VAR_RESULT, 2 - goto_if eq, EventScript_16F8AC + goto_if_eq EventScript_16F8AC end EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16F861 + goto_if_eq EventScript_16F861 call EventScript_1A8C27 fadescreen 1 hidemoneybox 0, 0 @@ -75,7 +74,7 @@ EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16F84B + goto_if_eq EventScript_16F84B fadescreen 1 hidemoneybox 0, 0 special ChangeBoxPokemonNickname diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 2aac04b78..ca7a34e0c 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -27,8 +27,7 @@ EventScript_16F92E:: @ 816F92E textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16F958 + goto_if_set FLAG_GOT_TEA, EventScript_16F958 msgbox gUnknown_819E04B closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4 @@ -45,11 +44,11 @@ EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16F99C + call_if_eq EventScript_16F99C compare VAR_TEMP_1, 1 - call_if eq, EventScript_16F9A7 + call_if_eq EventScript_16F9A7 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16F9B2 + call_if_eq EventScript_16F9B2 msgbox gUnknown_819E0C1 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index d85587c03..393c7ee6a 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -27,8 +27,7 @@ EventScript_16F9F4:: @ 816F9F4 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FA1E + goto_if_set FLAG_GOT_TEA, EventScript_16FA1E msgbox gUnknown_819E181 closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A @@ -45,11 +44,11 @@ EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16FA62 + call_if_eq EventScript_16FA62 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16FA6D + call_if_eq EventScript_16FA6D compare VAR_TEMP_1, 2 - call_if eq, EventScript_16FA78 + call_if_eq EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 5cb615467..17ac82ef8 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -27,8 +27,7 @@ EventScript_16FABB:: @ 816FABB textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FAE5 + goto_if_set FLAG_GOT_TEA, EventScript_16FAE5 msgbox gUnknown_819E2B7 closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51 @@ -45,11 +44,11 @@ EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16FB29 + call_if_eq EventScript_16FB29 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16FB34 + call_if_eq EventScript_16FB34 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16FB3F + call_if_eq EventScript_16FB3F msgbox gUnknown_819E32D setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 6d79a9412..0ce1d1f69 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -27,8 +27,7 @@ EventScript_16FB81:: @ 816FB81 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FBAB + goto_if_set FLAG_GOT_TEA, EventScript_16FBAB msgbox gUnknown_819E3ED closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D @@ -55,11 +54,11 @@ EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16FC05 + call_if_eq EventScript_16FC05 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16FC10 + call_if_eq EventScript_16FC10 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16FC1B + call_if_eq EventScript_16FC1B msgbox gUnknown_819E463 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index ef73a522a..24414384f 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -6,11 +6,11 @@ SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 end SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ANN, 0, Text_173A1A, Text_173A4F + trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F msgbox gUnknown_8173A7A, 6 end SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_TYLER, 0, Text_173999, Text_1739B1 + trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1 msgbox gUnknown_81739C5, 6 end diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index f13ffc7e9..4ebebdc0a 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -6,7 +6,7 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 faceplayer checkplayergender compare VAR_RESULT, 0 - goto_if eq, EventScript_160C5C + goto_if_eq EventScript_160C5C msgbox gUnknown_8173BA4 release end diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 11040e58f..91407ef92 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 .byte 0 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_ARTHUR, 0, Text_173BD1, Text_173BFA + trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA msgbox gUnknown_8173C30, 6 end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 1898942d2..78a0f51e7 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -6,7 +6,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 faceplayer msgbox gUnknown_817445B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_160E18 + goto_if_eq EventScript_160E18 closemessage call EventScript_FadeOut_Heal_FadeIn msgbox gUnknown_8174490 @@ -16,7 +16,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 EventScript_160E18:: @ 8160E18 checkplayergender compare VAR_RESULT, 0 - goto_if eq, EventScript_160E2E + goto_if_eq EventScript_160E2E msgbox gUnknown_8174515 release end diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index 96b0ae20a..cde454332 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E .byte 0 SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_THOMAS, 0, Text_173C52, Text_173CB4 + trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4 msgbox gUnknown_8173CC4, 6 end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 7cd9e2f5d..46a69aa10 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -36,29 +36,29 @@ EventScript_160903:: @ 8160903 waitmovement 0 delay 20 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1609AD + call_if_eq EventScript_1609AD compare VAR_TEMP_1, 1 - call_if eq, EventScript_1609B8 + call_if_eq EventScript_1609B8 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1609CA + call_if_eq EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_1609DC + call_if_eq EventScript_1609DC compare VAR_STARTER_MON, 1 - call_if eq, EventScript_1609E7 + call_if_eq EventScript_1609E7 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_1609F2 + call_if_eq EventScript_1609F2 msgbox gUnknown_8173164 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1609FD + call_if_eq EventScript_1609FD compare VAR_TEMP_1, 1 - call_if eq, EventScript_160A08 + call_if_eq EventScript_160A08 compare VAR_TEMP_1, 2 - call_if eq, EventScript_160A13 + call_if_eq EventScript_160A13 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 @@ -83,15 +83,15 @@ EventScript_1609CA:: @ 81609CA return EventScript_1609DC:: @ 81609DC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_SQUIRTLE, 0, Text_173110 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, Text_173110 return EventScript_1609E7:: @ 81609E7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_BULBASAUR, 0, Text_173110 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, Text_173110 return EventScript_1609F2:: @ 81609F2 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_CHARMANDER, 0, Text_173110 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, Text_173110 return EventScript_1609FD:: @ 81609FD diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index cabf92f28..90cf0a1fc 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 .byte 0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_DALE, 0, Text_173DDB, Text_173DF7 + trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7 msgbox gUnknown_8173E04, 6 end SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_BROOKS, 0, Text_173D63, Text_173D92 + trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92 msgbox gUnknown_8173DB6, 6 end diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 330b18acc..46fd35501 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 .byte 0 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_LAMAR, 0, Text_173F07, Text_173F42 + trainerbattle_single TRAINER_GENTLEMAN_LAMAR, Text_173F07, Text_173F42 msgbox gUnknown_8173F55, 6 end SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_DAWN, 0, Text_173F83, Text_173FAB + trainerbattle_single TRAINER_LASS_DAWN, Text_173F83, Text_173FAB msgbox gUnknown_8173FB9, 6 end diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index 06903353d..68d7ae9d0 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 .byte 0 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_BARNY, 0, Text_174177, Text_1741EF + trainerbattle_single TRAINER_FISHERMAN_BARNY, Text_174177, Text_1741EF msgbox gUnknown_817420E, 6 end SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_PHILLIP, 0, Text_1740F6, Text_174123 + trainerbattle_single TRAINER_SAILOR_PHILLIP, Text_1740F6, Text_174123 msgbox gUnknown_817413A, 6 end diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index 01772cab8..9f28f7cf5 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 .byte 0 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_HUEY, 0, Text_174239, Text_17425C + trainerbattle_single TRAINER_SAILOR_HUEY, Text_174239, Text_17425C msgbox gUnknown_8174272, 6 end diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index da4ed9aaf..af2277e2c 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E .byte 0 SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DYLAN, 0, Text_1742A6, Text_1742C3 + trainerbattle_single TRAINER_SAILOR_DYLAN, Text_1742A6, Text_1742C3 msgbox gUnknown_81742D2, 6 end diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index e9730a19e..1c5766a91 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 .byte 0 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_LEONARD, 0, Text_174315, Text_174348 + trainerbattle_single TRAINER_SAILOR_LEONARD, Text_174315, Text_174348 msgbox gUnknown_8174362, 6 end SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DUNCAN, 0, Text_174385, Text_1743B3 + trainerbattle_single TRAINER_SAILOR_DUNCAN, Text_174385, Text_1743B3 msgbox gUnknown_81743C8, 6 end diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 562e3b3a6..54481438f 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -3,8 +3,7 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A lock - checkflag FLAG_GOT_HM01 - goto_if TRUE, EventScript_160BB5 + goto_if_set FLAG_GOT_HM01, EventScript_160BB5 msgbox gUnknown_8173646 textcolor 3 message Text_173676 @@ -16,8 +15,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81736A6 - additem ITEM_HM01, 1 - giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5 + giveitem_msg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5 msgbox gUnknown_81737D2 setflag FLAG_GOT_HM01 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index 955625e2e..1d93ae66a 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -14,11 +14,11 @@ SSAnne_Deck_EventScript_160A7B:: @ 8160A7B end SSAnne_Deck_EventScript_160A84:: @ 8160A84 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_EDMOND, 0, Text_173308, Text_17332B + trainerbattle_single TRAINER_SAILOR_EDMOND, Text_173308, Text_17332B msgbox gUnknown_817333E, 6 end SSAnne_Deck_EventScript_160A9B:: @ 8160A9B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_TREVOR, 0, Text_173382, Text_1733A0 + trainerbattle_single TRAINER_SAILOR_TREVOR, Text_173382, Text_1733A0 msgbox gUnknown_81733B5, 6 end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 9a9327acb..a8ad24173 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -15,9 +15,9 @@ SSAnne_Exterior_160859:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8005, 6 - call_if le, EventScript_1608A1 + call_if_le EventScript_1608A1 compare VAR_0x8005, 7 - call_if ge, EventScript_1608AC + call_if_ge EventScript_1608AC fadenewbgm MUS_NAMINORI delay 50 special Special_SSAnneDepartureCutscene diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 97ca7f889..b5619e78e 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -20,11 +20,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE random 3 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - call_if eq, EventScript_160B03 + call_if_eq EventScript_160B03 compare VAR_0x8008, 1 - call_if eq, EventScript_160B0C + call_if_eq EventScript_160B0C compare VAR_0x8008, 2 - call_if eq, EventScript_160B15 + call_if_eq EventScript_160B15 release end diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index fe7a4f6fa..0d8e81924 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -4,14 +4,12 @@ SafariZone_SecretHouse_MapScripts:: @ 8162452 SafariZone_SecretHouse_EventScript_162453:: @ 8162453 lock faceplayer - checkflag FLAG_GOT_HM03 - goto_if TRUE, EventScript_1624A9 + goto_if_set FLAG_GOT_HM03, EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16249F - additem ITEM_HM03, 1 - giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 + goto_if_eq EventScript_16249F + giveitem_msg gUnknown_8177E92, ITEM_HM03 msgbox gUnknown_8177EB7 setflag FLAG_GOT_HM03 release diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index f4cf94274..3973d5e6b 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -4,8 +4,7 @@ SaffronCity_MapScripts:: @ 816735F SaffronCity_OnTransition:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY - checkflag FLAG_RESCUED_MR_FUJI - call_if FALSE, EventScript_167372 + call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372 end EventScript_167372:: @ 8167372 @@ -42,8 +41,7 @@ SaffronCity_EventScript_1673B0:: @ 81673B0 SaffronCity_EventScript_1673B9:: @ 81673B9 lock - checkflag FLAG_RESCUED_MR_FUJI - goto_if TRUE, EventScript_1673D7 + goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7 applymovement 6, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81812CA diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 06a315907..c03e62262 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -20,8 +20,7 @@ SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 lock faceplayer - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONLEE applymovement 5, Movement_WalkInPlaceFastestUp @@ -30,7 +29,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if eq, EventScript_16EC82 + goto_if_eq EventScript_16EC82 erasemonpic release end @@ -43,8 +42,7 @@ EventScript_16EC3C:: @ 816EC3C SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 lock faceplayer - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONCHAN applymovement 5, Movement_WalkInPlaceFastestUp @@ -53,20 +51,20 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if eq, EventScript_16EC82 + goto_if_eq EventScript_16EC82 erasemonpic release end EventScript_16EC82:: @ 816EC82 erasemonpic - givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if eq, EventScript_16ECB5 + goto_if_eq EventScript_16ECB5 compare VAR_RESULT, 1 - goto_if eq, EventScript_16ECEC + goto_if_eq EventScript_16ECEC compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C release end @@ -80,7 +78,7 @@ EventScript_16ECB5:: @ 816ECB5 setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16ED29 + goto_if_eq EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16ED29 @@ -96,7 +94,7 @@ EventScript_16ECEC:: @ 816ECEC setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16ED1E + goto_if_eq EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E end @@ -123,29 +121,28 @@ SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F + trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F msgbox gUnknown_819B41F, 6 end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD + trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD msgbox gUnknown_819B30F, 6 end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396 + trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396 msgbox gUnknown_819B3AC, 6 end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292 + trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292 msgbox gUnknown_819B29D, 6 end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EDC6 + trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0 + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6 msgbox gUnknown_819B1A7, 6 end diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index ad09c3e36..b51cb49b6 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -3,9 +3,8 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7 SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A - checkflag FLAG_GOT_TM04_FROM_SABRINA - goto_if FALSE, EventScript_16EE3D + trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC + goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D msgbox gUnknown_819B7F2 release end @@ -24,9 +23,8 @@ EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16EE7E - additem ITEM_TM04, 1 - giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 + goto_if_eq EventScript_16EE7E + giveitem_msg gUnknown_819B7D3, ITEM_TM04 setflag FLAG_GOT_TM04_FROM_SABRINA msgbox gUnknown_819B685 release @@ -38,46 +36,45 @@ EventScript_16EE7E:: @ 816EE7E end SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JOHAN, 0, Text_19B936, Text_19B957 + trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957 msgbox gUnknown_819B96D, 6 end SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E + trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E famechecker FAMECHECKER_SABRINA, 5 msgbox gUnknown_819BAB4, 6 end SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_CAMERON, 0, Text_19BB49, Text_19BBA1 + trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1 msgbox gUnknown_819BBB3, 6 end SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_PRESTON, 0, Text_19BC57, Text_19BCBC + trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC msgbox gUnknown_819BCC4, 6 end SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_AMANDA, 0, Text_19B86A, Text_19B8A8 + trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8 msgbox gUnknown_819B8B9, 6 end SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_STACY, 0, Text_19B998, Text_19B9EC + trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC msgbox gUnknown_819B9F7, 6 end SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TASHA, 0, Text_19BAE8, Text_19BB0D + trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D msgbox gUnknown_819BB1F, 6 end SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 lock faceplayer - checkflag FLAG_DEFEATED_SABRINA - goto_if TRUE, EventScript_16EF4B + goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B msgbox gUnknown_819BCF6 release end @@ -89,8 +86,7 @@ EventScript_16EF4B:: @ 816EF4B SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 lockall - checkflag FLAG_BADGE06_GET - goto_if TRUE, EventScript_16EF69 + goto_if_set FLAG_BADGE06_GET, EventScript_16EF69 msgbox gUnknown_819BDFE releaseall end diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 4ad832d23..e29fbea9d 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -20,18 +20,18 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer checkitem ITEM_POKE_DOLL, 1 compare VAR_RESULT, 1 - goto_if eq, EventScript_1C4CF6 + goto_if_eq EventScript_1C4CF6 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_16EBB7 + call_if_eq EventScript_16EBB7 compare VAR_RESULT, 1 - call_if eq, EventScript_16EBC0 + call_if_eq EventScript_16EBC0 release end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 3e7b07c0d..a6b1ce51b 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -4,14 +4,12 @@ SaffronCity_House3_MapScripts:: @ 816F05E SaffronCity_House3_EventScript_16F05F:: @ 816F05F lock faceplayer - checkflag FLAG_GOT_TM29_FROM_MR_PSYCHIC - goto_if TRUE, EventScript_16F0B5 + goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16F0AB - additem ITEM_TM29, 1 - giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 + goto_if_eq EventScript_16F0AB + giveitem_msg gUnknown_819C16C, ITEM_TM29 msgbox gUnknown_819C18F setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC release diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index c40cb783c..3779bb5e2 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -12,7 +12,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 6be25699b..6b7099b5d 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -26,7 +26,7 @@ SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if eq, EventScript_16F02D + goto_if_eq EventScript_16F02D msgbox gUnknown_819C0B4 release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 006f62023..ad839b0ad 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -72,9 +72,9 @@ Movement_16F13E:: @ 816F13E SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 - goto_if eq, EventScript_16F267 + goto_if_eq EventScript_16F267 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if eq, EventScript_16F15B + goto_if_eq EventScript_16F15B end EventScript_16F15B:: @ 816F15B @@ -82,35 +82,35 @@ EventScript_16F15B:: @ 816F15B setvar VAR_0x8004, 0 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F207 + call_if_eq EventScript_16F207 setvar VAR_0x8004, 1 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F213 + call_if_eq EventScript_16F213 setvar VAR_0x8004, 2 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F21F + call_if_eq EventScript_16F21F setvar VAR_0x8004, 3 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F22B + call_if_eq EventScript_16F22B setvar VAR_0x8004, 4 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F237 + call_if_eq EventScript_16F237 setvar VAR_0x8004, 5 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F243 + call_if_eq EventScript_16F243 setvar VAR_0x8004, 6 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F24F + call_if_eq EventScript_16F24F setvar VAR_0x8004, 7 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F25B + call_if_eq EventScript_16F25B end EventScript_16F207:: @ 816F207 @@ -167,13 +167,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 setvar VAR_0x8004, 0 special BufferStreakTrainerText compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F2EE + goto_if_eq EventScript_16F2EE specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F2C0 + goto_if_eq EventScript_16F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F2E4 + goto_if_eq EventScript_16F2E4 msgbox gUnknown_819C420 release end @@ -181,7 +181,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 EventScript_16F2C0:: @ 816F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F2DA + goto_if_eq EventScript_16F2DA msgbox gUnknown_819C390 release end @@ -207,13 +207,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 setvar VAR_0x8004, 3 special BufferStreakTrainerText compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F365 + goto_if_eq EventScript_16F365 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F337 + goto_if_eq EventScript_16F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F35B + goto_if_eq EventScript_16F35B msgbox gUnknown_819CBD3 release end @@ -221,7 +221,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 EventScript_16F337:: @ 816F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F351 + goto_if_eq EventScript_16F351 msgbox gUnknown_819CB32 release end @@ -247,13 +247,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F setvar VAR_0x8004, 1 special BufferStreakTrainerText compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F3DC + goto_if_eq EventScript_16F3DC specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F3AE + goto_if_eq EventScript_16F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F3D2 + goto_if_eq EventScript_16F3D2 msgbox gUnknown_819C6BA release end @@ -261,7 +261,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F EventScript_16F3AE:: @ 816F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F3C8 + goto_if_eq EventScript_16F3C8 msgbox gUnknown_819C5A9 release end @@ -287,13 +287,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 setvar VAR_0x8004, 2 special BufferStreakTrainerText compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F453 + goto_if_eq EventScript_16F453 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F425 + goto_if_eq EventScript_16F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F449 + goto_if_eq EventScript_16F449 msgbox gUnknown_819C986 release end @@ -301,7 +301,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 EventScript_16F425:: @ 816F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F43F + goto_if_eq EventScript_16F43F msgbox gUnknown_819C81E release end @@ -328,10 +328,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F491 + goto_if_eq EventScript_16F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F4B5 + goto_if_eq EventScript_16F4B5 msgbox gUnknown_819D01F release end @@ -339,7 +339,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D EventScript_16F491:: @ 816F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F4AB + goto_if_eq EventScript_16F4AB msgbox gUnknown_819CEDF release end @@ -361,10 +361,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F4F3 + goto_if_eq EventScript_16F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F517 + goto_if_eq EventScript_16F517 msgbox gUnknown_819CDDA release end @@ -372,7 +372,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF EventScript_16F4F3:: @ 816F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F50D + goto_if_eq EventScript_16F50D msgbox gUnknown_819CCF3 release end @@ -394,10 +394,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F555 + goto_if_eq EventScript_16F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F579 + goto_if_eq EventScript_16F579 msgbox gUnknown_819D1AE release end @@ -405,7 +405,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 EventScript_16F555:: @ 816F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F56F + goto_if_eq EventScript_16F56F msgbox gUnknown_819D0E3 release end @@ -427,10 +427,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F5B7 + goto_if_eq EventScript_16F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F5DB + goto_if_eq EventScript_16F5DB msgbox gUnknown_819D3D2 release end @@ -438,7 +438,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 EventScript_16F5B7:: @ 816F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F5D1 + goto_if_eq EventScript_16F5D1 msgbox gUnknown_819D2B4 release end diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 54543e54a..13c6b606a 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -4,20 +4,16 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F .byte 0 SeafoamIslands_B3F_OnTransition:: @ 8162F5A - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if FALSE, EventScript_162F6D - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if TRUE, EventScript_162F94 + call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F6D + call_if_set FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F94 end EventScript_162F6D:: @ 8162F6D setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if FALSE, EventScript_162FF0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if FALSE, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0 compare VAR_TEMP_2, 2 - call_if eq, EventScript_162F90 + call_if_eq EventScript_162F90 return EventScript_162F90:: @ 8162F90 @@ -35,17 +31,15 @@ SeafoamIslands_B3F_OnFrame:: @ 8162F98 EventScript_162FA2:: @ 8162FA2 lockall setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if FALSE, EventScript_162FF0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if FALSE, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0 compare VAR_TEMP_2, 2 - goto_if eq, EventScript_16300C + goto_if_eq EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 24 - call_if lt, EventScript_162FF6 + call_if_lt EventScript_162FF6 compare VAR_0x8008, 24 - call_if ge, EventScript_163001 + call_if_ge EventScript_163001 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 090b65d5f..58596c2e6 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -7,34 +7,28 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E .byte 0 SeafoamIslands_B4F_OnResume:: @ 8163048 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_163052 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163052 end EventScript_163052:: @ 8163052 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject VAR_LAST_TALKED return SeafoamIslands_B4F_OnTransition:: @ 8163066 - checkflag FLAG_FOUGHT_ARTICUNO - call_if FALSE, EventScript_1630AD - checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT - call_if FALSE, EventScript_163082 - checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT - call_if TRUE, EventScript_1630A9 + call_if_unset FLAG_FOUGHT_ARTICUNO, EventScript_1630AD + call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_163082 + call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_1630A9 end EventScript_163082:: @ 8163082 setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if FALSE, EventScript_163169 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if FALSE, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169 compare VAR_TEMP_2, 2 - call_if eq, EventScript_1630A5 + call_if_eq EventScript_1630A5 return EventScript_1630A5:: @ 81630A5 @@ -51,12 +45,10 @@ EventScript_1630AD:: @ 81630AD SeafoamIslands_B4F_OnLoad:: @ 81630B1 setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if FALSE, EventScript_163169 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if FALSE, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169 compare VAR_TEMP_2, 2 - goto_if eq, EventScript_1630D4 + goto_if_eq EventScript_1630D4 end EventScript_1630D4:: @ 81630D4 @@ -95,17 +87,15 @@ Movement_16311D:: @ 816311D EventScript_163121:: @ 8163121 lockall setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if FALSE, EventScript_163169 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if FALSE, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169 compare VAR_TEMP_2, 2 - goto_if eq, EventScript_163185 + goto_if_eq EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 9 - call_if lt, EventScript_16316F + call_if_lt EventScript_16316F compare VAR_0x8008, 9 - call_if ge, EventScript_16317A + call_if_ge EventScript_16317A special sub_805D1A8 setvar VAR_TEMP_1, 0 releaseall @@ -165,7 +155,7 @@ Movement_1631AA:: @ 81631AA SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -184,11 +174,11 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16320F + goto_if_eq EventScript_16320F compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163218 + goto_if_eq EventScript_163218 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163218 + goto_if_eq EventScript_163218 setflag FLAG_FOUGHT_ARTICUNO release end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 33b085474..8a44e194c 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -6,9 +6,9 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A SevenIsland_House_Room1_OnTransition:: @ 8170895 special ValidateEReaderTrainer compare VAR_RESULT, 0 - call_if eq, EventScript_1708AF + call_if_eq EventScript_1708AF compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 - call_if ne, EventScript_1708C3 + call_if_ne EventScript_1708C3 end EventScript_1708AF:: @ 81708AF @@ -40,11 +40,11 @@ EventScript_1708E9:: @ 1708E9 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - call_if eq, EventScript_170938 + call_if_eq EventScript_170938 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - call_if eq, EventScript_170941 + call_if_eq EventScript_170941 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - call_if eq, EventScript_17094A + call_if_eq EventScript_17094A special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall @@ -76,9 +76,9 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 faceplayer special ValidateEReaderTrainer compare VAR_RESULT, 1 - call_if eq, EventScript_17097D + call_if_eq EventScript_17097D compare VAR_TEMP_1, 1 - goto_if eq, EventScript_170987 + goto_if_eq EventScript_170987 msgbox gUnknown_81A049B release end @@ -93,27 +93,27 @@ EventScript_170987:: @ 8170987 special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + goto_if_eq EventScript_170A11 call EventScript_170A1E compare VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + goto_if_eq EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + goto_if_eq EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF compare VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + goto_if_eq EventScript_170A11 special SavePlayerParty special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_170A2D + call_if_eq EventScript_170A2D compare VAR_FACING, DIR_EAST - call_if eq, EventScript_170A3F + call_if_eq EventScript_170A3F compare VAR_FACING, DIR_WEST - call_if eq, EventScript_170A51 + call_if_eq EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 047f55705..c109d3eeb 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -23,11 +23,11 @@ EventScript_170A97:: @ 8170A97 special StartSpecialBattle waitstate compare VAR_RESULT, 3 - call_if eq, EventScript_170AFE + call_if_eq EventScript_170AFE compare VAR_RESULT, 1 - call_if eq, EventScript_170B0C + call_if_eq EventScript_170B0C compare VAR_RESULT, 2 - call_if eq, EventScript_170B17 + call_if_eq EventScript_170B17 closemessage special sp000_heal_pokemon applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index 2e7e2ad8a..b5b10b288 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 63ce3fb65..c5471b1ea 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -3,8 +3,7 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 lock - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_172211 + goto_if_set FLAG_TEMP_2, EventScript_172211 playbgm MUS_P_SCHOOL, 0 applymovement 1, Movement_172231 waitmovement 0 @@ -16,12 +15,12 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_172225 + goto_if_eq EventScript_172225 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 compare VAR_FACING, DIR_SOUTH - call_if ne, EventScript_172206 + call_if_ne EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_172231 diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index c22f3895b..8758f8517 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -4,8 +4,7 @@ SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY - checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS - call_if TRUE, EventScript_164E07 + call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -29,77 +28,77 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall compare VAR_TEMP_1, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_1, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall compare VAR_TEMP_2, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_2, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall compare VAR_TEMP_3, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_3, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall compare VAR_TEMP_4, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_4, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall compare VAR_TEMP_5, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_5, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall compare VAR_TEMP_6, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_6, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall compare VAR_TEMP_7, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_7, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index 396d9a4ef..a146b7990 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -6,8 +6,7 @@ SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 lockall setvar VAR_0x8004, 6 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_1A535C @@ -41,7 +40,7 @@ EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 compare VAR_ELEVATOR_FLOOR, 3 - goto_if eq, EventScript_164BD3 + goto_if_eq EventScript_164BD3 call EventScript_164BD8 setvar VAR_ELEVATOR_FLOOR, 3 special Special_CloseElevatorCurrentFloorWindow diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 1ae95e0d9..979ae6446 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -13,7 +13,7 @@ SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 setvar VAR_0x8004, 18 special sub_815D9E8 compare VAR_RESULT, 0 - goto_if eq, EventScript_164886 + goto_if_eq EventScript_164886 setvar VAR_TEMP_0, 0 setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 @@ -31,7 +31,7 @@ SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 compare VAR_TEMP_D, 17 - call_if eq, EventScript_1648A3 + call_if_eq EventScript_1648A3 end EventScript_1648A3:: @ 81648A3 @@ -112,7 +112,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 setvar VAR_0x8004, 20 special sub_815D9E8 compare VAR_RESULT, 1 - goto_if eq, EventScript_164988 + goto_if_eq EventScript_164988 msgbox gUnknown_817C9A2 goto EventScript_164990 @@ -126,7 +126,7 @@ EventScript_164990:: @ 8164990 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou @@ -159,7 +159,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE setvar VAR_0x8004, 17 special sub_815D9E8 compare VAR_RESULT, 0 - goto_if eq, EventScript_164A00 + goto_if_eq EventScript_164A00 msgbox gUnknown_817C7D9 goto EventScript_164A08 diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index e597b5ef5..ef6bc4382 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -3,15 +3,14 @@ SilphCo_10F_MapScripts:: @ 8161D86 .byte 0 SilphCo_10F_OnLoad:: @ 8161D8C - checkflag FLAG_SILPH_10F_DOOR - call_if FALSE, EventScript_Close10FDoor + call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161DAD + goto_if_ge EventScript_161DAD msgbox gUnknown_8176DBA release end @@ -26,11 +25,11 @@ SilphCo_10F_EventScript_161DB7:: @ 8161DB7 end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TRAVIS, 0, Text_176D57, Text_176D73 + trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73 msgbox gUnknown_8176D86, 6 end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_39, 0, Text_176CED, Text_176D18 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18 msgbox gUnknown_8176D25, 6 end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 218838690..c824a3f0b 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -3,25 +3,22 @@ SilphCo_11F_MapScripts:: @ 8161DEE .byte 0 SilphCo_11F_OnLoad:: @ 8161DF4 - checkflag FLAG_SILPH_11F_DOOR - call_if FALSE, EventScript_Close11FDoor + call_if_unset FLAG_SILPH_11F_DOOR, EventScript_Close11FDoor end SilphCo_11F_EventScript_161DFE:: @ 8161DFE lock faceplayer - checkflag FLAG_GOT_MASTER_BALL_FROM_SILPH - goto_if TRUE, EventScript_161E75 + goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_161E59 + call_if_eq EventScript_161E59 compare VAR_RESULT, 1 - call_if eq, EventScript_161E62 + call_if_eq EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_161E6B - additem ITEM_MASTER_BALL, 1 - giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 + goto_if_eq EventScript_161E6B + giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 msgbox gUnknown_8176FEB setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release @@ -73,11 +70,11 @@ EventScript_161EA0:: @ 8161EA0 msgbox gUnknown_8177108 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_161F00 + call_if_eq EventScript_161F00 compare VAR_TEMP_1, 1 - call_if eq, EventScript_161F12 + call_if_eq EventScript_161F12 setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB msgbox gUnknown_81771C2 closemessage fadescreen 1 @@ -134,11 +131,11 @@ SilphCo_11F_EventScript_161F37:: @ 8161F37 end SilphCo_11F_EventScript_161F40:: @ 8161F40 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_40, 0, Text_1772B8, Text_1772E7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, Text_1772B8, Text_1772E7 msgbox gUnknown_81772F9, 6 end SilphCo_11F_EventScript_161F57:: @ 8161F57 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_41, 0, Text_17726A, Text_17728C + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, Text_17726A, Text_17728C msgbox gUnknown_817729B, 6 end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 60d2a39e2..53e9c8129 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -3,10 +3,8 @@ SilphCo_2F_MapScripts:: @ 8161641 .byte 0 SilphCo_2F_OnLoad:: @ 8161647 - checkflag FLAG_SILPH_2F_DOOR_1 - call_if FALSE, EventScript_Close2FDoor1 - checkflag FLAG_SILPH_2F_DOOR_2 - call_if FALSE, EventScript_Close2FDoor2 + call_if_unset FLAG_SILPH_2F_DOOR_1, EventScript_Close2FDoor1 + call_if_unset FLAG_SILPH_2F_DOOR_2, EventScript_Close2FDoor2 end SilphCo_2F_EventScript_16165A:: @ 816165A @@ -20,21 +18,21 @@ SilphCo_2F_EventScript_161660:: @ 8161660 end SilphCo_2F_EventScript_161669:: @ 8161669 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_CONNOR, 0, Text_175562, Text_17557E + trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E msgbox gUnknown_817559F, 6 end SilphCo_2F_EventScript_161680:: @ 8161680 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JERRY, 0, Text_1755C6, Text_1755E5 + trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5 msgbox gUnknown_81755F2, 6 end SilphCo_2F_EventScript_161697:: @ 8161697 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_23, 0, Text_17562D, Text_17564A + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A msgbox gUnknown_8175651, 6 end SilphCo_2F_EventScript_1616AE:: @ 81616AE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_24, 0, Text_1756AD, Text_1756D8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8 msgbox gUnknown_81756E2, 6 end diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index c5fd6d320..2b321225a 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -3,17 +3,15 @@ SilphCo_3F_MapScripts:: @ 81616C5 .byte 0 SilphCo_3F_OnLoad:: @ 81616CB - checkflag FLAG_SILPH_3F_DOOR_1 - call_if FALSE, EventScript_Close3FDoor1 - checkflag FLAG_SILPH_3F_DOOR_2 - call_if FALSE, EventScript_Close3FDoor2 + call_if_unset FLAG_SILPH_3F_DOOR_1, EventScript_Close3FDoor1 + call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2 end SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1616F5 + goto_if_ge EventScript_1616F5 msgbox gUnknown_81758AD release end @@ -28,11 +26,11 @@ SilphCo_3F_EventScript_1616FF:: @ 81616FF end SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D + trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D msgbox gUnknown_8175990, 6 end SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911 msgbox gUnknown_817591C, 6 end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index c72ba7ed8..595f42ab6 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -3,17 +3,15 @@ SilphCo_4F_MapScripts:: @ 8161736 .byte 0 SilphCo_4F_OnLoad:: @ 816173C - checkflag FLAG_SILPH_4F_DOOR_1 - call_if FALSE, EventScript_Close4FDoor1 - checkflag FLAG_SILPH_4F_DOOR_2 - call_if FALSE, EventScript_Close4FDoor2 + call_if_unset FLAG_SILPH_4F_DOOR_1, EventScript_Close4FDoor1 + call_if_unset FLAG_SILPH_4F_DOOR_2, EventScript_Close4FDoor2 end SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161766 + goto_if_ge EventScript_161766 msgbox gUnknown_81759F5 release end @@ -28,16 +26,16 @@ SilphCo_4F_EventScript_161770:: @ 8161770 end SilphCo_4F_EventScript_161779:: @ 8161779 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_RODNEY, 0, Text_175A90, Text_175AB0 + trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0 msgbox gUnknown_8175AC8, 6 end SilphCo_4F_EventScript_161790:: @ 8161790 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_26, 0, Text_175A2F, Text_175A5B + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B msgbox gUnknown_8175A62, 6 end SilphCo_4F_EventScript_1617A7:: @ 81617A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_27, 0, Text_175B19, Text_175B2B + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B msgbox gUnknown_8175B38, 6 end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index fb9e482a5..e702b2876 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -3,19 +3,16 @@ SilphCo_5F_MapScripts:: @ 81617BE .byte 0 SilphCo_5F_OnLoad:: @ 81617C4 - checkflag FLAG_SILPH_5F_DOOR_1 - call_if FALSE, EventScript_Close5FDoor1 - checkflag FLAG_SILPH_5F_DOOR_2 - call_if FALSE, EventScript_Close5FDoor2 - checkflag FLAG_SILPH_5F_DOOR_3 - call_if FALSE, EventScript_Close5FDoor3 + call_if_unset FLAG_SILPH_5F_DOOR_1, EventScript_Close5FDoor1 + call_if_unset FLAG_SILPH_5F_DOOR_2, EventScript_Close5FDoor2 + call_if_unset FLAG_SILPH_5F_DOOR_3, EventScript_Close5FDoor3 end SilphCo_5F_EventScript_1617E0:: @ 81617E0 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1617F7 + goto_if_ge EventScript_1617F7 msgbox gUnknown_8175B70 release end @@ -42,21 +39,21 @@ SilphCo_5F_EventScript_16181C:: @ 816181C end SilphCo_5F_EventScript_161825:: @ 8161825 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_BEAU, 0, Text_175C40, Text_175C6D + trainerbattle_single TRAINER_SCIENTIST_BEAU, Text_175C40, Text_175C6D msgbox gUnknown_8175C7D, 6 end SilphCo_5F_EventScript_16183C:: @ 816183C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_28, 0, Text_175BE5, Text_175C09 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, Text_175BE5, Text_175C09 msgbox gUnknown_8175C0F, 6 end SilphCo_5F_EventScript_161853:: @ 8161853 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_29, 0, Text_175D28, Text_175D4B + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, Text_175D28, Text_175D4B msgbox gUnknown_8175D59, 6 end SilphCo_5F_EventScript_16186A:: @ 816186A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_DALTON, 0, Text_175CBD, Text_175CEB + trainerbattle_single TRAINER_JUGGLER_DALTON, Text_175CBD, Text_175CEB msgbox gUnknown_8175CF9, 6 end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index e5b1d9e7b..53fb04ac4 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -3,15 +3,14 @@ SilphCo_6F_MapScripts:: @ 8161881 .byte 0 SilphCo_6F_OnLoad:: @ 8161887 - checkflag FLAG_SILPH_6F_DOOR - call_if FALSE, EventScript_Close6FDoor + call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor end SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618A8 + goto_if_ge EventScript_1618A8 msgbox gUnknown_817607E release end @@ -25,7 +24,7 @@ SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618C9 + goto_if_ge EventScript_1618C9 msgbox gUnknown_8175F24 release end @@ -39,7 +38,7 @@ SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618EA + goto_if_ge EventScript_1618EA msgbox gUnknown_8175F70 release end @@ -53,7 +52,7 @@ SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_16190B + goto_if_ge EventScript_16190B msgbox gUnknown_8175FAA release end @@ -67,7 +66,7 @@ SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_16192C + goto_if_ge EventScript_16192C msgbox gUnknown_8176012 release end @@ -82,16 +81,16 @@ SilphCo_6F_EventScript_161936:: @ 8161936 end SilphCo_6F_EventScript_16193F:: @ 816193F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TAYLOR, 0, Text_176136, Text_1761BD + trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD msgbox gUnknown_81761C4, 6 end SilphCo_6F_EventScript_161956:: @ 8161956 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_30, 0, Text_1760DE, Text_176104 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104 msgbox gUnknown_817610F, 6 end SilphCo_6F_EventScript_16196D:: @ 816196D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_31, 0, Text_1761F1, Text_17620E + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E msgbox gUnknown_817621B, 6 end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 02e5de5e7..1fa3d3862 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -4,17 +4,14 @@ SilphCo_7F_MapScripts:: @ 8161984 .byte 0 SilphCo_7F_OnLoad:: @ 816198F - checkflag FLAG_SILPH_7F_DOOR_1 - call_if FALSE, EventScript_Close7FDoor1 - checkflag FLAG_SILPH_7F_DOOR_2 - call_if FALSE, EventScript_Close7FDoor2 - checkflag FLAG_SILPH_7F_DOOR_3 - call_if FALSE, EventScript_Close7FDoor3 + call_if_unset FLAG_SILPH_7F_DOOR_1, EventScript_Close7FDoor1 + call_if_unset FLAG_SILPH_7F_DOOR_2, EventScript_Close7FDoor2 + call_if_unset FLAG_SILPH_7F_DOOR_3, EventScript_Close7FDoor3 end SilphCo_7F_OnTransition:: @ 81619AB compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - call_if ge, EventScript_1619B7 + call_if_ge EventScript_1619B7 end EventScript_1619B7:: @ 81619B7 @@ -47,24 +44,24 @@ EventScript_1619D4:: @ 81619D4 waitmovement 0 msgbox gUnknown_8176710 compare VAR_TEMP_1, 0 - call_if eq, EventScript_161A73 + call_if_eq EventScript_161A73 compare VAR_TEMP_1, 1 - call_if eq, EventScript_161A7F + call_if_eq EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_161A80 + call_if_eq EventScript_161A80 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_161A8B + call_if_eq EventScript_161A8B compare VAR_STARTER_MON, 0 - call_if eq, EventScript_161A96 + call_if_eq EventScript_161A96 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_161AA1 + call_if_eq EventScript_161AA1 compare VAR_TEMP_1, 1 - call_if eq, EventScript_161AAC + call_if_eq EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm removeobject 1 @@ -83,15 +80,15 @@ EventScript_161A7F:: @ 8161A7F return EventScript_161A80:: @ 8161A80 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_SQUIRTLE, 0, Text_1767D0 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, Text_1767D0 return EventScript_161A8B:: @ 8161A8B - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_BULBASAUR, 0, Text_1767D0 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, Text_1767D0 return EventScript_161A96:: @ 8161A96 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_CHARMANDER, 0, Text_1767D0 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, Text_1767D0 return EventScript_161AA1:: @ 8161AA1 @@ -130,17 +127,16 @@ Movement_161ABF:: @ 8161ABF SilphCo_7F_EventScript_161AC8:: @ 8161AC8 lock faceplayer - checkflag FLAG_GOT_LAPRAS_FROM_SILPH - goto_if TRUE, EventScript_161B8D + goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, EventScript_161B8D msgbox gUnknown_8176266 setvar VAR_TEMP_1, SPECIES_LAPRAS - givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 + givemon SPECIES_LAPRAS, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if eq, EventScript_161B12 + goto_if_eq EventScript_161B12 compare VAR_RESULT, 1 - goto_if eq, EventScript_161B45 + goto_if_eq EventScript_161B45 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C release end @@ -153,7 +149,7 @@ EventScript_161B12:: @ 8161B12 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_161B7E + goto_if_eq EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_161B7E @@ -170,7 +166,7 @@ EventScript_161B45:: @ 8161B45 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_161B73 + goto_if_eq EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 @@ -200,7 +196,7 @@ SilphCo_7F_EventScript_161B97:: @ 8161B97 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161BAE + goto_if_ge EventScript_161BAE msgbox gUnknown_8176444 release end @@ -214,7 +210,7 @@ SilphCo_7F_EventScript_161BB8:: @ 8161BB8 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161BCF + goto_if_ge EventScript_161BCF msgbox gUnknown_81764C2 release end @@ -228,7 +224,7 @@ SilphCo_7F_EventScript_161BD9:: @ 8161BD9 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161BF0 + goto_if_ge EventScript_161BF0 msgbox gUnknown_8176532 release end @@ -243,21 +239,21 @@ SilphCo_7F_EventScript_161BFA:: @ 8161BFA end SilphCo_7F_EventScript_161C03:: @ 8161C03 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSHUA, 0, Text_1765E2, Text_17660C + trainerbattle_single TRAINER_SCIENTIST_JOSHUA, Text_1765E2, Text_17660C msgbox gUnknown_8176616, 6 end SilphCo_7F_EventScript_161C1A:: @ 8161C1A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_33, 0, Text_176643, Text_176669 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, Text_176643, Text_176669 msgbox gUnknown_8176681, 6 end SilphCo_7F_EventScript_161C31:: @ 8161C31 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_34, 0, Text_1766B3, Text_1766D7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, Text_1766B3, Text_1766D7 msgbox gUnknown_81766E5, 6 end SilphCo_7F_EventScript_161C48:: @ 8161C48 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_35, 0, Text_176586, Text_1765A5 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, Text_176586, Text_1765A5 msgbox gUnknown_81765B1, 6 end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 5570c4be9..84993bf67 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -3,15 +3,14 @@ SilphCo_8F_MapScripts:: @ 8161C5F .byte 0 SilphCo_8F_OnLoad:: @ 8161C65 - checkflag FLAG_SILPH_8F_DOOR - call_if FALSE, EventScript_Close8FDoor + call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161C86 + goto_if_ge EventScript_161C86 msgbox gUnknown_817696D release end @@ -26,16 +25,16 @@ SilphCo_8F_EventScript_161C90:: @ 8161C90 end SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19 + trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19 msgbox gUnknown_8176A26, 6 end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE msgbox gUnknown_81769CF, 6 end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C msgbox gUnknown_8176A90, 6 end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 919d700b0..737cf5f71 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -3,21 +3,17 @@ SilphCo_9F_MapScripts:: @ 8161CDE .byte 0 SilphCo_9F_OnLoad:: @ 8161CE4 - checkflag FLAG_SILPH_9F_DOOR_1 - call_if FALSE, EventScript_Close9FDoor1 - checkflag FLAG_SILPH_9F_DOOR_2 - call_if FALSE, EventScript_Close9FDoor2 - checkflag FLAG_SILPH_9F_DOOR_3 - call_if FALSE, EventScript_Close9FDoor3 - checkflag FLAG_SILPH_9F_DOOR_4 - call_if FALSE, EventScript_Close9FDoor4 + call_if_unset FLAG_SILPH_9F_DOOR_1, EventScript_Close9FDoor1 + call_if_unset FLAG_SILPH_9F_DOOR_2, EventScript_Close9FDoor2 + call_if_unset FLAG_SILPH_9F_DOOR_3, EventScript_Close9FDoor3 + call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4 end SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161D2E + goto_if_ge EventScript_161D2E msgbox gUnknown_8176B54 closemessage call EventScript_FadeOut_Heal_FadeIn @@ -35,16 +31,16 @@ SilphCo_9F_EventScript_161D38:: @ 8161D38 end SilphCo_9F_EventScript_161D41:: @ 8161D41 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_ED, 0, Text_176BFB, Text_176C2B + trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B msgbox gUnknown_8176C3C, 6 end SilphCo_9F_EventScript_161D58:: @ 8161D58 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_37, 0, Text_176BA3, Text_176BC8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8 msgbox gUnknown_8176BD0, 6 end SilphCo_9F_EventScript_161D6F:: @ 8161D6F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_38, 0, Text_176C7A, Text_176CA0 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0 msgbox gUnknown_8176CB8, 6 end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index a6ecf471a..8f11d4ef7 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -4,8 +4,7 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F lockall setvar VAR_0x8004, 1 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_1A535C @@ -34,7 +33,7 @@ EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 4 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 4 goto EventScript_1621E7 @@ -46,7 +45,7 @@ EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 5 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 5 goto EventScript_1621E7 @@ -58,7 +57,7 @@ EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 6 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 6 goto EventScript_1621E7 @@ -70,7 +69,7 @@ EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 7 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 7 goto EventScript_1621E7 @@ -82,7 +81,7 @@ EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 8 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 8 goto EventScript_1621E7 @@ -94,7 +93,7 @@ EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 compare VAR_ELEVATOR_FLOOR, 9 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 9 goto EventScript_1621E7 @@ -106,7 +105,7 @@ EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 compare VAR_ELEVATOR_FLOOR, 10 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 10 goto EventScript_1621E7 @@ -118,7 +117,7 @@ EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 11 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 11 goto EventScript_1621E7 @@ -130,7 +129,7 @@ EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 compare VAR_ELEVATOR_FLOOR, 12 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 12 goto EventScript_1621E7 @@ -142,7 +141,7 @@ EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 13 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 13 goto EventScript_1621E7 @@ -154,7 +153,7 @@ EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 14 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 14 goto EventScript_1621E7 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 4c7b28205..24106d3ac 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -17,13 +17,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 waitmovement 0 playse SE_W070 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_16430F + call_if_eq EventScript_16430F compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_16430F + call_if_eq EventScript_16430F compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16431A + call_if_eq EventScript_16431A compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16431A + call_if_eq EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 @@ -31,43 +31,43 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 special Special_ShakeScreen delay 60 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_164325 + call_if_eq EventScript_164325 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_164330 + call_if_eq EventScript_164330 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16433B + call_if_eq EventScript_16433B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_164346 + call_if_eq EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_164351 + call_if_eq EventScript_164351 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_164366 + call_if_eq EventScript_164366 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16437B + call_if_eq EventScript_16437B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_164390 + call_if_eq EventScript_164390 removeobject 1 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1642F9 + call_if_eq EventScript_1642F9 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1642F9 + call_if_eq EventScript_1642F9 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_164304 + call_if_eq EventScript_164304 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_164304 + call_if_eq EventScript_164304 msgbox gUnknown_817BDD4 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1643A5 + call_if_eq EventScript_1643A5 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1643B7 + call_if_eq EventScript_1643B7 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_1643C9 + call_if_eq EventScript_1643C9 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_1643DB + call_if_eq EventScript_1643DB playse SE_KAIDAN delay 35 removeobject 2 diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 3e2a19d53..1da8aa3dc 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ SixIsland_Mart_MapScripts:: @ 8171E65 SixIsland_Mart_EventScript_171E66:: @ 8171E66 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index 3d7069cc8..1a754362f 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -2,6 +2,6 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 .byte 0 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_46, 0, Text_18B35A, Text_18B3C2 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, Text_18B35A, Text_18B3C2 msgbox gUnknown_818B3C8, 6 end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index dd3eb293a..4d6f63b07 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -6,9 +6,9 @@ SixIsland_PatternBush_OnTransition:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_TEMP_1, VAR_TEMP_2 compare VAR_TEMP_1, 50 - call_if ge, EventScript_16457E + call_if_ge EventScript_16457E compare VAR_TEMP_1, 49 - call_if le, EventScript_164587 + call_if_le EventScript_164587 end EventScript_16457E:: @ 816457E @@ -20,61 +20,61 @@ EventScript_164587:: @ 8164587 return SixIsland_PatternBush_EventScript_164590:: @ 8164590 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_BETHANY, 0, Text_17BF3A, Text_17BF66 + trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, Text_17BF3A, Text_17BF66 msgbox gUnknown_817BF97, 6 end SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALLISON, 0, Text_17BFEB, Text_17C028 + trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, Text_17BFEB, Text_17C028 msgbox gUnknown_817C056, 6 end SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GARRET, 0, Text_17C0BE, Text_17C0F2 + trainerbattle_single TRAINER_BUG_CATCHER_GARRET, Text_17C0BE, Text_17C0F2 msgbox gUnknown_817C113, 6 end SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JONAH, 0, Text_17C155, Text_17C196 + trainerbattle_single TRAINER_BUG_CATCHER_JONAH, Text_17C155, Text_17C196 msgbox gUnknown_817C1D0, 6 end SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_VANCE, 0, Text_17C246, Text_17C275 + trainerbattle_single TRAINER_BUG_CATCHER_VANCE, Text_17C246, Text_17C275 msgbox gUnknown_817C2A4, 6 end SixIsland_PatternBush_EventScript_164603:: @ 8164603 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_NASH, 0, Text_17C2D9, Text_17C30D + trainerbattle_single TRAINER_YOUNGSTER_NASH, Text_17C2D9, Text_17C30D msgbox gUnknown_817C31C, 6 end SixIsland_PatternBush_EventScript_16461A:: @ 816461A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CORDELL, 0, Text_17C373, Text_17C3A5 + trainerbattle_single TRAINER_YOUNGSTER_CORDELL, Text_17C373, Text_17C3A5 msgbox gUnknown_817C3CE, 6 end SixIsland_PatternBush_EventScript_164631:: @ 8164631 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_DALIA, 0, Text_17C42B, Text_17C458 + trainerbattle_single TRAINER_LASS_DALIA, Text_17C42B, Text_17C458 msgbox gUnknown_817C490, 6 end SixIsland_PatternBush_EventScript_164648:: @ 8164648 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JOANA, 0, Text_17C4FE, Text_17C552 + trainerbattle_single TRAINER_LASS_JOANA, Text_17C4FE, Text_17C552 msgbox gUnknown_817C590, 6 end SixIsland_PatternBush_EventScript_16465F:: @ 816465F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RILEY, 0, Text_17C5DB, Text_17C609 + trainerbattle_single TRAINER_CAMPER_RILEY, Text_17C5DB, Text_17C609 msgbox gUnknown_817C615, 6 end SixIsland_PatternBush_EventScript_164676:: @ 8164676 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARCY, 0, Text_17C63E, Text_17C660 + trainerbattle_single TRAINER_PICNICKER_MARCY, Text_17C63E, Text_17C660 msgbox gUnknown_817C68E, 6 end SixIsland_PatternBush_EventScript_16468D:: @ 816468D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAYTON, 0, Text_17C6C9, Text_17C6FB + trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, Text_17C6C9, Text_17C6FB msgbox gUnknown_817C728, 6 end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 55d5e1a16..570d65b4b 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_OnTransition:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 - call_if eq, EventScript_171D89 + call_if_eq EventScript_171D89 end EventScript_171D89:: @ 8171D89 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 9878f172a..3246909ae 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -3,8 +3,7 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 .byte 0 SixIsland_RuinValley_OnLoad:: @ 8168B59 - checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE - call_if TRUE, EventScript_168B63 + call_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168B63 end EventScript_168B63:: @ 8168B63 @@ -24,11 +23,10 @@ SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall - checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE - goto_if TRUE, EventScript_168BC1 + goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_168BCB + goto_if_eq EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B waitbuttonpress diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index 1561e5c36..e8784d75c 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -6,28 +6,28 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D faceplayer special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare VAR_RESULT, 0 - goto_if eq, EventScript_1720E5 + goto_if_eq EventScript_1720E5 special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4A3F special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 6 - goto_if ge, EventScript_1720EF + goto_if_ge EventScript_1720EF special CompareHeracrossSize compare VAR_RESULT, 1 - goto_if eq, EventScript_1720F1 + goto_if_eq EventScript_1720F1 compare VAR_RESULT, 2 - goto_if eq, EventScript_1720FB + goto_if_eq EventScript_1720FB compare VAR_RESULT, 3 - goto_if eq, EventScript_172121 + goto_if_eq EventScript_172121 compare VAR_RESULT, 4 - goto_if eq, EventScript_17210E + goto_if_eq EventScript_17210E release end @@ -46,15 +46,13 @@ EventScript_1720F1:: @ 81720F1 end EventScript_1720FB:: @ 81720FB - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if FALSE, EventScript_172121 + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 msgbox gUnknown_81A4B7A release end EventScript_17210E:: @ 817210E - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if FALSE, EventScript_172121 + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 msgbox gUnknown_81A4B39 release end @@ -64,7 +62,7 @@ EventScript_172121:: @ 8172121 msgbox gUnknown_81A4A88 giveitem ITEM_NEST_BALL compare VAR_RESULT, 0 - goto_if eq, EventScript_17214D + goto_if_eq EventScript_17214D msgbox gUnknown_81A4AD9 release end @@ -76,8 +74,7 @@ EventScript_17214D:: @ 817214D SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 lockall - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if TRUE, EventScript_17216B + goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_17216B msgbox gUnknown_81A4CB9 releaseall end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index f1fe4883a..9f546cbf2 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -4,10 +4,9 @@ ThreeIsland_MapScripts:: @ 81677AD ThreeIsland_OnTransition:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND - checkflag FLAG_RESCUED_LOSTELLE - call_if TRUE, EventScript_1677CB + call_if_set FLAG_RESCUED_LOSTELLE, EventScript_1677CB compare VAR_MAP_SCENE_THREE_ISLAND, 4 - call_if eq, EventScript_1677CF + call_if_eq EventScript_1677CF end EventScript_1677CB:: @ 81677CB @@ -28,10 +27,9 @@ ThreeIsland_EventScript_1677D8:: @ 81677D8 ThreeIsland_EventScript_1677E5:: @ 81677E5 lock - checkflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER - goto_if TRUE, EventScript_167806 + goto_if_set FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER, EventScript_167806 compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if eq, EventScript_16781A + goto_if_eq EventScript_16781A setvar VAR_TEMP_1, 0 call EventScript_16786F release @@ -50,9 +48,9 @@ EventScript_16781A:: @ 816781A msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_167865 - giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE - additem ITEM_FULL_RESTORE, 1 + goto_if_eq EventScript_167865 + msgreceiveditem gUnknown_81827BE, ITEM_FULL_RESTORE + additem ITEM_FULL_RESTORE setflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER msgbox gUnknown_81827F1 release @@ -65,36 +63,36 @@ EventScript_167865:: @ 8167865 EventScript_16786F:: @ 816786F compare VAR_TEMP_1, 1 - call_if eq, EventScript_167947 + call_if_eq EventScript_167947 compare VAR_TEMP_1, 2 - call_if eq, EventScript_167947 + call_if_eq EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_167952 + call_if_eq EventScript_167952 compare VAR_TEMP_1, 1 - call_if eq, EventScript_167952 + call_if_eq EventScript_167952 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16795D + call_if_eq EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 compare VAR_TEMP_1, 0 - call_if eq, EventScript_167931 + call_if_eq EventScript_167931 compare VAR_TEMP_1, 1 - call_if eq, EventScript_167931 + call_if_eq EventScript_167931 compare VAR_TEMP_1, 2 - call_if eq, EventScript_167973 + call_if_eq EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 compare VAR_TEMP_1, 0 - call_if eq, EventScript_167952 + call_if_eq EventScript_167952 compare VAR_TEMP_1, 1 - call_if eq, EventScript_167952 + call_if_eq EventScript_167952 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16795D + call_if_eq EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 msgbox gUnknown_81821DC @@ -123,21 +121,21 @@ EventScript_167952:: @ 8167952 EventScript_16795D:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if ge, EventScript_167931 + goto_if_ge EventScript_167931 goto EventScript_167952 end EventScript_167973:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if ge, EventScript_167947 + goto_if_ge EventScript_167947 goto EventScript_167931 end ThreeIsland_EventScript_167989:: @ 8167989 lock compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if eq, EventScript_1679A1 + goto_if_eq EventScript_1679A1 setvar VAR_TEMP_1, 1 call EventScript_16786F release @@ -224,10 +222,10 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_167C35 + goto_if_eq EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON, 0, Text_1824B7 + trainerbattle_no_intro TRAINER_BIKER_GOON, Text_1824B7 applymovement 5, Movement_167C5C waitmovement 0 msgbox gUnknown_81824CF @@ -237,7 +235,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81824EF setvar VAR_LAST_TALKED, 7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_2, 0, Text_182521 + trainerbattle_no_intro TRAINER_BIKER_GOON_2, Text_182521 applymovement 7, Movement_167C5C waitmovement 0 msgbox gUnknown_8182536 @@ -247,7 +245,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182582 setvar VAR_LAST_TALKED, 4 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_3, 0, Text_1825D4 + trainerbattle_no_intro TRAINER_BIKER_GOON_3, Text_1825D4 applymovement 4, Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 6, Movement_WalkInPlaceFastestDown @@ -257,19 +255,19 @@ EventScript_167A59:: @ 8167A59 closemessage delay 45 compare VAR_TEMP_1, 0 - call_if eq, EventScript_167BC6 + call_if_eq EventScript_167BC6 compare VAR_TEMP_1, 1 - call_if eq, EventScript_167BD8 + call_if_eq EventScript_167BD8 compare VAR_TEMP_1, 2 - call_if eq, EventScript_167BEA + call_if_eq EventScript_167BEA compare VAR_TEMP_1, 3 - call_if eq, EventScript_167C03 + call_if_eq EventScript_167C03 compare VAR_TEMP_1, 4 - call_if eq, EventScript_167C1C + call_if_eq EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CUE_BALL_PAXTON, 0, Text_1826B7 + trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, Text_1826B7 msgbox gUnknown_818271D closemessage fadescreen 1 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index b1bb6fb7f..8aeb7ac30 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -19,7 +19,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AE8E special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 waitse playmoncry SPECIES_HYPNO, 2 waitmoncry @@ -31,7 +31,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 - call_if eq, EventScript_163D19 + call_if_eq EventScript_163D19 special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_817AF3B closemessage diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index ba3922f9f..db49c4dcd 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -7,9 +7,9 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 1 - call_if eq, EventScript_164D50 + call_if_eq EventScript_164D50 compare VAR_0x8008, 0 - call_if eq, EventScript_164D54 + call_if_eq EventScript_164D54 end EventScript_164D50:: @ 8164D50 @@ -24,11 +24,10 @@ EventScript_164D54:: @ 8164D54 ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 lock faceplayer - checkflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL - goto_if TRUE, EventScript_164DC2 + goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2 specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 - goto_if eq, EventScript_164D90 + goto_if_eq EventScript_164D90 msgbox gUnknown_817D13B closemessage applymovement 1, Movement_FaceOriginalDirection @@ -40,7 +39,7 @@ EventScript_164D90:: @ 8164D90 msgbox gUnknown_817D1C9 giveitem ITEM_NUGGET compare VAR_RESULT, 0 - goto_if eq, EventScript_164DB8 + goto_if_eq EventScript_164DB8 setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL goto EventScript_164DC2 end diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index 3dee5e153..4a2b4f370 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -4,8 +4,7 @@ ThreeIsland_House5_MapScripts:: @ 817191F ThreeIsland_House5_EventScript_171920:: @ 8171920 lock faceplayer - checkflag FLAG_RESCUED_LOSTELLE - goto_if TRUE, EventScript_171935 + goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171935 msgbox gUnknown_81A3469 release end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 531e0de7b..b6e488c03 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_Mart_MapScripts:: @ 817188C ThreeIsland_Mart_EventScript_17188D:: @ 817188D special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index ee88d85fe..1764efd7b 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -11,9 +11,9 @@ ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - goto_if ge, EventScript_1687B8 + goto_if_ge EventScript_1687B8 compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if ge, EventScript_1687C2 + goto_if_ge EventScript_1687C2 msgbox gUnknown_818A307 release end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 12f3163a2..3bc899bef 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -9,38 +9,28 @@ TwoIsland_OnTransition:: @ 816756A end EventScript_167576:: @ 8167576 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_167597 - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_1675B8 - checkflag FLAG_RESCUED_LOSTELLE - goto_if TRUE, EventScript_1675D9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167597 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1675B8 + goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_1675D9 goto EventScript_1675E8 end EventScript_167597:: @ 8167597 - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if FALSE, EventScript_1675EE - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - goto_if FALSE, EventScript_1675F4 - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 - goto_if FALSE, EventScript_1675FD + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1675FD goto EventScript_167606 end EventScript_1675B8:: @ 81675B8 - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if FALSE, EventScript_1675EE - checkflag FLAG_RESCUED_LOSTELLE - goto_if FALSE, EventScript_1675EE - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - goto_if FALSE, EventScript_1675F4 + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE + goto_if_unset FLAG_RESCUED_LOSTELLE, EventScript_1675EE + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 goto EventScript_1675FD end EventScript_1675D9:: @ 81675D9 - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if FALSE, EventScript_1675EE + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE goto EventScript_1675F4 end @@ -70,21 +60,20 @@ EventScript_167606:: @ 8167606 TwoIsland_EventScript_16760F:: @ 816760F special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if eq, EventScript_167646 + goto_if_eq EventScript_167646 compare VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if eq, EventScript_16765E + goto_if_eq EventScript_16765E compare VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if eq, EventScript_167676 + goto_if_eq EventScript_167676 goto EventScript_16768E end EventScript_167646:: @ 8167646 - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 message Text_181CAE waitmessage @@ -92,8 +81,7 @@ EventScript_167646:: @ 8167646 end EventScript_16765E:: @ 816765E - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 message Text_181C77 waitmessage @@ -101,8 +89,7 @@ EventScript_16765E:: @ 816765E end EventScript_167676:: @ 8167676 - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 message Text_181B7C waitmessage @@ -110,8 +97,7 @@ EventScript_167676:: @ 8167676 end EventScript_16768E:: @ 816768E - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED message Text_181AFE waitmessage @@ -122,11 +108,11 @@ EventScript_1676A6:: @ 81676A6 message Text_MayIHelpYou waitmessage compare VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if eq, EventScript_167728 + goto_if_eq EventScript_167728 compare VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if eq, EventScript_167708 + goto_if_eq EventScript_167708 compare VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if eq, EventScript_1676EC + goto_if_eq EventScript_1676EC goto EventScript_1676D3 end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index f2761d7e2..68dc50ae8 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -4,15 +4,14 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_171619:: @ 8171619 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer clearflag FLAG_TEMP_2 clearflag FLAG_TEMP_3 clearflag FLAG_TEMP_4 - checkflag FLAG_TEMP_1 - goto_if TRUE, EventScript_17164F + goto_if_set FLAG_TEMP_1, EventScript_17164F msgbox gUnknown_81A2B88 setflag FLAG_TEMP_1 goto EventScript_17164F @@ -21,33 +20,29 @@ TwoIsland_House_EventScript_171619:: @ 8171619 EventScript_17164F:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 compare VAR_RESULT, 1 - call_if eq, EventScript_1717A8 + call_if_eq EventScript_1717A8 checkitem ITEM_TINY_MUSHROOM, 2 compare VAR_RESULT, 1 - call_if eq, EventScript_1717AC - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_171687 - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_171696 + call_if_eq EventScript_1717AC + goto_if_set FLAG_TEMP_2, EventScript_171687 + goto_if_set FLAG_TEMP_3, EventScript_171696 goto EventScript_17179E end EventScript_171687:: @ 8171687 - checkflag FLAG_TEMP_3 - call_if TRUE, EventScript_1717B0 + call_if_set FLAG_TEMP_3, EventScript_1717B0 goto EventScript_1716A5 end EventScript_171696:: @ 8171696 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_1717B0 + call_if_set FLAG_TEMP_2, EventScript_1717B0 goto EventScript_1716A5 end EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_17179E + goto_if_eq EventScript_17179E goto EventScript_1716BE end @@ -56,12 +51,12 @@ EventScript_1716BE:: @ 81716BE special SelectMoveTutorMon waitstate compare VAR_0x8004, 6 - goto_if ge, EventScript_17179E + goto_if_ge EventScript_17179E special IsSelectedMonEgg compare VAR_RESULT, 1 - goto_if eq, EventScript_171790 + goto_if_eq EventScript_171790 compare VAR_0x8005, 0 - goto_if eq, EventScript_171782 + goto_if_eq EventScript_171782 goto EventScript_1716F4 end @@ -70,13 +65,10 @@ EventScript_1716F4:: @ 81716F4 special DisplayMoveTutorMenu waitstate compare VAR_0x8004, 0 - goto_if eq, EventScript_1716BE - checkflag FLAG_TEMP_4 - goto_if TRUE, EventScript_17175B - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_171727 - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_171741 + goto_if_eq EventScript_1716BE + goto_if_set FLAG_TEMP_4, EventScript_17175B + goto_if_set FLAG_TEMP_2, EventScript_171727 + goto_if_set FLAG_TEMP_3, EventScript_171741 end EventScript_171727:: @ 8171727 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 6ad841ea4..fff1e10c5 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -6,8 +6,7 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 .byte 0 TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5 - checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - call_if TRUE, EventScript_1713EF + call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1713EF end EventScript_1713EF:: @ 81713EF @@ -126,9 +125,8 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if eq, EventScript_1BC060 - checkflag FLAG_RESCUED_LOSTELLE - goto_if TRUE, EventScript_171555 + goto_if_eq EventScript_1BC060 + goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555 msgbox gUnknown_81A285C release end @@ -142,18 +140,16 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if eq, EventScript_1BC0CE - checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - goto_if TRUE, EventScript_1715F5 + goto_if_eq EventScript_1BC0CE + goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5 compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 - goto_if eq, EventScript_17158A + goto_if_eq EventScript_17158A msgbox gUnknown_81A2743 release end EventScript_17158A:: @ 817158A - checkflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE - goto_if TRUE, EventScript_1715C4 + goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, EventScript_1715C4 msgbox gUnknown_81A296A setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 @@ -170,10 +166,10 @@ EventScript_17158A:: @ 817158A EventScript_1715C4:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1715FF - additem ITEM_MOON_STONE, 1 + goto_if_eq EventScript_1715FF + additem ITEM_MOON_STONE setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE + msgreceiveditem gUnknown_81A2A9A, ITEM_MOON_STONE release end diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 39e8c1fcc..55a810d64 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -6,17 +6,16 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 faceplayer setvar VAR_0x8008, 2 call EventScript_1A8CAD - checkflag FLAG_DID_MS_NIDO_TRADE - goto_if TRUE, EventScript_160EAB + goto_if_set FLAG_DID_MS_NIDO_TRADE, EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_160E93 + goto_if_eq EventScript_160E93 call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_160E93 + goto_if_ge EventScript_160E93 call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_160E9D + goto_if_ne EventScript_160E9D call EventScript_1A8CD9 msgbox gUnknown_81A5B4A setflag FLAG_DID_MS_NIDO_TRADE diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 7c18e34d7..8de5d1e26 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -22,8 +22,7 @@ Movement_166903:: @ 8166903 VermilionCity_OnTransition:: @ 8166906 setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY - checkflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION - call_if TRUE, EventScript_166913 + call_if_set FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION, EventScript_166913 end EventScript_166913:: @ 8166913 @@ -38,7 +37,7 @@ VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer compare VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if eq, EventScript_166937 + goto_if_eq EventScript_166937 msgbox gUnknown_817F776 release end @@ -52,35 +51,33 @@ VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer compare VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if eq, EventScript_166996 + goto_if_eq EventScript_166996 msgbox gUnknown_817FA22 release end EventScript_166958:: @ 8166958 - checkflag FLAG_SYS_GOT_MYSTIC_TICKET - goto_if FALSE, EventScript_1A77B0 + goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A77B0 + goto_if_eq EventScript_1A77B0 goto EventScript_1A77AA end EventScript_166977:: @ 8166977 - checkflag FLAG_SYS_GOT_AURORA_TICKET - goto_if FALSE, EventScript_1A77B0 + goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A77B0 + goto_if_eq EventScript_1A77B0 goto EventScript_1A77AA end EventScript_166996:: @ 8166996 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1669BB + goto_if_ge EventScript_1669BB compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if ge, EventScript_166B3B + goto_if_ge EventScript_166B3B msgbox gUnknown_817FB10 release end @@ -88,14 +85,14 @@ EventScript_166996:: @ 8166996 EventScript_1669BB:: @ 81669BB special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 call EventScript_166958 compare VAR_RESULT, 1 - goto_if eq, EventScript_1669FD + goto_if_eq EventScript_1669FD call EventScript_166977 compare VAR_RESULT, 1 - goto_if eq, EventScript_166A5F + goto_if_eq EventScript_166A5F setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY message Text_17FBB8 waitmessage @@ -105,9 +102,8 @@ EventScript_1669BB:: @ 81669BB EventScript_1669FD:: @ 81669FD call EventScript_166977 compare VAR_RESULT, 1 - goto_if eq, EventScript_166AB1 - checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN - call_if FALSE, EventScript_166A53 + goto_if_eq EventScript_166AB1 + call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53 message Text_17FCC1 waitmessage multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE @@ -124,8 +120,7 @@ EventScript_166A53:: @ 8166A53 return EventScript_166A5F:: @ 8166A5F - checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN - call_if FALSE, EventScript_166AA5 + call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE @@ -142,10 +137,8 @@ EventScript_166AA5:: @ 8166AA5 return EventScript_166AB1:: @ 8166AB1 - checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN - call_if FALSE, EventScript_166A53 - checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN - call_if FALSE, EventScript_166AA5 + call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53 + call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE @@ -210,10 +203,9 @@ EventScript_166BA0:: @ 8166BA0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 compare VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if eq, EventScript_166BED + goto_if_eq EventScript_166BED msgbox gUnknown_817FA3C - checkflag FLAG_GOT_SS_TICKET - goto_if FALSE, EventScript_166BDE + goto_if_unset FLAG_GOT_SS_TICKET, EventScript_166BDE msgbox gUnknown_817FA77 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall @@ -228,9 +220,9 @@ EventScript_166BDE:: @ 8166BDE EventScript_166BED:: @ 8166BED setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1669BB + goto_if_ge EventScript_1669BB compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if ge, EventScript_166B3B + goto_if_ge EventScript_166B3B msgbox gUnknown_817FB10 closemessage goto EventScript_1A9108 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 676a4d3fa..aaa029052 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -4,10 +4,8 @@ VermilionCity_Gym_MapScripts:: @ 816B69E .byte 0 VermilionCity_Gym_OnLoad:: @ 816B6A9 - checkflag FLAG_TEMP_1 - call_if TRUE, EventScript_16B6BC - checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES - call_if TRUE, EventScript_16B717 + call_if_set FLAG_TEMP_1, EventScript_16B6BC + call_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B717 end EventScript_16B6BC:: @ 816B6BC @@ -41,8 +39,7 @@ VermilionCity_Gym_OnTransition:: @ 816B772 end EventScript_16B778:: @ 816B778 - checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_1A77A9 special Special_SetVermilionTrashCans copyvar VAR_TEMP_0, VAR_0x8004 copyvar VAR_TEMP_1, VAR_0x8005 @@ -141,16 +138,14 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 copyvar VAR_0x8004, VAR_TEMP_0 copyvar VAR_0x8005, VAR_TEMP_1 - checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES - goto_if TRUE, EventScript_16B8E5 - checkflag FLAG_TEMP_1 - goto_if TRUE, EventScript_16B89E + goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B8E5 + goto_if_set FLAG_TEMP_1, EventScript_16B89E compare VAR_0x8004, VAR_0x8008 - goto_if eq, EventScript_16B885 + goto_if_eq EventScript_16B885 msgbox gUnknown_8195289 releaseall end @@ -167,7 +162,7 @@ EventScript_16B885:: @ 816B885 EventScript_16B89E:: @ 816B89E compare VAR_0x8005, VAR_0x8008 - goto_if eq, EventScript_16B8CB + goto_if_eq EventScript_16B8CB msgbox gUnknown_819536C clearflag FLAG_TEMP_1 special Special_SetVermilionTrashCans @@ -209,17 +204,15 @@ EventScript_16B8EF:: @ 816B8EF VermilionCity_Gym_EventScript_16B94A:: @ 816B94A famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C - checkflag FLAG_GOT_TM34_FROM_SURGE - goto_if FALSE, EventScript_16B9AF + trainerbattle_single TRAINER_LEADER_LT_SURGE, Text_194BA4, Text_194E03, EventScript_16B97C, NO_MUSIC + goto_if_unset FLAG_GOT_TM34_FROM_SURGE, EventScript_16B9AF msgbox gUnknown_8194C8E release end EventScript_16B97C:: @ 816B97C famechecker FAMECHECKER_LTSURGE, 1 - checkflag FLAG_GOT_HM05 - call_if FALSE, EventScript_16B9AB + call_if_unset FLAG_GOT_HM05, EventScript_16B9AB clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL setflag FLAG_DEFEATED_LT_SURGE setflag FLAG_BADGE03_GET @@ -235,9 +228,8 @@ EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B9F0 - additem ITEM_TM34, 1 - giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 + goto_if_eq EventScript_16B9F0 + giveitem_msg gUnknown_8194D87, ITEM_TM34 setflag FLAG_GOT_TM34_FROM_SURGE msgbox gUnknown_8194DA8 release @@ -249,18 +241,18 @@ EventScript_16B9F0:: @ 816B9F0 end VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DWAYNE, 0, Text_194FBD, Text_194FF1 + trainerbattle_single TRAINER_SAILOR_DWAYNE, Text_194FBD, Text_194FF1 famechecker FAMECHECKER_LTSURGE, 4 msgbox gUnknown_8195004, 6 end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BAILY, 0, Text_194F1F, Text_194F6F + trainerbattle_single TRAINER_ENGINEER_BAILY, Text_194F1F, Text_194F6F msgbox gUnknown_8194F76, 6 end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GENTLEMAN_TUCKER, 0, Text_194E57, Text_194EA5, EventScript_16BA5D + trainerbattle_single TRAINER_GENTLEMAN_TUCKER, Text_194E57, Text_194EA5, EventScript_16BA5D famechecker FAMECHECKER_LTSURGE, 3 msgbox gUnknown_8194EBD, 6 end @@ -273,8 +265,7 @@ EventScript_16BA5D:: @ 816BA5D VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C lock faceplayer - checkflag FLAG_DEFEATED_LT_SURGE - goto_if TRUE, EventScript_16BA81 + goto_if_set FLAG_DEFEATED_LT_SURGE, EventScript_16BA81 msgbox gUnknown_81950B4 release end @@ -286,8 +277,7 @@ EventScript_16BA81:: @ 816BA81 VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall - checkflag FLAG_BADGE03_GET - goto_if TRUE, EventScript_16BA9F + goto_if_set FLAG_BADGE03_GET, EventScript_16BA9F msgbox gUnknown_819520B releaseall end diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index cfa7f143e..f0b5f75e8 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -4,11 +4,10 @@ VermilionCity_House1_MapScripts:: @ 816B3A6 VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 lock faceplayer - checkflag FLAG_GOT_OLD_ROD - goto_if TRUE, EventScript_16B3CF + goto_if_set FLAG_GOT_OLD_ROD, EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16B3D9 + goto_if_eq EventScript_16B3D9 msgbox gUnknown_8194028 release end @@ -21,10 +20,10 @@ EventScript_16B3CF:: @ 816B3CF EventScript_16B3D9:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B41A - additem ITEM_OLD_ROD, 1 + goto_if_eq EventScript_16B41A + additem ITEM_OLD_ROD msgbox gUnknown_8193F2A - giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD + msgreceiveditem gUnknown_8193F81, ITEM_OLD_ROD setflag FLAG_GOT_OLD_ROD msgbox gUnknown_8193FAF release diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index e24705d6d..ca192abf4 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -6,17 +6,16 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 faceplayer setvar VAR_0x8008, 3 call EventScript_1A8CAD - checkflag FLAG_DID_CH_DING_TRADE - goto_if TRUE, EventScript_16B649 + goto_if_set FLAG_DID_CH_DING_TRADE, EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16B631 + goto_if_eq EventScript_16B631 call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16B631 + goto_if_ge EventScript_16B631 call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16B63B + goto_if_ne EventScript_16B63B call EventScript_1A8CD9 msgbox gUnknown_8194A44 setflag FLAG_DID_CH_DING_TRADE diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 49b9799b0..1c342fc1c 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -12,7 +12,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D VermilionCity_Mart_EventScript_16B666:: @ 816B666 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 03e82d3d7..42d810120 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -4,11 +4,10 @@ VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F lock faceplayer - checkflag FLAG_GOT_BIKE_VOUCHER - goto_if TRUE, EventScript_16B4A7 + goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16B4B1 + goto_if_eq EventScript_16B4B1 msgbox gUnknown_8194860 release end @@ -22,10 +21,9 @@ EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B4F2 + goto_if_eq EventScript_16B4F2 setflag FLAG_GOT_BIKE_VOUCHER - additem ITEM_BIKE_VOUCHER, 1 - giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 + giveitem_msg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 msgbox gUnknown_819477C release end @@ -38,8 +36,7 @@ EventScript_16B4F2:: @ 816B4F2 VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_16B511 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16B511 msgbox gUnknown_81948E6 release end @@ -53,8 +50,7 @@ EventScript_16B511:: @ 816B511 VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 lock faceplayer - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_16B54B + goto_if_set FLAG_TEMP_3, EventScript_16B54B msgbox gUnknown_81944CC closemessage applymovement 5, Movement_FaceOriginalDirection @@ -75,8 +71,7 @@ EventScript_16B54B:: @ 816B54B VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_16B586 + goto_if_set FLAG_TEMP_2, EventScript_16B586 msgbox gUnknown_819446F closemessage applymovement 6, Movement_FaceOriginalDirection diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 569fce4ff..255c5e240 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -5,7 +5,7 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 VictoryRoad_1F_OnLoad:: @ 8160F10 compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - call_if ne, EventScript_160F1C + call_if_ne EventScript_160F1C end EventScript_160F1C:: @ 8160F1C @@ -20,7 +20,7 @@ VictoryRoad_1F_OnTransition:: @ 8160F2F VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - goto_if eq, EventScript_160F62 + goto_if_eq EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 playse SE_RU_GASYAN @@ -36,11 +36,11 @@ EventScript_160F62:: @ 8160F62 end VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_NAOMI, 0, Text_174710, Text_174738 + trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738 msgbox gUnknown_8174744, 6 end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ROLANDO, 0, Text_174784, Text_1747B8 + trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8 msgbox gUnknown_81747C8, 6 end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index ee3367636..1e08d2265 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -4,9 +4,9 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 VictoryRoad_2F_OnLoad:: @ 8160F98 compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - call_if ne, EventScript_160FAF + call_if_ne EventScript_160FAF compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - call_if ne, EventScript_160FC2 + call_if_ne EventScript_160FC2 end EventScript_160FAF:: @ 8160FAF @@ -22,7 +22,7 @@ EventScript_160FC2:: @ 8160FC2 VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - goto_if eq, EventScript_161004 + goto_if_eq EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 playse SE_RU_GASYAN @@ -40,7 +40,7 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - goto_if eq, EventScript_161035 + goto_if_eq EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 playse SE_RU_GASYAN @@ -56,26 +56,26 @@ EventScript_161035:: @ 8161035 end VictoryRoad_2F_EventScript_161037:: @ 8161037 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_DAWSON, 0, Text_1747EF, Text_17482C + trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C msgbox gUnknown_817483E, 6 end VictoryRoad_2F_EventScript_16104E:: @ 816104E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_DAISUKE, 0, Text_174877, Text_1748B4 + trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4 msgbox gUnknown_81748BB, 6 end VictoryRoad_2F_EventScript_161065:: @ 8161065 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NELSON, 0, Text_1748EE, Text_17491B + trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B msgbox gUnknown_8174927, 6 end VictoryRoad_2F_EventScript_16107C:: @ 816107C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_GREGORY, 0, Text_174995, Text_1749B0 + trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0 msgbox gUnknown_81749BB, 6 end VictoryRoad_2F_EventScript_161093:: @ 8161093 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_VINCENT, 0, Text_174942, Text_17495A + trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A msgbox gUnknown_8174969, 6 end diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index cc4f54f13..8e12ddf79 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -4,7 +4,7 @@ VictoryRoad_3F_MapScripts:: @ 81610AA VictoryRoad_3F_OnLoad:: @ 81610B0 compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - call_if ne, EventScript_1610BC + call_if_ne EventScript_1610BC end EventScript_1610BC:: @ 81610BC @@ -15,7 +15,7 @@ EventScript_1610BC:: @ 81610BC VictoryRoad_3F_EventScript_1610CF:: @ 81610CF lockall compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - goto_if eq, EventScript_161101 + goto_if_eq EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 playse SE_RU_GASYAN @@ -32,31 +32,31 @@ EventScript_161101:: @ 8161101 end VictoryRoad_3F_EventScript_161103:: @ 8161103 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_GEORGE, 0, Text_174B60, Text_174B83 + trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83 msgbox gUnknown_8174B99, 6 end VictoryRoad_3F_EventScript_16111A:: @ 816111A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_COLBY, 0, Text_174C8A, Text_174CA9 + trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9 msgbox gUnknown_8174CBD, 6 end VictoryRoad_3F_EventScript_161131:: @ 8161131 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_CAROLINE, 0, Text_174C30, Text_174C5A + trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A msgbox gUnknown_8174C67, 6 end VictoryRoad_3F_EventScript_161148:: @ 8161148 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ALEXA, 0, Text_174BCA, Text_174BF4 + trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4 msgbox gUnknown_8174C03, 6 end VictoryRoad_3F_EventScript_16115F:: @ 816115F - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174D0C, Text_174D45, Text_174D96 + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96 msgbox gUnknown_8174D64, 6 end VictoryRoad_3F_EventScript_16117A:: @ 816117A - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174E08, Text_174E39, Text_174E8D + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D msgbox gUnknown_8174E48, 6 end diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index c661ad19b..f87c5ac12 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -5,13 +5,13 @@ ViridianCity_MapScripts:: @ 81658D3 ViridianCity_OnTransition:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - call_if eq, EventScript_165920 + call_if_eq EventScript_165920 compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - call_if eq, EventScript_16590F + call_if_eq EventScript_16590F compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - call_if ge, EventScript_165909 + call_if_ge EventScript_165909 compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 - call_if eq, EventScript_165931 + call_if_eq EventScript_165931 end EventScript_165909:: @ 8165909 @@ -31,18 +31,12 @@ EventScript_165920:: @ 8165920 return EventScript_165931:: @ 8165931 - checkflag FLAG_BADGE02_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE03_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE04_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE05_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE06_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE07_GET - goto_if FALSE, EventScript_1A77A9 + goto_if_unset FLAG_BADGE02_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE03_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE04_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE05_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE06_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE07_GET, EventScript_1A77A9 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return @@ -91,7 +85,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 - goto_if eq, EventScript_1659EC + goto_if_eq EventScript_1659EC msgbox gUnknown_817DB39 closemessage applymovement 3, Movement_FaceOriginalDirection @@ -107,20 +101,19 @@ EventScript_1659EC:: @ 81659EC ViridianCity_EventScript_1659F6:: @ 81659F6 lock faceplayer - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_165A23 + goto_if_set FLAG_BADGE01_GET, EventScript_165A23 compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - goto_if ge, EventScript_165A4A + goto_if_ge EventScript_165A4A compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - goto_if eq, EventScript_165A54 + goto_if_eq EventScript_165A54 compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if eq, EventScript_165A84 + goto_if_eq EventScript_165A84 end EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_165A40 + goto_if_eq EventScript_165A40 msgbox gUnknown_817E0EA release end @@ -149,7 +142,7 @@ EventScript_165A65:: @ 8165A65 msgbox gUnknown_817DE9B special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special ScrSpecial_StartOldManTutorialBattle waitstate @@ -167,9 +160,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_165AB0 + goto_if_eq EventScript_165AB0 compare VAR_RESULT, 0 - goto_if eq, EventScript_165ABA + goto_if_eq EventScript_165ABA end EventScript_165AB0:: @ 8165AB0 @@ -186,7 +179,7 @@ ViridianCity_EventScript_165AC4:: @ 8165AC4 lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if eq, EventScript_165ADB + goto_if_eq EventScript_165ADB msgbox gUnknown_817DC99 release end @@ -244,7 +237,7 @@ EventScript_165B4C:: @ 8165B4C closemessage special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special ScrSpecial_StartOldManTutorialBattle waitstate diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 43660d1ae..f119d51d1 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -3,9 +3,8 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9 ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04 - checkflag FLAG_GOT_TM26_FROM_GIOVANNI - goto_if FALSE, EventScript_169F2F + trainerbattle_single TRAINER_LEADER_GIOVANNI, Text_18F352, Text_18F43F, EventScript_169F04, NO_MUSIC + goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, EventScript_169F2F msgbox gUnknown_818F4A2 closemessage fadescreen 1 @@ -28,9 +27,8 @@ EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_169F70 - additem ITEM_TM26, 1 - giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 + goto_if_eq EventScript_169F70 + giveitem_msg gUnknown_818F675, ITEM_TM26 setflag FLAG_GOT_TM26_FROM_GIOVANNI msgbox gUnknown_818F695 release @@ -42,50 +40,49 @@ EventScript_169F70:: @ 8169F70 end ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824 + trainerbattle_single TRAINER_TAMER_JASON, Text_18F7F3, Text_18F824 msgbox gUnknown_818F840, 6 end ViridianCity_Gym_EventScript_169F91:: @ 8169F91 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB + trainerbattle_single TRAINER_TAMER_COLE, Text_18F98A, Text_18F9BB msgbox gUnknown_818F9CC, 6 end ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6 + trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, Text_18F7AD, Text_18F7D6 msgbox gUnknown_818F7DD, 6 end ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899 + trainerbattle_single TRAINER_BLACK_BELT_KIYO, Text_18F86C, Text_18F899 msgbox gUnknown_818F8A0, 6 end ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A + trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, Text_18F92C, Text_18F95A msgbox gUnknown_818F960, 6 end ViridianCity_Gym_EventScript_169FED:: @ 8169FED - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D + trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, Text_18F9E7, Text_18FA2D msgbox gUnknown_818FA3B, 6 end ViridianCity_Gym_EventScript_16A004:: @ 816A004 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769 + trainerbattle_single TRAINER_COOLTRAINER_YUJI, Text_18F73B, Text_18F769 msgbox gUnknown_818F77B, 6 end ViridianCity_Gym_EventScript_16A01B:: @ 816A01B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE + trainerbattle_single TRAINER_COOLTRAINER_WARREN, Text_18F8CB, Text_18F8EE msgbox gUnknown_818F8FE, 6 end ViridianCity_Gym_EventScript_16A032:: @ 816A032 lock faceplayer - checkflag FLAG_DEFEATED_LEADER_GIOVANNI - goto_if TRUE, EventScript_16A047 + goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, EventScript_16A047 msgbox gUnknown_818FA81 release end @@ -98,8 +95,7 @@ EventScript_16A047:: @ 816A047 ViridianCity_Gym_EventScript_16A05E:: @ 816A05E lockall - checkflag FLAG_BADGE08_GET - goto_if TRUE, EventScript_16A072 + goto_if_set FLAG_BADGE08_GET, EventScript_16A072 msgbox gUnknown_818FB8D releaseall end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 406bfd7a0..a897b3f1f 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -26,15 +26,15 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB msgbox gUnknown_818FC65 msgbox gUnknown_818FF19, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index f0958605a..3ecce3880 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -4,8 +4,7 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 .byte 0 ViridianCity_Mart_OnLoad:: @ 816A1DE - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_16A1E8 + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_16A1E8 end EventScript_16A1E8:: @ 816A1E8 @@ -29,8 +28,7 @@ EventScript_16A205:: @ 816A205 waitmovement 0 msgbox gUnknown_819023A setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - additem ITEM_OAKS_PARCEL, 1 - giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 + giveitem_msg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end @@ -55,10 +53,10 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if eq, EventScript_16A2A4 + goto_if_eq EventScript_16A2A4 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 message Text_MayIHelpYou waitmessage pokemart Items_16A298 diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index bc6923ea6..95b1f0fb5 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -39,26 +39,26 @@ ViridianForest_EventScript_160568:: @ 8160568 end ViridianForest_EventScript_160571:: @ 8160571 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_RICK, 0, Text_1722C7, Text_1722F9 + trainerbattle_single TRAINER_BUG_CATCHER_RICK, Text_1722C7, Text_1722F9 msgbox gUnknown_8172315, 6 end ViridianForest_EventScript_160588:: @ 8160588 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_DOUG, 0, Text_17234A, Text_17237D + trainerbattle_single TRAINER_BUG_CATCHER_DOUG, Text_17234A, Text_17237D msgbox gUnknown_8172398, 6 end ViridianForest_EventScript_16059F:: @ 816059F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_SAMMY, 0, Text_1723D4, Text_172402 + trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, Text_1723D4, Text_172402 msgbox gUnknown_817241F, 6 end ViridianForest_EventScript_1605B6:: @ 81605B6 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ANTHONY, 0, Text_172482, Text_1724BF + trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, Text_172482, Text_1724BF msgbox gUnknown_81724DC, 6 end ViridianForest_EventScript_1605CD:: @ 81605CD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CHARLIE, 0, Text_1724F9, Text_17251B + trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, Text_1724F9, Text_17251B msgbox gUnknown_8172527, 6 end diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 08655098e..ee4585203 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -37,8 +37,7 @@ sText_MysteryGiftStampCard: @ 8488E55 MysteryEventScript_SurfPichu:: @ 8488EB5 setvaddress MysteryEventScript_SurfPichu - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if FALSE, SurfPichu_GiveIfPossible + vgoto_if_unset FLAG_MYSTERY_EVENT_DONE, SurfPichu_GiveIfPossible gotoram SurfPichu_GiveIfPossible: @ 8488EC4 @@ -167,8 +166,7 @@ sText_MysteryGiftVisitingTrainer_2: @ 84891B0 MysteryEventScript_BattleCard:: @ 84892B9 setvaddress MysteryEventScript_BattleCard - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if TRUE, MysteryEventScript_BattleCardInfo + vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, 2 specialvar VAR_0x8008, Special_BattleCardAction compare VAR_0x8008, 3 @@ -217,10 +215,8 @@ MysteryEventScript_AuroraTicket:: @ 84894B9 setvaddress MysteryEventScript_AuroraTicket lock faceplayer - checkflag FLAG_GOT_AURORA_TICKET - vgoto_if TRUE, AuroraTicket_Obtained - checkflag FLAG_FOUGHT_DEOXYS - vgoto_if TRUE, AuroraTicket_Obtained + vgoto_if_set FLAG_GOT_AURORA_TICKET, AuroraTicket_Obtained + vgoto_if_set FLAG_FOUGHT_DEOXYS, AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 1 vgoto_if TRUE, AuroraTicket_Obtained @@ -279,12 +275,9 @@ MysteryEventScript_MysticTicket:: @ 8489689 setvaddress MysteryEventScript_MysticTicket lock faceplayer - checkflag FLAG_GOT_MYSTIC_TICKET - vgoto_if TRUE, MysticTicket_Obtained - checkflag FLAG_FOUGHT_LUGIA - vgoto_if TRUE, MysticTicket_Obtained - checkflag FLAG_FOUGHT_HO_OH - vgoto_if TRUE, MysticTicket_Obtained + vgoto_if_set FLAG_GOT_MYSTIC_TICKET, MysticTicket_Obtained + vgoto_if_set FLAG_FOUGHT_LUGIA, MysticTicket_Obtained + vgoto_if_set FLAG_FOUGHT_HO_OH, MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 1 vgoto_if TRUE, MysticTicket_Obtained diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e702b9a13..ea1bbfdcf 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -5,7 +5,7 @@ CableClub_OnTransition:: @ 81BB1B4 CableClub_EventScript_HideOrShowMysteryGiftMan:: @ 81BB1BA specialvar VAR_RESULT, ValidateReceivedWonderCard compare VAR_RESULT, FALSE - goto_if eq, EventScript_HideMysteryGiftMan + goto_if_eq EventScript_HideMysteryGiftMan clearflag FLAG_HIDE_MG_DELIVERYMEN return @@ -16,7 +16,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 execram @@ -37,26 +37,26 @@ CableClub_OnWarp:: @ 81BB1ED EventScript_CheckTurnAttendant:: @ 81BB227 compare VAR_0x8007, 0 - goto_if eq, EventScript_CheckTurnAttendantEnd + goto_if_eq EventScript_CheckTurnAttendantEnd turnobject VAR_0x8007, DIR_WEST EventScript_CheckTurnAttendantEnd: end CableClub_OnLoad:: @ 81BB237 compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE - goto_if eq, EventScript_OnLoadFromColosseum + goto_if_eq EventScript_OnLoadFromColosseum compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE - goto_if eq, EventScript_OnLoadFromColosseum + goto_if_eq EventScript_OnLoadFromColosseum compare VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE - goto_if eq, EventScript_OnLoadFromColosseum + goto_if_eq EventScript_OnLoadFromColosseum compare VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER - goto_if eq, EventScript_OnLoadFromTradeCenter + goto_if_eq EventScript_OnLoadFromTradeCenter compare VAR_CABLE_CLUB_STATE, USING_UNION_ROOM - goto_if eq, EventScript_OnLoadFromUnionRoom + goto_if_eq EventScript_OnLoadFromUnionRoom compare VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH - goto_if eq, EventScript_OnLoadFromBerryCrush + goto_if_eq EventScript_OnLoadFromBerryCrush compare VAR_CABLE_CLUB_STATE, USING_MINIGAME - goto_if eq, EventScript_OnLoadFromGameCorner + goto_if_eq EventScript_OnLoadFromGameCorner end EventScript_OnLoadFromColosseum:: @ 81BB285 @@ -117,7 +117,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 - goto_if eq, CableClub_EventScript_PlayerExitLinkRoom + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom applymovement VAR_0x8007, Movement_1BB88F waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 @@ -143,7 +143,7 @@ EventScript_1BB367:: @ 81BB367 setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 - goto_if eq, CableClub_EventScript_PlayerExitLinkRoom + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88F @@ -167,7 +167,7 @@ EventScript_1BB3B4:: @ 81BB3B4 setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 - goto_if eq, CableClub_EventScript_PlayerExitLinkRoom + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88F @@ -267,7 +267,7 @@ EventScript_1BB50F:: @ 81BB50F EventScript_1BB51A:: @ 81BB51A special CheckForAlivePartyMons compare VAR_RESULT, 0 - goto_if ne, EventScript_1BB533 + goto_if_ne EventScript_1BB533 setvar VAR_0x8004, 2 goto EventScript_1BB54C end @@ -285,7 +285,7 @@ EventScript_1BB541:: @ 81BB541 EventScript_1BB54C:: @ 81BB54C call EventScript_1A4EAF compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F message gUnknown_81BC4AC waitmessage special HelpSystem_Disable @@ -294,17 +294,17 @@ EventScript_1BB54C:: @ 81BB54C waitstate call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB5B3 + goto_if_eq EventScript_1BB5B3 compare VAR_RESULT, 2 - goto_if eq, EventScript_1BB80F + goto_if_eq EventScript_1BB80F compare VAR_RESULT, 3 - goto_if eq, EventScript_1BB81F + goto_if_eq EventScript_1BB81F compare VAR_RESULT, 4 - goto_if eq, EventScript_1BB63C + goto_if_eq EventScript_1BB63C compare VAR_RESULT, 5 - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F compare VAR_RESULT, 6 - goto_if eq, EventScript_1BB7FF + goto_if_eq EventScript_1BB7FF end EventScript_1BB5B3:: @ 81BB5B3 @@ -332,7 +332,7 @@ EventScript_1BB5B3:: @ 81BB5B3 waitdooranim release compare VAR_0x8004, 5 - goto_if eq, EventScript_1BB62C + goto_if_eq EventScript_1BB62C special SetCableClubWarp warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 special DoCableClubWarp @@ -396,10 +396,10 @@ EventScript_1BB6AB:: @ 81BB6AB copyvar VAR_0x8007, VAR_LAST_TALKED call EventScript_1BB79C compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F call EventScript_1A4EAF compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F message gUnknown_81BC4AC waitmessage special HelpSystem_Disable @@ -408,21 +408,21 @@ EventScript_1BB6AB:: @ 81BB6AB waitstate call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB73D + goto_if_eq EventScript_1BB73D compare VAR_RESULT, 2 - goto_if eq, EventScript_1BB80F + goto_if_eq EventScript_1BB80F compare VAR_RESULT, 3 - goto_if eq, EventScript_1BB81F + goto_if_eq EventScript_1BB81F compare VAR_RESULT, 4 - goto_if eq, EventScript_1BB857 + goto_if_eq EventScript_1BB857 compare VAR_RESULT, 5 - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F compare VAR_RESULT, 6 - goto_if eq, EventScript_1BB7FF + goto_if_eq EventScript_1BB7FF compare VAR_RESULT, 7 - goto_if eq, EventScript_1BB7DF + goto_if_eq EventScript_1BB7DF compare VAR_RESULT, 9 - goto_if eq, EventScript_1BB7EF + goto_if_eq EventScript_1BB7EF end EventScript_1BB73D:: @ 81BB73D @@ -456,10 +456,10 @@ EventScript_1BB73D:: @ 81BB73D EventScript_1BB79C:: @ 81BB79C specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 - goto_if lt, EventScript_1BB7C2 + goto_if_lt EventScript_1BB7C2 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB7D0 + goto_if_eq EventScript_1BB7D0 setvar VAR_RESULT, 1 return @@ -606,7 +606,7 @@ Movement_1BB8A2:: @ 81BB8A2 gUnknown_81BB8A7:: @ 81BB8A7 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall fadescreen 1 setvar VAR_0x8004, 0 @@ -637,7 +637,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB special sub_80A0334 waitstate compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB94F + goto_if_eq EventScript_1BB94F setvar VAR_0x8005, 0 textcolor 3 special sub_80819C8 @@ -650,7 +650,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 special sub_80A0334 waitstate compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB94F + goto_if_eq EventScript_1BB94F setvar VAR_0x8005, 1 textcolor 3 special sub_80819C8 @@ -663,7 +663,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 special sub_80A0334 waitstate compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB94F + goto_if_eq EventScript_1BB94F setvar VAR_0x8005, 2 textcolor 3 special sub_80819C8 @@ -676,7 +676,7 @@ UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 special sub_80A0334 waitstate compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB94F + goto_if_eq EventScript_1BB94F setvar VAR_0x8005, 3 textcolor 3 special sub_80819C8 @@ -765,7 +765,7 @@ gUnknown_81BB9D4:: @ 81BB9D4 textcolor 3 msgbox Text_TerminateLinkIfYouLeaveRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if eq, EventScript_1BB9F0 + goto_if_eq EventScript_1BB9F0 erasebox 0, 0, 29, 19 releaseall end @@ -786,19 +786,18 @@ gUnknown_81BB9FC:: @ 81BB9FC EventScript_1BBA04:: @ 81BBA04 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1BB877 + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877 specialvar VAR_RESULT, Special_BadEggInParty compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB867 + goto_if_eq EventScript_1BB867 copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_if eq, EventScript_1BBB60 + goto_if_eq EventScript_1BBB60 message Text_1BD65B waitmessage goto EventScript_1BBA51 @@ -826,10 +825,10 @@ EventScript_1BBA93:: @ 81BBA93 EventScript_1BBA94:: @ 81BBA94 call EventScript_1BBB1E compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F call EventScript_1A4EAF compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F msgbox gUnknown_81BD86A closemessage special sp000_heal_pokemon @@ -862,10 +861,10 @@ EventScript_1BBA94:: @ 81BBA94 EventScript_1BBB1E:: @ 81BBB1E specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 - goto_if lt, EventScript_1BBB44 + goto_if_lt EventScript_1BBB44 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBB52 + goto_if_eq EventScript_1BBB52 setvar VAR_RESULT, 1 return @@ -891,11 +890,10 @@ EventScript_1BBB60:: @ 81BBB60 EventScript_1BBB6A:: @ 81BBB6A lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1BB877 + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877 msgbox gUnknown_81BDB85, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1BBB92 + goto_if_eq EventScript_1BBB92 msgbox gUnknown_81BDBF8 release return @@ -908,18 +906,17 @@ EventScript_1BBB92:: @ 81BBB92 EventScript_1BBB9C:: @ 81BBB9C special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1BB877 + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877 specialvar VAR_RESULT, Special_BadEggInParty compare VAR_RESULT, 1 - goto_if eq, EventScript_1BB867 + goto_if_eq EventScript_1BB867 specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB44A + goto_if_eq EventScript_1BB44A message Text_1BD28D waitmessage delay 15 @@ -929,8 +926,7 @@ EventScript_1BBBE6:: @ 81BBBE6 end EventScript_1BBBE7:: @ 81BBBE7 - checkflag FLAG_GOT_POWDER_JAR - goto_if FALSE, EventScript_1BBC32 + goto_if_unset FLAG_GOT_POWDER_JAR, EventScript_1BBC32 multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE switch VAR_RESULT case 0, EventScript_1BBC69 @@ -952,10 +948,10 @@ EventScript_1BBC32:: @ 81BBC32 EventScript_1BBC69:: @ 81BBC69 msgbox gUnknown_81BD317, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F call EventScript_1BB79C compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F setvar VAR_0x8004, 3 goto EventScript_1BBD6F @@ -985,7 +981,7 @@ EventScript_1BBCF4:: @ 81BBCF4 EventScript_1BBCF5:: @ 81BBCF5 special CheckForAlivePartyMons compare VAR_RESULT, 0 - goto_if ne, EventScript_1BBD0E + goto_if_ne EventScript_1BBD0E setvar VAR_0x8004, 1 goto EventScript_1BBD6F @@ -1016,10 +1012,10 @@ EventScript_1BBD34:: @ 81BBD34 EventScript_1BBD35:: @ 81BBD35 msgbox gUnknown_81BD362, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F special CheckHasAtLeastOneBerry compare VAR_RESULT, 0 - goto_if eq, EventScript_1BBD61 + goto_if_eq EventScript_1BBD61 setvar VAR_0x8004, 5 goto EventScript_1BBD6F @@ -1036,7 +1032,7 @@ EventScript_1BBD6E:: @ 81BBD6E EventScript_1BBD6F:: @ 81BBD6F call EventScript_1A4EAF compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB82F + goto_if_eq EventScript_1BB82F switch VAR_0x8004 case 3, EventScript_1BBDBC case 0, EventScript_1BBDBC @@ -1061,22 +1057,22 @@ EventScript_1BBDBC:: @ 81BBDBC EventScript_1BBE00:: @ 81BBE00 call EventScript_1BBF78 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 + goto_if_eq EventScript_1BBF88 compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBDBC + goto_if_eq EventScript_1BBDBC compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBE00 + goto_if_eq EventScript_1BBE00 release return EventScript_1BBE28:: @ 81BBE28 call EventScript_1BBF80 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 + goto_if_eq EventScript_1BBF88 compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBDBC + goto_if_eq EventScript_1BBDBC compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBE28 + goto_if_eq EventScript_1BBE28 release return @@ -1096,22 +1092,22 @@ EventScript_1BBE50:: @ 81BBE50 EventScript_1BBE94:: @ 81BBE94 call EventScript_1BBF78 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 + goto_if_eq EventScript_1BBF88 compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBE50 + goto_if_eq EventScript_1BBE50 compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBE94 + goto_if_eq EventScript_1BBE94 release return EventScript_1BBEBC:: @ 81BBEBC call EventScript_1BBF80 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 + goto_if_eq EventScript_1BBF88 compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBE50 + goto_if_eq EventScript_1BBE50 compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBEBC + goto_if_eq EventScript_1BBEBC release return @@ -1131,22 +1127,22 @@ EventScript_1BBEE4:: @ 81BBEE4 EventScript_1BBF28:: @ 81BBF28 call EventScript_1BBF78 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 + goto_if_eq EventScript_1BBF88 compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBEE4 + goto_if_eq EventScript_1BBEE4 compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBF28 + goto_if_eq EventScript_1BBF28 release return EventScript_1BBF50:: @ 81BBF50 call EventScript_1BBF80 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BBF88 + goto_if_eq EventScript_1BBF88 compare VAR_RESULT, 5 - goto_if eq, EventScript_1BBEE4 + goto_if_eq EventScript_1BBEE4 compare VAR_RESULT, 8 - goto_if eq, EventScript_1BBF50 + goto_if_eq EventScript_1BBF50 release return @@ -1191,13 +1187,12 @@ EventScript_1BBF88:: @ 81BBF88 gUnknown_81BBFD8:: @ 81BBFD8 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1BB881 + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB881 specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_if eq, EventScript_1BC016 + goto_if_eq EventScript_1BC016 special HelpSystem_Disable fadescreen 1 special sub_814F1D4 @@ -1261,7 +1256,7 @@ ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C EventScript_1BC060:: @ 81BC060 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -1293,7 +1288,7 @@ EventScript_1BC0C4:: @ 81BC0C4 EventScript_1BC0CE:: @ 81BC0CE special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -1301,7 +1296,7 @@ EventScript_1BC0CE:: @ 81BC0CE waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_if eq, EventScript_1BC29C + goto_if_eq EventScript_1BC29C delay 60 special HelpSystem_Disable message Text_1BD02D @@ -1318,16 +1313,16 @@ EventScript_1BC13A:: @ 81BC13A setvar VAR_0x8005, 0 special sub_8149A18 compare VAR_RESULT, 0 - goto_if eq, EventScript_NoEligiblePkmn + goto_if_eq EventScript_NoEligiblePkmn msgbox gUnknown_81BD059 setvar VAR_0x8005, 0 special ChooseMonForWirelessMinigame waitstate compare VAR_0x8004, 6 - goto_if ge, EventScript_1BB83F + goto_if_ge EventScript_1BB83F call EventScript_1A4EAF compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB83F + goto_if_eq EventScript_1BB83F setvar VAR_0x8004, 4 goto EventScript_1BC1CE @@ -1338,16 +1333,16 @@ EventScript_1BC184:: @ 81BC184 setvar VAR_0x8005, 1 special sub_81537C0 compare VAR_RESULT, 0 - goto_if eq, EventScript_NoEligiblePkmn + goto_if_eq EventScript_NoEligiblePkmn msgbox gUnknown_81BD059 setvar VAR_0x8005, 1 special ChooseMonForWirelessMinigame waitstate compare VAR_0x8004, 6 - goto_if ge, EventScript_1BB83F + goto_if_ge EventScript_1BB83F call EventScript_1A4EAF compare VAR_RESULT, 0 - goto_if eq, EventScript_1BB83F + goto_if_eq EventScript_1BB83F setvar VAR_0x8004, 6 goto EventScript_1BC1CE @@ -1370,22 +1365,22 @@ EventScript_1BC1CE:: @ 81BC1CE EventScript_1BC212:: @ 81BC212 call EventScript_1BBF78 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BC262 + goto_if_eq EventScript_1BC262 compare VAR_RESULT, 5 - goto_if eq, EventScript_1BC1CE + goto_if_eq EventScript_1BC1CE compare VAR_RESULT, 8 - goto_if eq, EventScript_1BC212 + goto_if_eq EventScript_1BC212 release return EventScript_1BC23A:: @ 81BC23A call EventScript_1BBF80 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BC262 + goto_if_eq EventScript_1BC262 compare VAR_RESULT, 5 - goto_if eq, EventScript_1BC1CE + goto_if_eq EventScript_1BC1CE compare VAR_RESULT, 8 - goto_if eq, EventScript_1BC23A + goto_if_eq EventScript_1BC23A release return @@ -1417,11 +1412,11 @@ EventScript_1BC29C:: @ 81BC29C EventScript_NoEligiblePkmn:: @ 81BC2A6 msgbox gUnknown_81BD0CF, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1BB83F + goto_if_eq EventScript_1BB83F compare VAR_0x8005, 0 - call_if eq, EventScript_1BC2D5 + call_if_eq EventScript_1BC2D5 compare VAR_0x8005, 1 - call_if eq, EventScript_1BC2DE + call_if_eq EventScript_1BC2DE goto EventScript_1BB83F EventScript_1BC2D4:: @ 81BC2D4 @@ -1438,7 +1433,7 @@ EventScript_1BC2DE:: @ 81BC2DE TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall special sub_814B504 waitstate @@ -1448,7 +1443,7 @@ TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall special sub_8153810 waitstate diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 3576b40e8..bac14d221 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,16 +1,16 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 specialvar VAR_RESULT, IsThereMonInRoute5Daycare compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF46E + goto_if_eq EventScript_1BF46E msgbox Text_19DD66, 5 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF3DD + goto_if_eq EventScript_1BF3DD msgbox Text_19DDB2 goto EventScript_1BF541 end @@ -18,7 +18,7 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 EventScript_1BF3DD:: @ 81BF3DD specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF452 + goto_if_eq EventScript_1BF452 msgbox Text_19DDBE fadescreen 1 hidemoneybox 0, 0 @@ -26,10 +26,10 @@ EventScript_1BF3DD:: @ 81BF3DD waitstate showmoneybox 0, 0, 0 compare VAR_0x8004, 6 - goto_if ge, EventScript_1BF444 + goto_if_ge EventScript_1BF444 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare VAR_RESULT, 0 - goto_if eq, EventScript_1BF460 + goto_if_eq EventScript_1BF460 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies msgbox Text_19DDF9 waitse @@ -60,13 +60,13 @@ EventScript_1BF46E:: @ 81BF46E setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon compare VAR_RESULT, 0 - call_if ne, EventScript_1BF4AA + call_if_ne EventScript_1BF4AA compare VAR_RESULT, 0 - call_if eq, EventScript_1BF4B3 + call_if_eq EventScript_1BF4B3 special GetCostToWithdrawRoute5DaycareMon msgbox Text_19DE80, 5 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF4BC + goto_if_eq EventScript_1BF4BC goto EventScript_1BF444 end @@ -81,10 +81,10 @@ EventScript_1BF4B3:: @ 81BF4B3 EventScript_1BF4BC:: @ 81BF4BC specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, PARTY_SIZE - goto_if eq, EventScript_1BF533 + goto_if_eq EventScript_1BF533 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare VAR_RESULT, 1 - goto_if eq, EventScript_1BF4EA + goto_if_eq EventScript_1BF4EA msgbox Text_19E001 goto EventScript_1BF541 end @@ -95,7 +95,7 @@ EventScript_1BF4EA:: @ 81BF4EA special SubtractMoneyFromVar0x8005 updatemoneybox 0, 0, 0 copyvar VAR_0x8008, VAR_RESULT - countpokemon + getpartysize subvar VAR_RESULT, 1 getpartymonname 0, VAR_RESULT copyvar VAR_RESULT, VAR_0x8008 diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index 89ef6d622..3d808fa86 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -1,19 +1,18 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall - checkflag FLAG_BADGE02_GET - goto_if FALSE, EventScript_1BDF87 + goto_if_unset FLAG_BADGE02_GET, EventScript_1BDF87 checkpartymove MOVE_CUT compare VAR_RESULT, PARTY_SIZE - goto_if eq, EventScript_1BDF87 + goto_if_eq EventScript_1BDF87 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_CUT msgbox gUnknown_81BDF94, 5 compare VAR_RESULT, 0 - goto_if eq, EventScript_1BDF91 + goto_if_eq EventScript_1BDF91 msgbox gUnknown_81BDFD7 closemessage dofieldeffect FLDEFF_USE_CUT_ON_TREE @@ -64,19 +63,18 @@ gUnknown_81BDFE3:: @ 81BDFE3 EventScript_InteractWithRockSmashRockObject:: @ 81BE00C special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall - checkflag FLAG_BADGE06_GET - goto_if FALSE, EventScript_1BE091 + goto_if_unset FLAG_BADGE06_GET, EventScript_1BE091 checkpartymove MOVE_ROCK_SMASH compare VAR_RESULT, PARTY_SIZE - goto_if eq, EventScript_1BE091 + goto_if_eq EventScript_1BE091 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_ROCK_SMASH msgbox Text_1BE09D, 5 compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE09A + goto_if_eq EventScript_1BE09A msgbox gUnknown_81BDFD7 closemessage dofieldeffect FLDEFF_USE_ROCK_SMASH @@ -97,7 +95,7 @@ EventScript_1BE06F:: @ 81BE06F removeobject VAR_LAST_TALKED special ScrSpecial_RockSmashWildEncounter compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE08D + goto_if_eq EventScript_1BE08D waitstate releaseall end @@ -130,19 +128,17 @@ gUnknown_81BE0E2:: @ 81BE0E2 EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall - checkflag FLAG_BADGE04_GET - goto_if FALSE, EventScript_1BE185 - checkflag FLAG_SYS_STRENGTH_ACTIVE - goto_if TRUE, EventScript_1BE18E + goto_if_unset FLAG_BADGE04_GET, EventScript_1BE185 + goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_1BE18E checkpartymove MOVE_STRENGTH compare VAR_RESULT, PARTY_SIZE - goto_if eq, EventScript_1BE185 + goto_if_eq EventScript_1BE185 setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE19A, 5 compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE197 + goto_if_eq EventScript_1BE197 closemessage dofieldeffect FLDEFF_USE_STRENGTH waitstate @@ -195,16 +191,16 @@ gUnknown_81BE284:: @ 81BE284 gUnknown_81BE2B7:: @ 81BE2B7 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall checkpartymove MOVE_WATERFALL compare VAR_RESULT, PARTY_SIZE - goto_if eq, EventScript_1BE300 + goto_if_eq EventScript_1BE300 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE33F, 5 compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE308 + goto_if_eq EventScript_1BE308 msgbox gUnknown_81BE378 dofieldeffect FLDEFF_USE_WATERFALL goto EventScript_1BE308 @@ -233,13 +229,13 @@ EventScript_1BE38B:: @ 81BE38B lockall checkpartymove MOVE_DIVE compare VAR_RESULT, PARTY_SIZE - goto_if eq, EventScript_1BE3CA + goto_if_eq EventScript_1BE3CA getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE469, 5 compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE3D2 + goto_if_eq EventScript_1BE3D2 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE goto EventScript_1BE3D2 @@ -256,13 +252,13 @@ EventScript_1BE3D4:: @ 81BE3D4 lockall checkpartymove MOVE_DIVE compare VAR_RESULT, PARTY_SIZE - goto_if eq, EventScript_1BE412 + goto_if_eq EventScript_1BE412 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE4EF, 5 compare VAR_RESULT, 0 - goto_if eq, EventScript_1BE429 + goto_if_eq EventScript_1BE429 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE goto EventScript_1BE429 diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 211c2a935..0552b6bb3 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -1,19 +1,18 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE lock faceplayer - checkflag FLAG_TUTOR_DOUBLE_EDGE - goto_if TRUE, EventScript_1C480C + goto_if_set FLAG_TUTOR_DOUBLE_EDGE, EventScript_1C480C msgbox Text_1749F9, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4802 + goto_if_eq EventScript_1C4802 call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4802 + goto_if_eq EventScript_1C4802 msgbox Text_174AE2 setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4802 + goto_if_eq EventScript_1C4802 setflag FLAG_TUTOR_DOUBLE_EDGE goto EventScript_1C480C end @@ -31,19 +30,18 @@ EventScript_1C480C:: @ 81C480C EventScript_1C4816:: @ 81C4816 lock faceplayer - checkflag FLAG_TUTOR_THUNDER_WAVE - goto_if TRUE, EventScript_1C4874 + goto_if_set FLAG_TUTOR_THUNDER_WAVE, EventScript_1C4874 msgbox Text_175711, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C486A + goto_if_eq EventScript_1C486A call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C486A + goto_if_eq EventScript_1C486A msgbox Text_1757C1 setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C486A + goto_if_eq EventScript_1C486A setflag FLAG_TUTOR_THUNDER_WAVE goto EventScript_1C4874 end @@ -61,19 +59,18 @@ EventScript_1C4874:: @ 81C4874 RockTunnel_B1F_EventScript_1C487E:: @ 81C487E lock faceplayer - checkflag FLAG_TUTOR_ROCK_SLIDE - goto_if TRUE, EventScript_1C48DC + goto_if_set FLAG_TUTOR_ROCK_SLIDE, EventScript_1C48DC msgbox Text_1799E0, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C48D2 + goto_if_eq EventScript_1C48D2 call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C48D2 + goto_if_eq EventScript_1C48D2 msgbox Text_179AE1 setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C48D2 + goto_if_eq EventScript_1C48D2 setflag FLAG_TUTOR_ROCK_SLIDE goto EventScript_1C48DC end @@ -91,19 +88,18 @@ EventScript_1C48DC:: @ 81C48DC MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 lock faceplayer - checkflag FLAG_TUTOR_EXPLOSION - goto_if TRUE, EventScript_1C4944 + goto_if_set FLAG_TUTOR_EXPLOSION, EventScript_1C4944 msgbox Text_17A642, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C493A + goto_if_eq EventScript_1C493A call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C493A + goto_if_eq EventScript_1C493A msgbox Text_17A717 setvar VAR_0x8005, MOVETUTOR_EXPLOSION call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C493A + goto_if_eq EventScript_1C493A setflag FLAG_TUTOR_EXPLOSION goto EventScript_1C4944 end @@ -121,19 +117,18 @@ EventScript_1C4944:: @ 81C4944 Route4_EventScript_1C494E:: @ 81C494E lock faceplayer - checkflag FLAG_TUTOR_META_PUNCH - goto_if TRUE, EventScript_1C49AC + goto_if_set FLAG_TUTOR_META_PUNCH, EventScript_1C49AC msgbox Text_1839D5, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C49A2 + goto_if_eq EventScript_1C49A2 call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C49A2 + goto_if_eq EventScript_1C49A2 msgbox Text_183ABF setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C49A2 + goto_if_eq EventScript_1C49A2 setflag FLAG_TUTOR_META_PUNCH goto EventScript_1C49AC end @@ -151,19 +146,18 @@ EventScript_1C49AC:: @ 81C49AC Route4_EventScript_1C49B6:: @ 81C49B6 lock faceplayer - checkflag FLAG_TUTOR_MEGA_KICK - goto_if TRUE, EventScript_1C4A14 + goto_if_set FLAG_TUTOR_MEGA_KICK, EventScript_1C4A14 msgbox Text_183B74, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4A0A + goto_if_eq EventScript_1C4A0A call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A0A + goto_if_eq EventScript_1C4A0A msgbox Text_183C68 setvar VAR_0x8005, MOVETUTOR_MEGA_KICK call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A0A + goto_if_eq EventScript_1C4A0A setflag FLAG_TUTOR_MEGA_KICK goto EventScript_1C4A14 end @@ -181,19 +175,18 @@ EventScript_1C4A14:: @ 81C4A14 EventScript_1C4A1E:: @ 81C4A1E lock faceplayer - checkflag FLAG_TUTOR_DREAM_EATER - goto_if TRUE, EventScript_1C4A7C + goto_if_set FLAG_TUTOR_DREAM_EATER, EventScript_1C4A7C msgbox Text_17E316, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4A72 + goto_if_eq EventScript_1C4A72 call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A72 + goto_if_eq EventScript_1C4A72 msgbox Text_17E3F1 setvar VAR_0x8005, MOVETUTOR_DREAM_EATER call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4A72 + goto_if_eq EventScript_1C4A72 setflag FLAG_TUTOR_DREAM_EATER goto EventScript_1C4A7C end @@ -211,19 +204,18 @@ EventScript_1C4A7C:: @ 81C4A7C EventScript_1C4A86:: @ 81C4A86 lock faceplayer - checkflag FLAG_TUTOR_SOFT_BOILED - goto_if TRUE, EventScript_1C4AE4 + goto_if_set FLAG_TUTOR_SOFT_BOILED, EventScript_1C4AE4 msgbox Text_180388, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4ADA + goto_if_eq EventScript_1C4ADA call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4ADA + goto_if_eq EventScript_1C4ADA msgbox Text_180484 setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4ADA + goto_if_eq EventScript_1C4ADA setflag FLAG_TUTOR_SOFT_BOILED goto EventScript_1C4AE4 end @@ -241,19 +233,18 @@ EventScript_1C4AE4:: @ 81C4AE4 FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE lock faceplayer - checkflag FLAG_TUTOR_SUBSTITUTE - goto_if TRUE, EventScript_1C4B4C + goto_if_set FLAG_TUTOR_SUBSTITUTE, EventScript_1C4B4C msgbox Text_180948, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4B42 + goto_if_eq EventScript_1C4B42 call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4B42 + goto_if_eq EventScript_1C4B42 msgbox Text_180A57 setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4B42 + goto_if_eq EventScript_1C4B42 setflag FLAG_TUTOR_SUBSTITUTE goto EventScript_1C4B4C end @@ -271,19 +262,18 @@ EventScript_1C4B4C:: @ 81C4B4C SevenIsland_EventScript_1C4B56:: @ 81C4B56 lock faceplayer - checkflag FLAG_TUTOR_SWORDS_DANCE - goto_if TRUE, EventScript_1C4BB4 + goto_if_set FLAG_TUTOR_SWORDS_DANCE, EventScript_1C4BB4 msgbox Text_182F01, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4BAA + goto_if_eq EventScript_1C4BAA call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4BAA + goto_if_eq EventScript_1C4BAA msgbox Text_182FD9 setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4BAA + goto_if_eq EventScript_1C4BAA setflag FLAG_TUTOR_SWORDS_DANCE goto EventScript_1C4BB4 end @@ -301,19 +291,18 @@ EventScript_1C4BB4:: @ 81C4BB4 PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE lock faceplayer - checkflag FLAG_TUTOR_SEISMIC_TOSS - goto_if TRUE, EventScript_1C4C1C + goto_if_set FLAG_TUTOR_SEISMIC_TOSS, EventScript_1C4C1C msgbox Text_1909A3, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4C12 + goto_if_eq EventScript_1C4C12 call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C12 + goto_if_eq EventScript_1C4C12 msgbox Text_190AD5 setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C12 + goto_if_eq EventScript_1C4C12 setflag FLAG_TUTOR_SEISMIC_TOSS goto EventScript_1C4C1C end @@ -331,19 +320,18 @@ EventScript_1C4C1C:: @ 81C4C1C EventScript_1C4C26:: @ 81C4C26 lock faceplayer - checkflag FLAG_TUTOR_COUNTER - goto_if TRUE, EventScript_1C4C84 + goto_if_set FLAG_TUTOR_COUNTER, EventScript_1C4C84 msgbox Text_195928, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4C7A + goto_if_eq EventScript_1C4C7A call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C7A + goto_if_eq EventScript_1C4C7A msgbox Text_195A08 setvar VAR_0x8005, MOVETUTOR_COUNTER call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4C7A + goto_if_eq EventScript_1C4C7A setflag FLAG_TUTOR_COUNTER goto EventScript_1C4C84 end @@ -361,19 +349,18 @@ EventScript_1C4C84:: @ 81C4C84 EventScript_1C4C8E:: @ 81C4C8E lock faceplayer - checkflag FLAG_TUTOR_METRONOME - goto_if TRUE, EventScript_1C4CEC + goto_if_set FLAG_TUTOR_METRONOME, EventScript_1C4CEC msgbox Text_19A137, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4CE2 + goto_if_eq EventScript_1C4CE2 call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4CE2 + goto_if_eq EventScript_1C4CE2 msgbox Text_19A1EA setvar VAR_0x8005, MOVETUTOR_METRONOME call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4CE2 + goto_if_eq EventScript_1C4CE2 setflag FLAG_TUTOR_METRONOME goto EventScript_1C4CEC end @@ -389,21 +376,20 @@ EventScript_1C4CEC:: @ 81C4CEC end EventScript_1C4CF6:: @ 81C4CF6 - checkflag FLAG_TUTOR_MIMIC - goto_if TRUE, EventScript_1C4D59 + goto_if_set FLAG_TUTOR_MIMIC, EventScript_1C4D59 msgbox Text_19AD85, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4D4F + goto_if_eq EventScript_1C4D4F call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4D4F + goto_if_eq EventScript_1C4D4F msgbox Text_19ADEE setvar VAR_0x8005, MOVETUTOR_MIMIC call EventScript_1C4F30 lock faceplayer compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4D4F + goto_if_eq EventScript_1C4D4F removeitem ITEM_POKE_DOLL, 1 setflag FLAG_TUTOR_MIMIC goto EventScript_1C4D59 @@ -417,9 +403,9 @@ EventScript_1C4D4F:: @ 81C4D4F EventScript_1C4D59:: @ 81C4D59 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_1C4D72 + call_if_eq EventScript_1C4D72 compare VAR_RESULT, 1 - call_if eq, EventScript_1C4D7B + call_if_eq EventScript_1C4D7B release end @@ -434,19 +420,18 @@ EventScript_1C4D7B:: @ 81C4D7B FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 lock faceplayer - checkflag FLAG_TUTOR_BODY_SLAM - goto_if TRUE, EventScript_1C4DE2 + goto_if_set FLAG_TUTOR_BODY_SLAM, EventScript_1C4DE2 msgbox Text_1A3505, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4DD8 + goto_if_eq EventScript_1C4DD8 call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4DD8 + goto_if_eq EventScript_1C4DD8 msgbox Text_1A35DA setvar VAR_0x8005, MOVETUTOR_BODY_SLAM call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4DD8 + goto_if_eq EventScript_1C4DD8 setflag FLAG_TUTOR_BODY_SLAM goto EventScript_1C4DE2 end @@ -464,34 +449,32 @@ EventScript_1C4DE2:: @ 81C4DE2 TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK - goto_if TRUE, EventScript_1C4EA1 - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_1C4E97 + goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, EventScript_1C4EA1 + goto_if_set FLAG_TEMP_2, EventScript_1C4E97 getfirstpartymonname 0 msgbox Text_1A46C6 specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4F26 + goto_if_eq EventScript_1C4F26 copyvar VAR_0x8009, VAR_0x8005 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1C4EF0 + call_if_eq EventScript_1C4EF0 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1C4EFB + call_if_eq EventScript_1C4EFB compare VAR_FACING, DIR_EAST - call_if eq, EventScript_1C4F06 + call_if_eq EventScript_1C4F06 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_1C4F11 + call_if_eq EventScript_1C4F11 msgbox Text_1A4751, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_1C4F1C + goto_if_eq EventScript_1C4F1C call EventScript_1C4F37 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4F1C + goto_if_eq EventScript_1C4F1C msgbox Text_1A4814 closemessage fadescreen 1 @@ -516,7 +499,7 @@ EventScript_1C4EAB:: @ 81C4EAB copyvar VAR_0x8005, VAR_0x8009 specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor compare VAR_RESULT, 1 - goto_if eq, EventScript_1C4ECD + goto_if_eq EventScript_1C4ECD msgbox Text_1A4865 setflag FLAG_TEMP_2 release @@ -531,7 +514,7 @@ EventScript_1C4ECD:: @ 81C4ECD EventScript_1C4EDA:: @ 81C4EDA call EventScript_1C4F30 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C4F1C + goto_if_eq EventScript_1C4F1C goto EventScript_1C4EAB end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index f20768d88..6a7ed3d2d 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -2,9 +2,8 @@ PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 lock faceplayer compare VAR_TEMP_1, 1 - goto_if eq, EventScript_1BEE3A - checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE - goto_if TRUE, EventScript_1BEECD + goto_if_eq EventScript_1BEE3A + goto_if_set FLAG_SYS_SET_TRAINER_CARD_PROFILE, EventScript_1BEECD msgbox Text_1BEF88 goto EventScript_1BEE44 end @@ -104,11 +103,11 @@ EventScript_1BEF5A:: @ 81BEF5A lock faceplayer compare VAR_0x8004, 0 - goto_if eq, EventScript_1BEF3F + goto_if_eq EventScript_1BEF3F compare VAR_RESULT, 0 - goto_if eq, EventScript_1BEE9E + goto_if_eq EventScript_1BEE9E compare VAR_RESULT, 1 - goto_if eq, EventScript_1BEEA8 + goto_if_eq EventScript_1BEEA8 end Text_1BEF88:: @ 81BEF88 diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index d919d5fc6..d3ca91f19 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -20,9 +20,9 @@ EventScript_1A6697:: @ 81A6697 checkitemtype VAR_0x8000 call EventScript_1A66BC compare VAR_0x8007, 1 - call_if eq, EventScript_1A6749 + call_if_eq EventScript_1A6749 compare VAR_0x8007, 0 - call_if eq, EventScript_1A675E + call_if_eq EventScript_1A675E return EventScript_1A66BC:: @ 81A66BC @@ -37,31 +37,31 @@ EventScript_1A66BC:: @ 81A66BC EventScript_1A66F9:: @ 81A66F9 getstdstring 2, 24 compare VAR_0x8007, 1 - call_if eq, EventScript_1A6764 + call_if_eq EventScript_1A6764 return EventScript_1A6709:: @ 81A6709 getstdstring 2, 25 compare VAR_0x8007, 1 - call_if eq, EventScript_1A6764 + call_if_eq EventScript_1A6764 return EventScript_1A6719:: @ 81A6719 getstdstring 2, 26 compare VAR_0x8007, 1 - call_if eq, EventScript_1A6764 + call_if_eq EventScript_1A6764 return EventScript_1A6729:: @ 81A6729 getstdstring 2, 27 compare VAR_0x8007, 1 - call_if eq, EventScript_1A6768 + call_if_eq EventScript_1A6768 return EventScript_1A6739:: @ 81A6739 getstdstring 2, 28 compare VAR_0x8007, 1 - call_if eq, EventScript_1A6764 + call_if_eq EventScript_1A6764 return EventScript_1A6749:: @ 81A6749 @@ -93,9 +93,9 @@ Std_ObtainDecoration:: @ 81A676C EventScript_1A677A:: @ 81A677A getdecorname 1, VAR_0x8000 compare VAR_0x8007, 1 - call_if eq, EventScript_1A6795 + call_if_eq EventScript_1A6795 compare VAR_0x8007, 0 - call_if eq, EventScript_1A67AD + call_if_eq EventScript_1A67AD return EventScript_1A6795:: @ 81A6795 @@ -123,9 +123,9 @@ Std_FindItem:: @ 81A67B3 checkitemtype VAR_0x8000 call EventScript_1A66BC compare VAR_0x8007, 1 - call_if eq, EventScript_1A67EE + call_if_eq EventScript_1A67EE compare VAR_0x8007, 0 - call_if eq, EventScript_1A682D + call_if_eq EventScript_1A682D release return @@ -135,9 +135,9 @@ EventScript_1A67EE:: @ 81A67EE specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 1 - call_if eq, EventScript_1A6821 + call_if_eq EventScript_1A6821 compare VAR_0x8008, 0 - call_if eq, EventScript_1A6827 + call_if_eq EventScript_1A6827 waitfanfare waitmessage msgbox Text_PutItemAway @@ -162,12 +162,12 @@ EventScript_PickUpHiddenItem:: @ 81A6843 textcolor 3 waitse compare VAR_0x8005, 0 - goto_if eq, EventScript_PickUpHiddenCoins + goto_if_eq EventScript_PickUpHiddenCoins call EventScript_GiveItem compare VAR_0x8007, 1 - goto_if eq, EventScript_ItemInPocketMessage + goto_if_eq EventScript_ItemInPocketMessage compare VAR_0x8007, 0 - goto_if eq, EventScript_BagIsFullMessage + goto_if_eq EventScript_BagIsFullMessage end EventScript_GiveItem:: @@ -180,9 +180,9 @@ EventScript_GiveItem:: EventScript_ItemInPocketMessage:: compare VAR_0x8006, 1 - call_if eq, EventScript_FoundSingleItemMessage + call_if_eq EventScript_FoundSingleItemMessage compare VAR_0x8006, 1 - call_if ne, EventScript_FoundMultipleItemsMessage + call_if_ne EventScript_FoundMultipleItemsMessage waitfanfare waitmessage msgbox Text_PutItemAway @@ -212,12 +212,11 @@ EventScript_BagIsFullMessage:: end EventScript_PickUpHiddenCoins:: - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_HiddenCoinsButNoCoinCase + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_HiddenCoinsButNoCoinCase checkcoins VAR_RESULT specialvar VAR_RESULT, Special_CheckAddCoins compare VAR_RESULT, 0 - goto_if eq, EventScript_HiddenCoinsButTheCoinCaseIsFull + goto_if_eq EventScript_HiddenCoinsButTheCoinCaseIsFull givecoins VAR_0x8006 getstdstring 1, 0x17 call EventScript_1A6764 diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 9666a1fd1..cd5790cd0 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -1,10 +1,9 @@ EventScript_PC:: @ 81A6955 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall - checkflag FLAG_SYS_PC_STORAGE_DISABLED - goto_if TRUE, EventScript_PCDisabled + goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled setvar VAR_0x8004, 27 special Special_SetSomeVariable setvar VAR_0x8004, 0 @@ -47,10 +46,8 @@ EventScript_AccessPlayersPC:: @ 81A69F0 EventScript_AccessPokemonStorage:: @ 81A6A05 playse SE_PC_LOGIN - checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if FALSE, EventScript_1A6A34 - checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if TRUE, EventScript_1A6A3D + call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A6A34 + call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A6A3D msgbox Text_OpenedPkmnStorage special ShowPokemonStorageSystem waitstate @@ -76,8 +73,7 @@ EventScript_1A6A46:: @ 81A6A46 end EventScript_1A6A56:: @ 81A6A56 - checkflag FLAG_SYS_GAME_CLEAR - goto_if FALSE, EventScript_1A6A46 + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A6A46 playse SE_PC_LOGIN setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable @@ -89,13 +85,12 @@ EventScript_1A6A56:: @ 81A6A56 end EventScript_AccessProfOaksPC:: @ 81A6A7A - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_1A6A46 + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1A6A46 playse SE_PC_LOGIN msgbox Text_AccessedProfOaksPC msgbox Text_HavePokedexRated, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if eq, EventScript_ExitOaksPC + goto_if_eq EventScript_ExitOaksPC setflag FLAG_OAKS_RATING_IS_VIA_PC call EventScript_1A73E0 clearflag FLAG_OAKS_RATING_IS_VIA_PC diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index bad257087..7fa2b0d46 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -1,7 +1,7 @@ EventScript_PkmnCenterNurse:: @ 81A6578 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 message Text_WelcomeWantToHealPkmn waitmessage multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1) @@ -33,13 +33,13 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby compare VAR_RESULT, FALSE - goto_if eq, EventScript_PkmnCenterNurse_ReturnPkmn + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn specialvar VAR_RESULT, BufferUnionRoomPlayerName copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - goto_if eq, EventScript_PkmnCenterNurse_ReturnPkmn + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn compare VAR_0x8008, 1 - goto_if eq, EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom + goto_if_eq EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom end EventScript_PkmnCenterNurse_ReturnPkmn:: @ 81A661D @@ -51,8 +51,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 81A661D return EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: @ 81A6636 - checkflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER - goto_if TRUE, EventScript_PkmnCenterNurse_ReturnPkmn + goto_if_set FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER, EventScript_PkmnCenterNurse_ReturnPkmn msgbox Text_RestoredPkmnToFullHealth setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER message Text_PlayerIsPlayingRightNowGoForIt diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index efa2f0b98..3eb741441 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,12 +1,10 @@ EventScript_1A737B:: @ 81A737B special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 - checkflag FLAG_OAK_SAW_DEX_COMPLETION - call_if TRUE, EventScript_1A73A4 - checkflag FLAG_OAK_SAW_DEX_COMPLETION - call_if FALSE, EventScript_1A73AD + call_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_1A73A4 + call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, EventScript_1A73AD call EventScript_1A73E0 return @@ -23,9 +21,9 @@ EventScript_1A73B6:: @ 81A73B6 special Special_GetProfOaksRatingMessage waitmessage compare VAR_RESULT, 0 - call_if eq, EventScript_1A73D8 + call_if_eq EventScript_1A73D8 compare VAR_RESULT, 1 - call_if eq, EventScript_1A73DC + call_if_eq EventScript_1A73DC waitfanfare waitbuttonpress return @@ -50,11 +48,10 @@ EventScript_1A73E0:: @ 81A73E0 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 msgbox Text_1A6CA3 - checkflag FLAG_OAKS_RATING_IS_VIA_PC - call_if FALSE, EventScript_1A746D + call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, EventScript_1A746D call EventScript_1A73B6 compare VAR_0x800A, 0 - goto_if eq, EventScript_1A748F + goto_if_eq EventScript_1A748F setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 @@ -64,9 +61,9 @@ EventScript_1A73E0:: @ 81A73E0 msgbox Text_1A71AA specialvar VAR_RESULT, HasAllMons compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7470 + goto_if_eq EventScript_1A7470 compare VAR_RESULT, 1 - goto_if eq, EventScript_1A747E + goto_if_eq EventScript_1A747E end EventScript_1A746D:: @ 81A746D diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index 77409e539..682fa7b1d 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -31,7 +31,7 @@ EventScript_1A77F9:: @ 81A77F9 EventScript_1A7803:: @ 81A7803 compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 - goto_if ge, EventScript_1A77EC + goto_if_ge EventScript_1A77EC switch VAR_TEMP_1 case 1, EventScript_1A78D5 case 2, EventScript_1A78E4 @@ -45,7 +45,7 @@ EventScript_1A7803:: @ 81A7803 EventScript_1A786C:: @ 81A786C compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 - goto_if ge, EventScript_1A77F9 + goto_if_ge EventScript_1A77F9 switch VAR_TEMP_1 case 1, EventScript_1A78D5 case 2, EventScript_1A78E4 @@ -58,50 +58,42 @@ EventScript_1A786C:: @ 81A786C end EventScript_1A78D5:: @ 81A78D5 - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_1A794D + goto_if_set FLAG_BADGE01_GET, EventScript_1A794D goto EventScript_1A77C9 end EventScript_1A78E4:: @ 81A78E4 - checkflag FLAG_BADGE02_GET - goto_if TRUE, EventScript_1A795F + goto_if_set FLAG_BADGE02_GET, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A78F3:: @ 81A78F3 - checkflag FLAG_BADGE03_GET - goto_if TRUE, EventScript_1A795F + goto_if_set FLAG_BADGE03_GET, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7902:: @ 81A7902 - checkflag FLAG_BADGE04_GET - goto_if TRUE, EventScript_1A795F + goto_if_set FLAG_BADGE04_GET, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7911:: @ 81A7911 - checkflag FLAG_BADGE05_GET - goto_if TRUE, EventScript_1A795F + goto_if_set FLAG_BADGE05_GET, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7920:: @ 81A7920 - checkflag FLAG_BADGE06_GET - goto_if TRUE, EventScript_1A795F + goto_if_set FLAG_BADGE06_GET, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A792F:: @ 81A792F - checkflag FLAG_BADGE07_GET - goto_if TRUE, EventScript_1A795F + goto_if_set FLAG_BADGE07_GET, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A793E:: @ 81A793E - checkflag FLAG_BADGE08_GET - goto_if TRUE, EventScript_1A795F + goto_if_set FLAG_BADGE08_GET, EventScript_1A795F goto EventScript_1A77DE end @@ -137,50 +129,42 @@ EventScript_1A796E:: @ 81A796E end EventScript_1A79D8:: @ 81A79D8 - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_1A7A96 + goto_if_set FLAG_BADGE01_GET, EventScript_1A7A96 goto EventScript_1A7A50 end EventScript_1A79E7:: @ 81A79E7 - checkflag FLAG_BADGE02_GET - goto_if TRUE, EventScript_1A7AA8 + goto_if_set FLAG_BADGE02_GET, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A79F6:: @ 81A79F6 - checkflag FLAG_BADGE03_GET - goto_if TRUE, EventScript_1A7AA8 + goto_if_set FLAG_BADGE03_GET, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A05:: @ 81A7A05 - checkflag FLAG_BADGE04_GET - goto_if TRUE, EventScript_1A7AA8 + goto_if_set FLAG_BADGE04_GET, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A14:: @ 81A7A14 - checkflag FLAG_BADGE05_GET - goto_if TRUE, EventScript_1A7AA8 + goto_if_set FLAG_BADGE05_GET, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A23:: @ 81A7A23 - checkflag FLAG_BADGE06_GET - goto_if TRUE, EventScript_1A7AA8 + goto_if_set FLAG_BADGE06_GET, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A32:: @ 81A7A32 - checkflag FLAG_BADGE07_GET - goto_if TRUE, EventScript_1A7AA8 + goto_if_set FLAG_BADGE07_GET, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A41:: @ 81A7A41 - checkflag FLAG_BADGE08_GET - goto_if TRUE, EventScript_1A7AA8 + goto_if_set FLAG_BADGE08_GET, EventScript_1A7AA8 goto EventScript_1A7A77 end diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index 0fbfe3f93..8aac0bcb4 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -1,8 +1,8 @@ EventScript_1A8EC5:: @ 81A8EC5 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1A911E + goto_if_ge EventScript_1A911E compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if ge, EventScript_1A8F12 + goto_if_ge EventScript_1A8F12 multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE switch VAR_RESULT case 0, EventScript_1A8FF9 @@ -23,9 +23,9 @@ EventScript_1A8F12:: @ 81A8F12 EventScript_1A8F54:: @ 81A8F54 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1A911E + goto_if_ge EventScript_1A911E compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if ge, EventScript_1A8FA1 + goto_if_ge EventScript_1A8FA1 multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE switch VAR_RESULT case 0, EventScript_1A8FEE @@ -66,9 +66,9 @@ EventScript_1A9004:: @ 81A9004 EventScript_1A900F:: @ 81A900F compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1A911E + goto_if_ge EventScript_1A911E compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if ge, EventScript_1A905C + goto_if_ge EventScript_1A905C multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE switch VAR_RESULT case 0, EventScript_1A8FEE @@ -91,9 +91,9 @@ EventScript_1A909E:: @ 81A909E specialvar VAR_RESULT, sub_8147500 getnumberstring 0, VAR_RESULT compare VAR_0x8004, SEAGALLOP_VERMILION_CITY - goto_if eq, EventScript_1A90BE + goto_if_eq EventScript_1A90BE compare VAR_0x8004, SEAGALLOP_VERMILION_CITY - goto_if ne, EventScript_1A90CC + goto_if_ne EventScript_1A90CC end EventScript_1A90BE:: @ 81A90BE @@ -111,7 +111,7 @@ EventScript_1A90DA:: @ 81A90DA delay 20 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 fadescreen 1 special ScrSpecial_SeagallopFerry @@ -121,7 +121,7 @@ EventScript_1A90DA:: @ 81A90DA EventScript_1A90F6:: @ 81A90F6 specialvar VAR_RESULT, sub_8147594 compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9108 + goto_if_eq EventScript_1A9108 release end diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc index 13c59caa7..5abeb2316 100644 --- a/data/scripts/silphco_doors.inc +++ b/data/scripts/silphco_doors.inc @@ -350,8 +350,7 @@ SilphCo_2F_EventScript_Door1:: @ 81A891B lockall setvar VAR_TEMP_1, 1 setvar VAR_0x8004, 634 - checkflag FLAG_SILPH_2F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_2F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -359,8 +358,7 @@ SilphCo_2F_EventScript_Door2:: @ 81A8935 lockall setvar VAR_TEMP_1, 2 setvar VAR_0x8004, 635 - checkflag FLAG_SILPH_2F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_2F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -368,8 +366,7 @@ SilphCo_3F_EventScript_Door1:: @ 81A894F lockall setvar VAR_TEMP_1, 3 setvar VAR_0x8004, 636 - checkflag FLAG_SILPH_3F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_3F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -377,8 +374,7 @@ SilphCo_3F_EventScript_Door2:: @ 81A8969 lockall setvar VAR_TEMP_1, 4 setvar VAR_0x8004, 637 - checkflag FLAG_SILPH_3F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_3F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -386,8 +382,7 @@ SilphCo_4F_EventScript_Door1:: @ 81A8983 lockall setvar VAR_TEMP_1, 5 setvar VAR_0x8004, 638 - checkflag FLAG_SILPH_4F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_4F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -395,8 +390,7 @@ SilphCo_4F_EventScript_Door2:: @ 81A899D lockall setvar VAR_TEMP_1, 6 setvar VAR_0x8004, 639 - checkflag FLAG_SILPH_4F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_4F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -404,8 +398,7 @@ SilphCo_5F_EventScript_Door1:: @ 81A89B7 lockall setvar VAR_TEMP_1, 7 setvar VAR_0x8004, 640 - checkflag FLAG_SILPH_5F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_5F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -413,8 +406,7 @@ SilphCo_5F_EventScript_Door2:: @ 81A89D1 lockall setvar VAR_TEMP_1, 8 setvar VAR_0x8004, 641 - checkflag FLAG_SILPH_5F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_5F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -422,8 +414,7 @@ SilphCo_5F_EventScript_Door3:: @ 81A89EB lockall setvar VAR_TEMP_1, 9 setvar VAR_0x8004, 642 - checkflag FLAG_SILPH_5F_DOOR_3 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_5F_DOOR_3, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -431,8 +422,7 @@ SilphCo_6F_EventScript_Door:: @ 81A8A05 lockall setvar VAR_TEMP_1, 10 setvar VAR_0x8004, 643 - checkflag FLAG_SILPH_6F_DOOR - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_6F_DOOR, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -440,8 +430,7 @@ SilphCo_7F_EventScript_Door1:: @ 81A8A1F lockall setvar VAR_TEMP_1, 11 setvar VAR_0x8004, 644 - checkflag FLAG_SILPH_7F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_7F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -449,8 +438,7 @@ SilphCo_7F_EventScript_Door2:: @ 81A8A39 lockall setvar VAR_TEMP_1, 12 setvar VAR_0x8004, 645 - checkflag FLAG_SILPH_7F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_7F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -458,8 +446,7 @@ SilphCo_7F_EventScript_Door3:: @ 81A8A53 lockall setvar VAR_TEMP_1, 13 setvar VAR_0x8004, 646 - checkflag FLAG_SILPH_7F_DOOR_3 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_7F_DOOR_3, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -467,8 +454,7 @@ SilphCo_8F_EventScript_Door:: @ 81A8A6D lockall setvar VAR_TEMP_1, 14 setvar VAR_0x8004, 647 - checkflag FLAG_SILPH_8F_DOOR - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_8F_DOOR, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -476,8 +462,7 @@ SilphCo_9F_EventScript_Door1:: @ 81A8A87 lockall setvar VAR_TEMP_1, 15 setvar VAR_0x8004, 648 - checkflag FLAG_SILPH_9F_DOOR_1 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_9F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -485,8 +470,7 @@ SilphCo_9F_EventScript_Door2:: @ 81A8AA1 lockall setvar VAR_TEMP_1, 16 setvar VAR_0x8004, 649 - checkflag FLAG_SILPH_9F_DOOR_2 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_9F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -494,8 +478,7 @@ SilphCo_9F_EventScript_Door3:: @ 81A8ABB lockall setvar VAR_TEMP_1, 17 setvar VAR_0x8004, 650 - checkflag FLAG_SILPH_9F_DOOR_3 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_9F_DOOR_3, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -503,8 +486,7 @@ SilphCo_9F_EventScript_Door4:: @ 81A8AD5 lockall setvar VAR_TEMP_1, 18 setvar VAR_0x8004, 651 - checkflag FLAG_SILPH_9F_DOOR_4 - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_9F_DOOR_4, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -512,8 +494,7 @@ SilphCo_10F_EventScript_Door:: @ 81A8AEF lockall setvar VAR_TEMP_1, 19 setvar VAR_0x8004, 652 - checkflag FLAG_SILPH_10F_DOOR - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_10F_DOOR, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -521,14 +502,12 @@ SilphCo_11F_EventScript_Door:: @ 81A8B09 lockall setvar VAR_TEMP_1, 20 setvar VAR_0x8004, 653 - checkflag FLAG_SILPH_11F_DOOR - goto_if TRUE, EventScript_DoorUnlocked + goto_if_set FLAG_SILPH_11F_DOOR, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end EventScript_TryUnlockDoor:: @ 81A8B23 - checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY - goto_if TRUE, EventScript_OpenDoor + goto_if_set FLAG_HIDE_SILPH_CO_5F_CARD_KEY, EventScript_OpenDoor goto EventScript_NeedCardKey end @@ -537,45 +516,45 @@ EventScript_OpenDoor:: @ 81A8B32 msgbox Text_CardKeyOpenedDoor waitfanfare compare VAR_TEMP_1, 1 - call_if eq, EventScript_Open2FDoor1 + call_if_eq EventScript_Open2FDoor1 compare VAR_TEMP_1, 2 - call_if eq, EventScript_Open2FDoor2 + call_if_eq EventScript_Open2FDoor2 compare VAR_TEMP_1, 3 - call_if eq, EventScript_Open3FDoor1 + call_if_eq EventScript_Open3FDoor1 compare VAR_TEMP_1, 4 - call_if eq, EventScript_Open3FDoor2 + call_if_eq EventScript_Open3FDoor2 compare VAR_TEMP_1, 5 - call_if eq, EventScript_Open4FDoor1 + call_if_eq EventScript_Open4FDoor1 compare VAR_TEMP_1, 6 - call_if eq, EventScript_Open4FDoor2 + call_if_eq EventScript_Open4FDoor2 compare VAR_TEMP_1, 7 - call_if eq, EventScript_Open5FDoor1 + call_if_eq EventScript_Open5FDoor1 compare VAR_TEMP_1, 8 - call_if eq, EventScript_Open5FDoor2 + call_if_eq EventScript_Open5FDoor2 compare VAR_TEMP_1, 9 - call_if eq, EventScript_Open5FDoor3 + call_if_eq EventScript_Open5FDoor3 compare VAR_TEMP_1, 10 - call_if eq, EventScript_Open6FDoor + call_if_eq EventScript_Open6FDoor compare VAR_TEMP_1, 11 - call_if eq, EventScript_Open7FDoor1 + call_if_eq EventScript_Open7FDoor1 compare VAR_TEMP_1, 12 - call_if eq, EventScript_Open7FDoor2 + call_if_eq EventScript_Open7FDoor2 compare VAR_TEMP_1, 13 - call_if eq, EventScript_Open7FDoor3 + call_if_eq EventScript_Open7FDoor3 compare VAR_TEMP_1, 14 - call_if eq, EventScript_Open8FDoor + call_if_eq EventScript_Open8FDoor compare VAR_TEMP_1, 15 - call_if eq, EventScript_Open9FDoor1 + call_if_eq EventScript_Open9FDoor1 compare VAR_TEMP_1, 16 - call_if eq, EventScript_Open9FDoor2 + call_if_eq EventScript_Open9FDoor2 compare VAR_TEMP_1, 17 - call_if eq, EventScript_Open9FDoor3 + call_if_eq EventScript_Open9FDoor3 compare VAR_TEMP_1, 18 - call_if eq, EventScript_Open9FDoor4 + call_if_eq EventScript_Open9FDoor4 compare VAR_TEMP_1, 19 - call_if eq, EventScript_Open10FDoor + call_if_eq EventScript_Open10FDoor compare VAR_TEMP_1, 20 - call_if eq, EventScript_Open11FDoor + call_if_eq EventScript_Open11FDoor waitse playse SE_KI_GASYAN special DrawWholeMapView diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc index 7f7bacd3a..4c79f638b 100644 --- a/data/scripts/std_msgbox.inc +++ b/data/scripts/std_msgbox.inc @@ -27,17 +27,17 @@ Std_MsgboxYesNo:: @ 81A4E5C yesnobox 20, 8 return -gStdScript_ItemMessageAndFanfare:: @ 81A4E66 +Std_ReceivedItem:: @ 81A4E66 textcolor 3 compare VAR_0x8002, MUS_FANFA1 - call_if eq, EventScript_1A4EA2 + call_if_eq EventScript_1A4EA2 compare VAR_0x8002, MUS_FAN5 - call_if eq, EventScript_1A4EA6 + call_if_eq EventScript_1A4EA6 message 0x0 waitmessage waitfanfare compare VAR_0x8002, MUS_FANFA1 - call_if eq, EventScript_1A4EAA + call_if_eq EventScript_1A4EAA putitemaway VAR_0x8000, VAR_0x8001 call EventScript_1A6675 return diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index e5955d9cb..782c71a92 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -1,16 +1,16 @@ EventScript_UseSurf:: @ 81A6AC8 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_UseSurfEnd + goto_if_eq EventScript_UseSurfEnd checkpartymove MOVE_SURF compare VAR_RESULT, PARTY_SIZE - goto_if eq, EventScript_UseSurfEnd + goto_if_eq EventScript_UseSurfEnd getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT lockall msgbox Text_1A556E, 5 compare VAR_RESULT, 0 - goto_if eq, EventScript_UseSurfRelease + goto_if_eq EventScript_UseSurfRelease msgbox Text_1A55A5 dofieldeffect FLDEFF_USE_SURF EventScript_UseSurfRelease:@ 81A6B0B diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 874bce358..320776ae7 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -12,7 +12,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 waitmovement 0 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare VAR_RESULT, 0 - goto_if ne, EventScript_1A4EE8 + goto_if_ne EventScript_1A4EE8 special PlayTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_1A4FC7 @@ -26,10 +26,10 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 call EventScript_1A4FBA specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare VAR_RESULT, 0 - goto_if ne, EventScript_1A4F20 + goto_if_ne EventScript_1A4F20 special CheckForAlivePartyMons compare VAR_RESULT, 0 - goto_if ne, EventScript_1A4F19 + goto_if_ne EventScript_1A4F19 special PlayTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_1A4FC7 @@ -50,7 +50,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21 special PlayTrainerEncounterMusic special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A501A + goto_if_eq EventScript_1A501A battlebegin ontrainerbattleend @@ -58,7 +58,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E call EventScript_1A4FBA specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare VAR_RESULT, 0 - goto_if eq, EventScript_1A4F72 + goto_if_eq EventScript_1A4F72 special PlayTrainerEncounterMusic special SetUpTrainerMovement special ScrSpecial_ShowTrainerIntroSpeech @@ -66,7 +66,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E waitbuttonpress special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A4FB8 + goto_if_eq EventScript_1A4FB8 special ScrSpecial_StartTrainerEyeRematch waitstate releaseall @@ -78,10 +78,10 @@ EventScript_1A4F72:: @ 81A4F72 EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare VAR_RESULT, 0 - goto_if eq, EventScript_1A4FB0 + goto_if_eq EventScript_1A4FB0 special CheckForAlivePartyMons compare VAR_RESULT, 0 - goto_if ne, EventScript_1A4FB1 + goto_if_ne EventScript_1A4FB1 special PlayTrainerEncounterMusic special SetUpTrainerMovement special ScrSpecial_ShowTrainerIntroSpeech @@ -89,7 +89,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 waitbuttonpress special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A4FB8 + goto_if_eq EventScript_1A4FB8 special ScrSpecial_StartTrainerEyeRematch waitstate releaseall @@ -124,19 +124,19 @@ EventScript_1A4FC7:: @ 81A4FC7 waitbuttonpress special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A501A + goto_if_eq EventScript_1A501A battlebegin specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode compare VAR_RESULT, 0 - goto_if eq, EventScript_1A5017 + goto_if_eq EventScript_1A5017 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A5019 + goto_if_eq EventScript_1A5019 compare VAR_RESULT, 1 - goto_if eq, EventScript_1A5019 + goto_if_eq EventScript_1A5019 compare VAR_RESULT, 6 - goto_if eq, EventScript_1A5019 + goto_if_eq EventScript_1A5019 compare VAR_RESULT, 8 - goto_if eq, EventScript_1A5019 + goto_if_eq EventScript_1A5019 EventScript_1A5017:: @ 81A5017 releaseall diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index ffec7d4c8..7f7f985a2 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -51,7 +51,7 @@ EventScript_1C4FC5:: @ 81C4FC5 setvar VAR_0x8004, 5 special sub_815D9E8 compare VAR_RESULT, 1 - goto_if eq, EventScript_1C4FFE + goto_if_eq EventScript_1C4FFE setobjectxyperm 2, 10, 12 setobjectmovementtype 2, 9 setobjectxyperm 5, 10, 13 @@ -96,14 +96,14 @@ EventScript_1C5050:: @ 81C5050 setvar VAR_0x8004, 5 special sub_815D9E8 compare VAR_RESULT, 0 - goto_if eq, EventScript_1C5072 + goto_if_eq EventScript_1C5072 setvar VAR_TEMP_E, 1 setvar VAR_TEMP_F, 1 EventScript_1C5072: setvar VAR_0x8004, 18 special sub_815D9E8 compare VAR_RESULT, 1 - goto_if eq, EventScript_1C5086 + goto_if_eq EventScript_1C5086 end EventScript_1C5086:: @ 81C5086 @@ -145,7 +145,7 @@ EventScript_1C510D:: @ 81C510D setvar VAR_0x8005, 2 addvar VAR_TEMP_3, 1 compare VAR_TEMP_3, 1 - goto_if eq, EventScript_1C5146 + goto_if_eq EventScript_1C5146 setvar VAR_TEMP_3, 0 EventScript_1C5146: copyvar VAR_0x8006, VAR_TEMP_3 @@ -378,7 +378,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 setvar VAR_0x8004, 16 special sub_815D9E8 compare VAR_RESULT, 0 - goto_if ne, EventScript_1C5528 + goto_if_ne EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 applymovement 2, Movement_ExclamationMark @@ -398,7 +398,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA setvar VAR_0x8004, 16 special sub_815D9E8 compare VAR_RESULT, 0 - goto_if ne, EventScript_1C5528 + goto_if_ne EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 applymovement 5, Movement_ExclamationMark diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index 64bb44c50..d08364a6a 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -1,3041 +1,3041 @@ Route3_EventScript_1A93C9:: @ 81A93C9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_BEN, 0, Text_183560, Text_1835A0 + trainerbattle_single TRAINER_YOUNGSTER_BEN, Text_183560, Text_1835A0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A93F0 + goto_if_eq EventScript_1A93F0 msgbox Text_1835B4, MSGBOX_AUTOCLOSE end EventScript_1A93F0:: @ 81A93F0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_BEN, 0, Text_1C149D, Text_1835A0 + trainerbattle_rematch TRAINER_YOUNGSTER_BEN, Text_1C149D, Text_1835A0 msgbox Text_1835B4, MSGBOX_AUTOCLOSE end Route3_EventScript_1A9407:: @ 81A9407 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CALVIN, 0, Text_183786, Text_1837BD + trainerbattle_single TRAINER_YOUNGSTER_CALVIN, Text_183786, Text_1837BD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A942E + goto_if_eq EventScript_1A942E msgbox Text_1837CF, MSGBOX_AUTOCLOSE end EventScript_1A942E:: @ 81A942E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_CALVIN, 0, Text_1C1588, Text_1837BD + trainerbattle_rematch TRAINER_YOUNGSTER_CALVIN, Text_1C1588, Text_1837BD msgbox Text_1837CF, MSGBOX_AUTOCLOSE end Route3_EventScript_1A9445:: @ 81A9445 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_COLTON, 0, Text_1834E6, Text_183509 + trainerbattle_single TRAINER_BUG_CATCHER_COLTON, Text_1834E6, Text_183509 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A946C + goto_if_eq EventScript_1A946C msgbox Text_18351C, MSGBOX_AUTOCLOSE end EventScript_1A946C:: @ 81A946C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_COLTON, 0, Text_1C147A, Text_183509 + trainerbattle_rematch TRAINER_BUG_CATCHER_COLTON, Text_1C147A, Text_183509 msgbox Text_18351C, MSGBOX_AUTOCLOSE end Route3_EventScript_1A9483:: @ 81A9483 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GREG, 0, Text_183682, Text_1836B3 + trainerbattle_single TRAINER_BUG_CATCHER_GREG, Text_183682, Text_1836B3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A94AA + goto_if_eq EventScript_1A94AA msgbox Text_1836D9, MSGBOX_AUTOCLOSE end EventScript_1A94AA:: @ 81A94AA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_GREG, 0, Text_1C1521, Text_1836B3 + trainerbattle_rematch TRAINER_BUG_CATCHER_GREG, Text_1C1521, Text_1836B3 msgbox Text_1836D9, MSGBOX_AUTOCLOSE end Route3_EventScript_1A94C1:: @ 81A94C1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JAMES, 0, Text_183807, Text_183837 + trainerbattle_single TRAINER_BUG_CATCHER_JAMES, Text_183807, Text_183837 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A94E8 + goto_if_eq EventScript_1A94E8 msgbox Text_183849, MSGBOX_AUTOCLOSE end EventScript_1A94E8:: @ 81A94E8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_JAMES, 0, Text_1C15C5, Text_183837 + trainerbattle_rematch TRAINER_BUG_CATCHER_JAMES, Text_1C15C5, Text_183837 msgbox Text_183849, MSGBOX_AUTOCLOSE end Route3_EventScript_1A94FF:: @ 81A94FF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JANICE, 0, Text_183616, Text_18363F + trainerbattle_single TRAINER_LASS_JANICE, Text_183616, Text_18363F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9526 + goto_if_eq EventScript_1A9526 msgbox Text_18364C, MSGBOX_AUTOCLOSE end EventScript_1A9526:: @ 81A9526 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_JANICE, 0, Text_1C14F3, Text_18363F + trainerbattle_rematch TRAINER_LASS_JANICE, Text_1C14F3, Text_18363F msgbox Text_18364C, MSGBOX_AUTOCLOSE end Route3_EventScript_1A953D:: @ 81A953D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_SALLY, 0, Text_18371B, Text_183746 + trainerbattle_single TRAINER_LASS_SALLY, Text_18371B, Text_183746 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9564 + goto_if_eq EventScript_1A9564 msgbox Text_18374F, MSGBOX_AUTOCLOSE end EventScript_1A9564:: @ 81A9564 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_SALLY, 0, Text_1C155D, Text_183746 + trainerbattle_rematch TRAINER_LASS_SALLY, Text_1C155D, Text_183746 msgbox Text_18374F, MSGBOX_AUTOCLOSE end Route3_EventScript_1A957B:: @ 81A957B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ROBIN, 0, Text_18387A, Text_183891 + trainerbattle_single TRAINER_LASS_ROBIN, Text_18387A, Text_183891 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A95A2 + goto_if_eq EventScript_1A95A2 msgbox Text_18389C, MSGBOX_AUTOCLOSE end EventScript_1A95A2:: @ 81A95A2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ROBIN, 0, Text_1C15F9, Text_183891 + trainerbattle_rematch TRAINER_LASS_ROBIN, Text_1C15F9, Text_183891 msgbox Text_18389C, MSGBOX_AUTOCLOSE end Route4_EventScript_1A95B9:: @ 81A95B9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_CRISSY, 0, Text_183906, Text_183938 + trainerbattle_single TRAINER_LASS_CRISSY, Text_183906, Text_183938 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A95E0 + goto_if_eq EventScript_1A95E0 msgbox Text_183957, MSGBOX_AUTOCLOSE end EventScript_1A95E0:: @ 81A95E0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_CRISSY, 0, Text_1C160F, Text_183938 + trainerbattle_rematch TRAINER_LASS_CRISSY, Text_1C160F, Text_183938 msgbox Text_183957, MSGBOX_AUTOCLOSE end Route24_EventScript_1A95F7:: @ 81A95F7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_TIMMY, 0, Text_188F76, Text_188F95 + trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Text_188F76, Text_188F95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A961E + goto_if_eq EventScript_1A961E msgbox Text_188FA7, MSGBOX_AUTOCLOSE end EventScript_1A961E:: @ 81A961E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_TIMMY, 0, Text_1C3657, Text_188F95 + trainerbattle_rematch TRAINER_YOUNGSTER_TIMMY, Text_1C3657, Text_188F95 msgbox Text_188FA7, MSGBOX_AUTOCLOSE end Route24_EventScript_1A9635:: @ 81A9635 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CALE, 0, Text_18901B, Text_18908C + trainerbattle_single TRAINER_BUG_CATCHER_CALE, Text_18901B, Text_18908C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A965C + goto_if_eq EventScript_1A965C msgbox Text_18909E, MSGBOX_AUTOCLOSE end EventScript_1A965C:: @ 81A965C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_CALE, 0, Text_1C36DA, Text_18908C + trainerbattle_rematch TRAINER_BUG_CATCHER_CALE, Text_1C36DA, Text_18908C msgbox Text_18909E, MSGBOX_AUTOCLOSE end Route24_EventScript_1A9673:: @ 81A9673 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_RELI, 0, Text_188F2C, Text_188F46 + trainerbattle_single TRAINER_LASS_RELI, Text_188F2C, Text_188F46 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A969A + goto_if_eq EventScript_1A969A msgbox Text_188F53, MSGBOX_AUTOCLOSE end EventScript_1A969A:: @ 81A969A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_RELI, 0, Text_1C3624, Text_188F46 + trainerbattle_rematch TRAINER_LASS_RELI, Text_1C3624, Text_188F46 msgbox Text_188F53, MSGBOX_AUTOCLOSE end Route24_EventScript_1A96B1:: @ 81A96B1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ALI, 0, Text_188FC9, Text_188FE7 + trainerbattle_single TRAINER_LASS_ALI, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A96D8 + goto_if_eq EventScript_1A96D8 msgbox Text_188FF9, MSGBOX_AUTOCLOSE end EventScript_1A96D8:: @ 81A96D8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ALI, 0, Text_1C3685, Text_188FE7 + trainerbattle_rematch TRAINER_LASS_ALI, Text_1C3685, Text_188FE7 msgbox Text_188FF9, MSGBOX_AUTOCLOSE end Route24_EventScript_1A96EF:: @ 81A96EF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_SHANE, 0, Text_188E74, Text_188E94 + trainerbattle_single TRAINER_CAMPER_SHANE, Text_188E74, Text_188E94 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9716 + goto_if_eq EventScript_1A9716 msgbox Text_188EA3, MSGBOX_AUTOCLOSE end EventScript_1A9716:: @ 81A9716 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_SHANE, 0, Text_1C35EE, Text_188E94 + trainerbattle_rematch TRAINER_CAMPER_SHANE, Text_1C35EE, Text_188E94 msgbox Text_188EA3, MSGBOX_AUTOCLOSE end Route24_EventScript_1A972D:: @ 81A972D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_ETHAN, 0, Text_188ED9, Text_188EFA + trainerbattle_single TRAINER_CAMPER_ETHAN, Text_188ED9, Text_188EFA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9754 + goto_if_eq EventScript_1A9754 msgbox Text_188F0A, MSGBOX_AUTOCLOSE end EventScript_1A9754:: @ 81A9754 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_ETHAN, 0, Text_1C360E, Text_188EFA + trainerbattle_rematch TRAINER_CAMPER_ETHAN, Text_1C360E, Text_188EFA msgbox Text_188F0A, MSGBOX_AUTOCLOSE end Route25_EventScript_1A976B:: @ 81A976B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOEY, 0, Text_1890C0, Text_1890E6 + trainerbattle_single TRAINER_YOUNGSTER_JOEY, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9792 + goto_if_eq EventScript_1A9792 msgbox Text_1890F5, MSGBOX_AUTOCLOSE end EventScript_1A9792:: @ 81A9792 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_JOEY, 0, Text_1C33E7, Text_1890E6 + trainerbattle_rematch TRAINER_YOUNGSTER_JOEY, Text_1C33E7, Text_1890E6 msgbox Text_1890F5, MSGBOX_AUTOCLOSE end Route25_EventScript_1A97A9:: @ 81A97A9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAN, 0, Text_189165, Text_1891A6 + trainerbattle_single TRAINER_YOUNGSTER_DAN, Text_189165, Text_1891A6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A97D0 + goto_if_eq EventScript_1A97D0 msgbox Text_1891B3, MSGBOX_AUTOCLOSE end EventScript_1A97D0:: @ 81A97D0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DAN, 0, Text_1C3404, Text_1891A6 + trainerbattle_rematch TRAINER_YOUNGSTER_DAN, Text_1C3404, Text_1891A6 msgbox Text_1891B3, MSGBOX_AUTOCLOSE end Route25_EventScript_1A97E7:: @ 81A97E7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CHAD, 0, Text_1892A9, Text_1892D9 + trainerbattle_single TRAINER_YOUNGSTER_CHAD, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A980E + goto_if_eq EventScript_1A980E msgbox Text_1892EF, MSGBOX_AUTOCLOSE end EventScript_1A980E:: @ 81A980E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_CHAD, 0, Text_1C34D4, Text_1892D9 + trainerbattle_rematch TRAINER_YOUNGSTER_CHAD, Text_1C34D4, Text_1892D9 msgbox Text_1892EF, MSGBOX_AUTOCLOSE end Route25_EventScript_1A9825:: @ 81A9825 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KELSEY, 0, Text_189247, Text_189261 + trainerbattle_single TRAINER_PICNICKER_KELSEY, Text_189247, Text_189261 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A984C + goto_if_eq EventScript_1A984C msgbox Text_189281, MSGBOX_AUTOCLOSE end EventScript_1A984C:: @ 81A984C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_KELSEY, 0, Text_1C349C, Text_189261 + trainerbattle_rematch TRAINER_PICNICKER_KELSEY, Text_1C349C, Text_189261 msgbox Text_189281, MSGBOX_AUTOCLOSE end Route25_EventScript_1A9863:: @ 81A9863 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_HALEY, 0, Text_189333, Text_189364 + trainerbattle_single TRAINER_LASS_HALEY, Text_189333, Text_189364 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A988A + goto_if_eq EventScript_1A988A msgbox Text_189378, MSGBOX_AUTOCLOSE end EventScript_1A988A:: @ 81A988A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_HALEY, 0, Text_1C350A, Text_189364 + trainerbattle_rematch TRAINER_LASS_HALEY, Text_1C350A, Text_189364 msgbox Text_189378, MSGBOX_AUTOCLOSE end Route25_EventScript_1A98A1:: @ 81A98A1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_FRANKLIN, 0, Text_1893A7, Text_1893EA + trainerbattle_single TRAINER_HIKER_FRANKLIN, Text_1893A7, Text_1893EA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A98C8 + goto_if_eq EventScript_1A98C8 msgbox Text_1893FB, MSGBOX_AUTOCLOSE end EventScript_1A98C8:: @ 81A98C8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_FRANKLIN, 0, Text_1C353B, Text_1893EA + trainerbattle_rematch TRAINER_HIKER_FRANKLIN, Text_1C353B, Text_1893EA msgbox Text_1893FB, MSGBOX_AUTOCLOSE end Route25_EventScript_1A98DF:: @ 81A98DF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_NOB, 0, Text_189423, Text_189459 + trainerbattle_single TRAINER_HIKER_NOB, Text_189423, Text_189459 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9906 + goto_if_eq EventScript_1A9906 msgbox Text_18947E, MSGBOX_AUTOCLOSE end EventScript_1A9906:: @ 81A9906 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_NOB, 0, Text_1C357E, Text_189459 + trainerbattle_rematch TRAINER_HIKER_NOB, Text_1C357E, Text_189459 msgbox Text_18947E, MSGBOX_AUTOCLOSE end Route25_EventScript_1A991D:: @ 81A991D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_WAYNE, 0, Text_1894DE, Text_18950A + trainerbattle_single TRAINER_HIKER_WAYNE, Text_1894DE, Text_18950A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9944 + goto_if_eq EventScript_1A9944 msgbox Text_18951C, MSGBOX_AUTOCLOSE end EventScript_1A9944:: @ 81A9944 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_WAYNE, 0, Text_1C35BC, Text_18950A + trainerbattle_rematch TRAINER_HIKER_WAYNE, Text_1C35BC, Text_18950A msgbox Text_18951C, MSGBOX_AUTOCLOSE end Route25_EventScript_1A995B:: @ 81A995B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_FLINT, 0, Text_1891EB, Text_189212 + trainerbattle_single TRAINER_CAMPER_FLINT, Text_1891EB, Text_189212 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9982 + goto_if_eq EventScript_1A9982 msgbox Text_18921D, MSGBOX_AUTOCLOSE end EventScript_1A9982:: @ 81A9982 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_FLINT, 0, Text_1C3445, Text_189212 + trainerbattle_rematch TRAINER_CAMPER_FLINT, Text_1C3445, Text_189212 msgbox Text_18921D, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9999:: @ 81A9999 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KEIGO, 0, Text_183E9F, Text_183EC0 + trainerbattle_single TRAINER_BUG_CATCHER_KEIGO, Text_183E9F, Text_183EC0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A99C0 + goto_if_eq EventScript_1A99C0 msgbox Text_183ED4, MSGBOX_AUTOCLOSE end EventScript_1A99C0:: @ 81A99C0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_KEIGO, 0, Text_1C16E2, Text_183EC0 + trainerbattle_rematch TRAINER_BUG_CATCHER_KEIGO, Text_1C16E2, Text_183EC0 msgbox Text_183ED4, MSGBOX_AUTOCLOSE end Route6_EventScript_1A99D7:: @ 81A99D7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_183FF0, Text_18401A + trainerbattle_single TRAINER_BUG_CATCHER_ELIJAH, Text_183FF0, Text_18401A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A99FE + goto_if_eq EventScript_1A99FE msgbox Text_18402B, MSGBOX_AUTOCLOSE end EventScript_1A99FE:: @ 81A99FE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_1C176B, Text_18401A + trainerbattle_rematch TRAINER_BUG_CATCHER_ELIJAH, Text_1C176B, Text_18401A msgbox Text_18402B, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9A15:: @ 81A9A15 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RICKY, 0, Text_183E04, Text_183E2A + trainerbattle_single TRAINER_CAMPER_RICKY, Text_183E04, Text_183E2A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9A3C + goto_if_eq EventScript_1A9A3C msgbox Text_183E3C, MSGBOX_AUTOCLOSE end EventScript_1A9A3C:: @ 81A9A3C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_RICKY, 0, Text_1C163C, Text_183E2A + trainerbattle_rematch TRAINER_CAMPER_RICKY, Text_1C163C, Text_183E2A msgbox Text_183E3C, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9A53:: @ 81A9A53 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JEFF, 0, Text_183F07, Text_183F24 + trainerbattle_single TRAINER_CAMPER_JEFF, Text_183F07, Text_183F24 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9A7A + goto_if_eq EventScript_1A9A7A msgbox Text_183F51, MSGBOX_AUTOCLOSE end EventScript_1A9A7A:: @ 81A9A7A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_JEFF, 0, Text_1C1723, Text_183F24 + trainerbattle_rematch TRAINER_CAMPER_JEFF, Text_1C1723, Text_183F24 msgbox Text_183F51, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9A91:: @ 81A9A91 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_NANCY, 0, Text_183E4E, Text_183E79 + trainerbattle_single TRAINER_PICNICKER_NANCY, Text_183E4E, Text_183E79 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9AB8 + goto_if_eq EventScript_1A9AB8 msgbox Text_183E8D, MSGBOX_AUTOCLOSE end EventScript_1A9AB8:: @ 81A9AB8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_NANCY, 0, Text_1C166D, Text_183E79 + trainerbattle_rematch TRAINER_PICNICKER_NANCY, Text_1C166D, Text_183E79 msgbox Text_183E8D, MSGBOX_AUTOCLOSE end Route6_EventScript_1A9ACF:: @ 81A9ACF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ISABELLE, 0, Text_183F90, Text_183FAB + trainerbattle_single TRAINER_PICNICKER_ISABELLE, Text_183F90, Text_183FAB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9AF6 + goto_if_eq EventScript_1A9AF6 msgbox Text_183FC4, MSGBOX_AUTOCLOSE end EventScript_1A9AF6:: @ 81A9AF6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ISABELLE, 0, Text_1C1746, Text_183FAB + trainerbattle_rematch TRAINER_PICNICKER_ISABELLE, Text_1C1746, Text_183FAB msgbox Text_183FC4, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9B0D:: @ 81A9B0D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_EDDIE, 0, Text_184FBD, Text_184FD8 + trainerbattle_single TRAINER_YOUNGSTER_EDDIE, Text_184FBD, Text_184FD8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9B34 + goto_if_eq EventScript_1A9B34 msgbox Text_184FEF, MSGBOX_AUTOCLOSE end EventScript_1A9B34:: @ 81A9B34 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_EDDIE, 0, Text_1C1DB5, Text_184FD8 + trainerbattle_rematch TRAINER_YOUNGSTER_EDDIE, Text_1C1DB5, Text_184FD8 msgbox Text_184FEF, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9B4B:: @ 81A9B4B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DILLON, 0, Text_18506A, Text_18509B + trainerbattle_single TRAINER_YOUNGSTER_DILLON, Text_18506A, Text_18509B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9B72 + goto_if_eq EventScript_1A9B72 msgbox Text_1850CF, MSGBOX_AUTOCLOSE end EventScript_1A9B72:: @ 81A9B72 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DILLON, 0, Text_1C1E1F, Text_18509B + trainerbattle_rematch TRAINER_YOUNGSTER_DILLON, Text_1C1E1F, Text_18509B msgbox Text_1850CF, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9B89:: @ 81A9B89 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_YASU, 0, Text_18517B, Text_1851AC + trainerbattle_single TRAINER_YOUNGSTER_YASU, Text_18517B, Text_1851AC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9BB0 + goto_if_eq EventScript_1A9BB0 msgbox Text_1851D2, MSGBOX_AUTOCLOSE end EventScript_1A9BB0:: @ 81A9BB0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_YASU, 0, Text_1C1EE2, Text_1851AC + trainerbattle_rematch TRAINER_YOUNGSTER_YASU, Text_1C1EE2, Text_1851AC msgbox Text_1851D2, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9BC7:: @ 81A9BC7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAVE, 0, Text_185285, Text_1852C1 + trainerbattle_single TRAINER_YOUNGSTER_DAVE, Text_185285, Text_1852C1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9BEE + goto_if_eq EventScript_1A9BEE msgbox Text_1852E3, MSGBOX_AUTOCLOSE end EventScript_1A9BEE:: @ 81A9BEE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DAVE, 0, Text_1C1F40, Text_1852C1 + trainerbattle_rematch TRAINER_YOUNGSTER_DAVE, Text_1C1F40, Text_1852C1 msgbox Text_1852E3, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9C05:: @ 81A9C05 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BRAXTON, 0, Text_185011, Text_185037 + trainerbattle_single TRAINER_ENGINEER_BRAXTON, Text_185011, Text_185037 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9C2C + goto_if_eq EventScript_1A9C2C msgbox Text_18504A, MSGBOX_AUTOCLOSE end EventScript_1A9C2C:: @ 81A9C2C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ENGINEER_BRAXTON, 0, Text_1C1DE1, Text_185037 + trainerbattle_rematch TRAINER_ENGINEER_BRAXTON, Text_1C1DE1, Text_185037 msgbox Text_18504A, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9C43:: @ 81A9C43 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BERNIE, 0, Text_185236, Text_185250 + trainerbattle_single TRAINER_ENGINEER_BERNIE, Text_185236, Text_185250 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9C6A + goto_if_eq EventScript_1A9C6A msgbox Text_185266, MSGBOX_AUTOCLOSE end EventScript_1A9C6A:: @ 81A9C6A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ENGINEER_BERNIE, 0, Text_1C1F1D, Text_185250 + trainerbattle_rematch TRAINER_ENGINEER_BERNIE, Text_1C1F1D, Text_185250 msgbox Text_185266, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9C81:: @ 81A9C81 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_HUGO, 0, Text_184F01, Text_184F15 + trainerbattle_single TRAINER_GAMER_HUGO, Text_184F01, Text_184F15 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9CA8 + goto_if_eq EventScript_1A9CA8 msgbox Text_184F2E, MSGBOX_AUTOCLOSE end EventScript_1A9CA8:: @ 81A9CA8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_HUGO, 0, Text_1C1D50, Text_184F15 + trainerbattle_rematch TRAINER_GAMER_HUGO, Text_1C1D50, Text_184F15 msgbox Text_184F2E, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9CBF:: @ 81A9CBF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_JASPER, 0, Text_184F5D, Text_184F7E + trainerbattle_single TRAINER_GAMER_JASPER, Text_184F5D, Text_184F7E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9CE6 + goto_if_eq EventScript_1A9CE6 msgbox Text_184F8E, MSGBOX_AUTOCLOSE end EventScript_1A9CE6:: @ 81A9CE6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_JASPER, 0, Text_1C1D79, Text_184F7E + trainerbattle_rematch TRAINER_GAMER_JASPER, Text_1C1D79, Text_184F7E msgbox Text_184F8E, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9CFD:: @ 81A9CFD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DIRK, 0, Text_1850E9, Text_185105 + trainerbattle_single TRAINER_GAMER_DIRK, Text_1850E9, Text_185105 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9D24 + goto_if_eq EventScript_1A9D24 msgbox Text_185114, MSGBOX_AUTOCLOSE end EventScript_1A9D24:: @ 81A9D24 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_DIRK, 0, Text_1C1E57, Text_185105 + trainerbattle_rematch TRAINER_GAMER_DIRK, Text_1C1E57, Text_185105 msgbox Text_185114, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9D3B:: @ 81A9D3B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DARIAN, 0, Text_185135, Text_18514E + trainerbattle_single TRAINER_GAMER_DARIAN, Text_185135, Text_18514E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9D62 + goto_if_eq EventScript_1A9D62 msgbox Text_185161, MSGBOX_AUTOCLOSE end EventScript_1A9D62:: @ 81A9D62 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_DARIAN, 0, Text_1C1E9F, Text_18514E + trainerbattle_rematch TRAINER_GAMER_DARIAN, Text_1C1E9F, Text_18514E msgbox Text_185161, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9D79:: @ 81A9D79 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_BRENT, 0, Text_184A2F, Text_184A6A + trainerbattle_single TRAINER_BUG_CATCHER_BRENT, Text_184A2F, Text_184A6A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9DA0 + goto_if_eq EventScript_1A9DA0 msgbox Text_184A8C, MSGBOX_AUTOCLOSE end EventScript_1A9DA0:: @ 81A9DA0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_BRENT, 0, Text_1C1B83, Text_184A6A + trainerbattle_rematch TRAINER_BUG_CATCHER_BRENT, Text_1C1B83, Text_184A6A msgbox Text_184A8C, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9DB7:: @ 81A9DB7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CONNER, 0, Text_184B18, Text_184B32 + trainerbattle_single TRAINER_BUG_CATCHER_CONNER, Text_184B18, Text_184B32 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9DDE + goto_if_eq EventScript_1A9DDE msgbox Text_184B3B, MSGBOX_AUTOCLOSE end EventScript_1A9DDE:: @ 81A9DDE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BUG_CATCHER_CONNER, 0, Text_1C1BDC, Text_184B32 + trainerbattle_rematch TRAINER_BUG_CATCHER_CONNER, Text_1C1BDC, Text_184B32 msgbox Text_184B3B, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9DF5:: @ 81A9DF5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_CHRIS, 0, Text_184844, Text_18487E + trainerbattle_single TRAINER_CAMPER_CHRIS, Text_184844, Text_18487E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9E1C + goto_if_eq EventScript_1A9E1C msgbox Text_184890, MSGBOX_AUTOCLOSE end EventScript_1A9E1C:: @ 81A9E1C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_CHRIS, 0, Text_1C1A5D, Text_18487E + trainerbattle_rematch TRAINER_CAMPER_CHRIS, Text_1C1A5D, Text_18487E msgbox Text_184890, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9E33:: @ 81A9E33 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_DREW, 0, Text_18489E, Text_1848CC + trainerbattle_single TRAINER_CAMPER_DREW, Text_18489E, Text_1848CC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9E5A + goto_if_eq EventScript_1A9E5A msgbox Text_1848DE, MSGBOX_AUTOCLOSE end EventScript_1A9E5A:: @ 81A9E5A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_DREW, 0, Text_1C1A9B, Text_1848CC + trainerbattle_rematch TRAINER_CAMPER_DREW, Text_1C1A9B, Text_1848CC msgbox Text_1848DE, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9E71:: @ 81A9E71 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALICIA, 0, Text_1847B7, Text_1847DF + trainerbattle_single TRAINER_PICNICKER_ALICIA, Text_1847B7, Text_1847DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9E98 + goto_if_eq EventScript_1A9E98 msgbox Text_1847F0, MSGBOX_AUTOCLOSE end EventScript_1A9E98:: @ 81A9E98 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ALICIA, 0, Text_1C1A2E, Text_1847DF + trainerbattle_rematch TRAINER_PICNICKER_ALICIA, Text_1C1A2E, Text_1847DF msgbox Text_1847F0, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9EAF:: @ 81A9EAF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAITLIN, 0, Text_1848FF, Text_18491C + trainerbattle_single TRAINER_PICNICKER_CAITLIN, Text_1848FF, Text_18491C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9ED6 + goto_if_eq EventScript_1A9ED6 msgbox Text_184931, MSGBOX_AUTOCLOSE end EventScript_1A9ED6:: @ 81A9ED6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CAITLIN, 0, Text_1C1AFB, Text_18491C + trainerbattle_rematch TRAINER_PICNICKER_CAITLIN, Text_1C1AFB, Text_18491C msgbox Text_184931, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9EED:: @ 81A9EED - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALAN, 0, Text_184ABE, Text_184AD5 + trainerbattle_single TRAINER_HIKER_ALAN, Text_184ABE, Text_184AD5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9F14 + goto_if_eq EventScript_1A9F14 msgbox Text_184AF1, MSGBOX_AUTOCLOSE end EventScript_1A9F14:: @ 81A9F14 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_ALAN, 0, Text_1C1BBE, Text_184AD5 + trainerbattle_rematch TRAINER_HIKER_ALAN, Text_1C1BBE, Text_184AD5 msgbox Text_184AF1, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9F2B:: @ 81A9F2B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_BRICE, 0, Text_1849DF, Text_184A04 + trainerbattle_single TRAINER_HIKER_BRICE, Text_1849DF, Text_184A04 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9F52 + goto_if_eq EventScript_1A9F52 msgbox Text_184A11, MSGBOX_AUTOCLOSE end EventScript_1A9F52:: @ 81A9F52 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_BRICE, 0, Text_1C1B5E, Text_184A04 + trainerbattle_rematch TRAINER_HIKER_BRICE, Text_1C1B5E, Text_184A04 msgbox Text_184A11, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9F69:: @ 81A9F69 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_JEREMY, 0, Text_18495E, Text_18497F + trainerbattle_single TRAINER_HIKER_JEREMY, Text_18495E, Text_18497F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9F90 + goto_if_eq EventScript_1A9F90 msgbox Text_1849B0, MSGBOX_AUTOCLOSE end EventScript_1A9F90:: @ 81A9F90 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_JEREMY, 0, Text_1C1B37, Text_18497F + trainerbattle_rematch TRAINER_HIKER_JEREMY, Text_1C1B37, Text_18497F msgbox Text_1849B0, MSGBOX_AUTOCLOSE end Route10_EventScript_1A9FA7:: @ 81A9FA7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_HEIDI, 0, Text_184CF1, Text_184D31 + trainerbattle_single TRAINER_PICNICKER_HEIDI, Text_184CF1, Text_184D31 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1A9FCE + goto_if_eq EventScript_1A9FCE msgbox Text_184D4D, MSGBOX_AUTOCLOSE end EventScript_1A9FCE:: @ 81A9FCE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_HEIDI, 0, Text_1C1C9A, Text_184D31 + trainerbattle_rematch TRAINER_PICNICKER_HEIDI, Text_1C1C9A, Text_184D31 msgbox Text_184D4D, MSGBOX_AUTOCLOSE end Route10_EventScript_1A9FE5:: @ 81A9FE5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAROL, 0, Text_184E04, Text_184E3B + trainerbattle_single TRAINER_PICNICKER_CAROL, Text_184E04, Text_184E3B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA00C + goto_if_eq EventScript_1AA00C msgbox Text_184E5E, MSGBOX_AUTOCLOSE end EventScript_1AA00C:: @ 81AA00C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CAROL, 0, Text_1C1D14, Text_184E3B + trainerbattle_rematch TRAINER_PICNICKER_CAROL, Text_1C1D14, Text_184E3B msgbox Text_184E5E, MSGBOX_AUTOCLOSE end Route10_EventScript_1AA023:: @ 81AA023 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_MARK, 0, Text_184B8A, Text_184BE5 + trainerbattle_single TRAINER_POKEMANIAC_MARK, Text_184B8A, Text_184BE5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA04A + goto_if_eq EventScript_1AA04A msgbox Text_184BFB, MSGBOX_AUTOCLOSE end EventScript_1AA04A:: @ 81AA04A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_MARK, 0, Text_1C1BFA, Text_184BE5 + trainerbattle_rematch TRAINER_POKEMANIAC_MARK, Text_1C1BFA, Text_184BE5 msgbox Text_184BFB, MSGBOX_AUTOCLOSE end Route10_EventScript_1AA061:: @ 81AA061 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HERMAN, 0, Text_184C86, Text_184CA7 + trainerbattle_single TRAINER_POKEMANIAC_HERMAN, Text_184C86, Text_184CA7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA088 + goto_if_eq EventScript_1AA088 msgbox Text_184CBB, MSGBOX_AUTOCLOSE end EventScript_1AA088:: @ 81AA088 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_HERMAN, 0, Text_1C1C76, Text_184CA7 + trainerbattle_rematch TRAINER_POKEMANIAC_HERMAN, Text_1C1C76, Text_184CA7 msgbox Text_184CBB, MSGBOX_AUTOCLOSE end Route10_EventScript_1AA09F:: @ 81AA09F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_CLARK, 0, Text_184C1D, Text_184C2D + trainerbattle_single TRAINER_HIKER_CLARK, Text_184C1D, Text_184C2D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA0C6 + goto_if_eq EventScript_1AA0C6 msgbox Text_184C60, MSGBOX_AUTOCLOSE end EventScript_1AA0C6:: @ 81AA0C6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_CLARK, 0, Text_1C1C4F, Text_184C2D + trainerbattle_rematch TRAINER_HIKER_CLARK, Text_1C1C4F, Text_184C2D msgbox Text_184C60, MSGBOX_AUTOCLOSE end Route10_EventScript_1AA0DD:: @ 81AA0DD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_TRENT, 0, Text_184DAA, Text_184DCE + trainerbattle_single TRAINER_HIKER_TRENT, Text_184DAA, Text_184DCE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA104 + goto_if_eq EventScript_1AA104 msgbox Text_184DE4, MSGBOX_AUTOCLOSE end EventScript_1AA104:: @ 81AA104 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_TRENT, 0, Text_1C1CD3, Text_184DCE + trainerbattle_rematch TRAINER_HIKER_TRENT, Text_1C1CD3, Text_184DCE msgbox Text_184DE4, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA11B:: @ 81AA11B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_PAIGE, 0, Text_1841ED, Text_184210 + trainerbattle_single TRAINER_LASS_PAIGE, Text_1841ED, Text_184210 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA142 + goto_if_eq EventScript_1AA142 msgbox Text_18421B, MSGBOX_AUTOCLOSE end EventScript_1AA142:: @ 81AA142 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_PAIGE, 0, Text_1C1834, Text_184210 + trainerbattle_rematch TRAINER_LASS_PAIGE, Text_1C1834, Text_184210 msgbox Text_18421B, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA159:: @ 81AA159 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ANDREA, 0, Text_184321, Text_184346 + trainerbattle_single TRAINER_LASS_ANDREA, Text_184321, Text_184346 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA180 + goto_if_eq EventScript_1AA180 msgbox Text_184350, MSGBOX_AUTOCLOSE end EventScript_1AA180:: @ 81AA180 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_ANDREA, 0, Text_1C18AA, Text_184346 + trainerbattle_rematch TRAINER_LASS_ANDREA, Text_1C18AA, Text_184346 msgbox Text_184350, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA197:: @ 81AA197 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MEGAN, 0, Text_18437A, Text_1843A6 + trainerbattle_single TRAINER_LASS_MEGAN, Text_18437A, Text_1843A6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA1BE + goto_if_eq EventScript_1AA1BE msgbox Text_1843D2, MSGBOX_AUTOCLOSE end EventScript_1AA1BE:: @ 81AA1BE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_MEGAN, 0, Text_1C18DC, Text_1843A6 + trainerbattle_rematch TRAINER_LASS_MEGAN, Text_1C18DC, Text_1843A6 msgbox Text_1843D2, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA1D5:: @ 81AA1D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JULIA, 0, Text_1844AC, Text_1844D6 + trainerbattle_single TRAINER_LASS_JULIA, Text_1844AC, Text_1844D6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA1FC + goto_if_eq EventScript_1AA1FC msgbox Text_1844FD, MSGBOX_AUTOCLOSE end EventScript_1AA1FC:: @ 81AA1FC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LASS_JULIA, 0, Text_1C1955, Text_1844D6 + trainerbattle_rematch TRAINER_LASS_JULIA, Text_1C1955, Text_1844D6 msgbox Text_1844FD, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA213:: @ 81AA213 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_AIDAN, 0, Text_1840C5, Text_184100 + trainerbattle_single TRAINER_SUPER_NERD_AIDAN, Text_1840C5, Text_184100 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA23A + goto_if_eq EventScript_1AA23A msgbox Text_18410E, MSGBOX_AUTOCLOSE end EventScript_1AA23A:: @ 81AA23A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_AIDAN, 0, Text_1C1793, Text_184100 + trainerbattle_rematch TRAINER_SUPER_NERD_AIDAN, Text_1C1793, Text_184100 msgbox Text_18410E, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA251:: @ 81AA251 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_GLENN, 0, Text_18417C, Text_1841B6 + trainerbattle_single TRAINER_SUPER_NERD_GLENN, Text_18417C, Text_1841B6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA278 + goto_if_eq EventScript_1AA278 msgbox Text_1841C8, MSGBOX_AUTOCLOSE end EventScript_1AA278:: @ 81AA278 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_GLENN, 0, Text_1C17F1, Text_1841B6 + trainerbattle_rematch TRAINER_SUPER_NERD_GLENN, Text_1C17F1, Text_1841B6 msgbox Text_1841C8, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA28F:: @ 81AA28F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_LESLIE, 0, Text_184257, Text_18427A + trainerbattle_single TRAINER_SUPER_NERD_LESLIE, Text_184257, Text_18427A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA2B6 + goto_if_eq EventScript_1AA2B6 msgbox Text_1842B3, MSGBOX_AUTOCLOSE end EventScript_1AA2B6:: @ 81AA2B6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SUPER_NERD_LESLIE, 0, Text_1C1873, Text_18427A + trainerbattle_rematch TRAINER_SUPER_NERD_LESLIE, Text_1C1873, Text_18427A msgbox Text_1842B3, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA2CD:: @ 81AA2CD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_STAN, 0, Text_18412F, Text_18414D + trainerbattle_single TRAINER_GAMER_STAN, Text_18412F, Text_18414D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA2F4 + goto_if_eq EventScript_1AA2F4 msgbox Text_184162, MSGBOX_AUTOCLOSE end EventScript_1AA2F4:: @ 81AA2F4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_STAN, 0, Text_1C17CD, Text_18414D + trainerbattle_rematch TRAINER_GAMER_STAN, Text_1C17CD, Text_18414D msgbox Text_184162, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA30B:: @ 81AA30B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_RICH, 0, Text_184432, Text_18444F + trainerbattle_single TRAINER_GAMER_RICH, Text_184432, Text_18444F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA332 + goto_if_eq EventScript_1AA332 msgbox Text_184466, MSGBOX_AUTOCLOSE end EventScript_1AA332:: @ 81AA332 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GAMER_RICH, 0, Text_1C191F, Text_18444F + trainerbattle_rematch TRAINER_GAMER_RICH, Text_1C191F, Text_18444F msgbox Text_184466, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA349:: @ 81AA349 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1845A4, Text_1845D0, Text_184616 + trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_1845A4, Text_1845D0, Text_184616 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA374 + goto_if_eq EventScript_1AA374 msgbox Text_1845F2, MSGBOX_AUTOCLOSE end EventScript_1AA374:: @ 81AA374 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1C19E5, Text_1845D0, Text_184616 + trainerbattle_rematch_double TRAINER_TWINS_ELI_ANNE, Text_1C19E5, Text_1845D0, Text_184616 msgbox Text_1845F2, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA38F:: @ 81AA38F - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_18464A, Text_184675, Text_1846AF + trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_18464A, Text_184675, Text_1846AF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA3BA + goto_if_eq EventScript_1AA3BA msgbox Text_18468B, MSGBOX_AUTOCLOSE end EventScript_1AA3BA:: @ 81AA3BA - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1C1A0D, Text_184675, Text_1846AF + trainerbattle_rematch_double TRAINER_TWINS_ELI_ANNE, Text_1C1A0D, Text_184675, Text_1846AF msgbox Text_18468B, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA3D5:: @ 81AA3D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RICARDO, 0, Text_1846E2, Text_1846FC + trainerbattle_single TRAINER_BIKER_RICARDO, Text_1846E2, Text_1846FC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA3FC + goto_if_eq EventScript_1AA3FC msgbox Text_184719, MSGBOX_AUTOCLOSE end EventScript_1AA3FC:: @ 81AA3FC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_RICARDO, 0, Text_1C199C, Text_1846FC + trainerbattle_rematch TRAINER_BIKER_RICARDO, Text_1C199C, Text_1846FC msgbox Text_184719, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA413:: @ 81AA413 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAREN, 0, Text_184742, Text_184767 + trainerbattle_single TRAINER_BIKER_JAREN, Text_184742, Text_184767 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA43A + goto_if_eq EventScript_1AA43A msgbox Text_18477A, MSGBOX_AUTOCLOSE end EventScript_1AA43A:: @ 81AA43A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JAREN, 0, Text_1C19BC, Text_184767 + trainerbattle_rematch TRAINER_BIKER_JAREN, Text_1C19BC, Text_184767 msgbox Text_18477A, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA451:: @ 81AA451 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NED, 0, Text_185402, Text_18541B + trainerbattle_single TRAINER_FISHERMAN_NED, Text_185402, Text_18541B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA478 + goto_if_eq EventScript_1AA478 msgbox Text_185432, MSGBOX_AUTOCLOSE end EventScript_1AA478:: @ 81AA478 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_NED, 0, Text_1C1F9D, Text_18541B + trainerbattle_rematch TRAINER_FISHERMAN_NED, Text_1C1F9D, Text_18541B msgbox Text_185432, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA48F:: @ 81AA48F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CHIP, 0, Text_18544E, Text_185475 + trainerbattle_single TRAINER_FISHERMAN_CHIP, Text_18544E, Text_185475 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA4B6 + goto_if_eq EventScript_1AA4B6 msgbox Text_185488, MSGBOX_AUTOCLOSE end EventScript_1AA4B6:: @ 81AA4B6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_CHIP, 0, Text_1C1FD8, Text_185475 + trainerbattle_rematch TRAINER_FISHERMAN_CHIP, Text_1C1FD8, Text_185475 msgbox Text_185488, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA4CD:: @ 81AA4CD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_HANK, 0, Text_1855E1, Text_185606 + trainerbattle_single TRAINER_FISHERMAN_HANK, Text_1855E1, Text_185606 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA4F4 + goto_if_eq EventScript_1AA4F4 msgbox Text_185616, MSGBOX_AUTOCLOSE end EventScript_1AA4F4:: @ 81AA4F4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_HANK, 0, Text_1C209C, Text_185606 + trainerbattle_rematch TRAINER_FISHERMAN_HANK, Text_1C209C, Text_185606 msgbox Text_185616, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA50B:: @ 81AA50B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ELLIOT, 0, Text_185682, Text_1856D0 + trainerbattle_single TRAINER_FISHERMAN_ELLIOT, Text_185682, Text_1856D0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA532 + goto_if_eq EventScript_1AA532 msgbox Text_1856DF, MSGBOX_AUTOCLOSE end EventScript_1AA532:: @ 81AA532 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_ELLIOT, 0, Text_1C20D4, Text_1856D0 + trainerbattle_rematch TRAINER_FISHERMAN_ELLIOT, Text_1C20D4, Text_1856D0 msgbox Text_1856DF, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA549:: @ 81AA549 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ANDREW, 0, Text_18570E, Text_185744 + trainerbattle_single TRAINER_FISHERMAN_ANDREW, Text_18570E, Text_185744 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA570 + goto_if_eq EventScript_1AA570 msgbox Text_18574D, MSGBOX_AUTOCLOSE end EventScript_1AA570:: @ 81AA570 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_ANDREW, 0, Text_1C2134, Text_185744 + trainerbattle_rematch TRAINER_FISHERMAN_ANDREW, Text_1C2134, Text_185744 msgbox Text_18574D, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA587:: @ 81AA587 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ROCKER_LUCA, 0, Text_185547, Text_18559B + trainerbattle_single TRAINER_ROCKER_LUCA, Text_185547, Text_18559B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA5AE + goto_if_eq EventScript_1AA5AE msgbox Text_1855A6, MSGBOX_AUTOCLOSE end EventScript_1AA5AE:: @ 81AA5AE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_ROCKER_LUCA, 0, Text_1C203B, Text_18559B + trainerbattle_rematch TRAINER_ROCKER_LUCA, Text_1C203B, Text_18559B msgbox Text_1855A6, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA5C5:: @ 81AA5C5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JUSTIN, 0, Text_1854B9, Text_1854ED + trainerbattle_single TRAINER_CAMPER_JUSTIN, Text_1854B9, Text_1854ED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA5EC + goto_if_eq EventScript_1AA5EC msgbox Text_1854F2, MSGBOX_AUTOCLOSE end EventScript_1AA5EC:: @ 81AA5EC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_JUSTIN, 0, Text_1C2008, Text_1854ED + trainerbattle_rematch TRAINER_CAMPER_JUSTIN, Text_1C2008, Text_1854ED msgbox Text_1854F2, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA603:: @ 81AA603 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1857C5, Text_1857F1, Text_185842 + trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1857C5, Text_1857F1, Text_185842 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA62E + goto_if_eq EventScript_1AA62E msgbox Text_18581F, MSGBOX_AUTOCLOSE end EventScript_1AA62E:: @ 81AA62E - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C216B, Text_1857F1, Text_185842 + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1C216B, Text_1857F1, Text_185842 msgbox Text_18581F, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA649:: @ 81AA649 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1858A6, Text_1858D0, Text_185908 + trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1858A6, Text_1858D0, Text_185908 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA674 + goto_if_eq EventScript_1AA674 msgbox Text_1858E2, MSGBOX_AUTOCLOSE end EventScript_1AA674:: @ 81AA674 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C219B, Text_1858D0, Text_185908 + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1C219B, Text_1858D0, Text_185908 msgbox Text_1858E2, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA68F:: @ 81AA68F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JARED, 0, Text_185D05, Text_185D1D + trainerbattle_single TRAINER_BIKER_JARED, Text_185D05, Text_185D1D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA6B6 + goto_if_eq EventScript_1AA6B6 msgbox Text_185D33, MSGBOX_AUTOCLOSE end EventScript_1AA6B6:: @ 81AA6B6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JARED, 0, Text_1C236B, Text_185D1D + trainerbattle_rematch TRAINER_BIKER_JARED, Text_1C236B, Text_185D1D msgbox Text_185D33, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA6CD:: @ 81AA6CD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LOLA, 0, Text_185BFC, Text_185C1F + trainerbattle_single TRAINER_BEAUTY_LOLA, Text_185BFC, Text_185C1F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA6F4 + goto_if_eq EventScript_1AA6F4 msgbox Text_185C35, MSGBOX_AUTOCLOSE end EventScript_1AA6F4:: @ 81AA6F4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_LOLA, 0, Text_1C2306, Text_185C1F + trainerbattle_rematch TRAINER_BEAUTY_LOLA, Text_1C2306, Text_185C1F msgbox Text_185C35, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA70B:: @ 81AA70B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_SHEILA, 0, Text_185C69, Text_185C95 + trainerbattle_single TRAINER_BEAUTY_SHEILA, Text_185C69, Text_185C95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA732 + goto_if_eq EventScript_1AA732 msgbox Text_185CA8, MSGBOX_AUTOCLOSE end EventScript_1AA732:: @ 81AA732 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_SHEILA, 0, Text_1C2340, Text_185C95 + trainerbattle_rematch TRAINER_BEAUTY_SHEILA, Text_1C2340, Text_185C95 msgbox Text_185CA8, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA749:: @ 81AA749 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_185955, Text_18597E + trainerbattle_single TRAINER_BIRD_KEEPER_SEBASTIAN, Text_185955, Text_18597E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA770 + goto_if_eq EventScript_1AA770 msgbox Text_1859A2, MSGBOX_AUTOCLOSE end EventScript_1AA770:: @ 81AA770 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_1C21EE, Text_18597E + trainerbattle_rematch TRAINER_BIRD_KEEPER_SEBASTIAN, Text_1C21EE, Text_18597E msgbox Text_1859A2, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA787:: @ 81AA787 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_PERRY, 0, Text_185B8F, Text_185BCA + trainerbattle_single TRAINER_BIRD_KEEPER_PERRY, Text_185B8F, Text_185BCA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA7AE + goto_if_eq EventScript_1AA7AE msgbox Text_185BDB, MSGBOX_AUTOCLOSE end EventScript_1AA7AE:: @ 81AA7AE - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_PERRY, 0, Text_1C22CA, Text_185BCA + trainerbattle_rematch TRAINER_BIRD_KEEPER_PERRY, Text_1C22CA, Text_185BCA msgbox Text_185BDB, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA7C5:: @ 81AA7C5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_185D3D, Text_185D7B + trainerbattle_single TRAINER_BIRD_KEEPER_ROBERT, Text_185D3D, Text_185D7B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA7EC + goto_if_eq EventScript_1AA7EC msgbox Text_185D89, MSGBOX_AUTOCLOSE end EventScript_1AA7EC:: @ 81AA7EC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_1C2383, Text_185D7B + trainerbattle_rematch TRAINER_BIRD_KEEPER_ROBERT, Text_1C2383, Text_185D7B msgbox Text_185D89, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA803:: @ 81AA803 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALMA, 0, Text_185B12, Text_185B48 + trainerbattle_single TRAINER_PICNICKER_ALMA, Text_185B12, Text_185B48 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA82A + goto_if_eq EventScript_1AA82A msgbox Text_185B67, MSGBOX_AUTOCLOSE end EventScript_1AA82A:: @ 81AA82A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_ALMA, 0, Text_1C2299, Text_185B48 + trainerbattle_rematch TRAINER_PICNICKER_ALMA, Text_1C2299, Text_185B48 msgbox Text_185B67, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA841:: @ 81AA841 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SUSIE, 0, Text_1859CF, Text_1859EC + trainerbattle_single TRAINER_PICNICKER_SUSIE, Text_1859CF, Text_1859EC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA868 + goto_if_eq EventScript_1AA868 msgbox Text_1859F9, MSGBOX_AUTOCLOSE end EventScript_1AA868:: @ 81AA868 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_SUSIE, 0, Text_1C220C, Text_1859EC + trainerbattle_rematch TRAINER_PICNICKER_SUSIE, Text_1C220C, Text_1859EC msgbox Text_1859F9, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA87F:: @ 81AA87F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_VALERIE, 0, Text_185A37, Text_185A56 + trainerbattle_single TRAINER_PICNICKER_VALERIE, Text_185A37, Text_185A56 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA8A6 + goto_if_eq EventScript_1AA8A6 msgbox Text_185A62, MSGBOX_AUTOCLOSE end EventScript_1AA8A6:: @ 81AA8A6 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_VALERIE, 0, Text_1C223C, Text_185A56 + trainerbattle_rematch TRAINER_PICNICKER_VALERIE, Text_1C223C, Text_185A56 msgbox Text_185A62, MSGBOX_AUTOCLOSE end Route13_EventScript_1AA8BD:: @ 81AA8BD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_GWEN, 0, Text_185A91, Text_185AC1 + trainerbattle_single TRAINER_PICNICKER_GWEN, Text_185A91, Text_185AC1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA8E4 + goto_if_eq EventScript_1AA8E4 msgbox Text_185ADE, MSGBOX_AUTOCLOSE end EventScript_1AA8E4:: @ 81AA8E4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_GWEN, 0, Text_1C225B, Text_185AC1 + trainerbattle_rematch TRAINER_PICNICKER_GWEN, Text_1C225B, Text_185AC1 msgbox Text_185ADE, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA8FB:: @ 81AA8FB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_MALIK, 0, Text_186344, Text_186362 + trainerbattle_single TRAINER_BIKER_MALIK, Text_186344, Text_186362 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA922 + goto_if_eq EventScript_1AA922 msgbox Text_18636E, MSGBOX_AUTOCLOSE end EventScript_1AA922:: @ 81AA922 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_MALIK, 0, Text_1C25D6, Text_186362 + trainerbattle_rematch TRAINER_BIKER_MALIK, Text_1C25D6, Text_186362 msgbox Text_18636E, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA939:: @ 81AA939 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LUKAS, 0, Text_1861F7, Text_186223 + trainerbattle_single TRAINER_BIKER_LUKAS, Text_1861F7, Text_186223 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA960 + goto_if_eq EventScript_1AA960 msgbox Text_186239, MSGBOX_AUTOCLOSE end EventScript_1AA960:: @ 81AA960 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_LUKAS, 0, Text_1C2531, Text_186223 + trainerbattle_rematch TRAINER_BIKER_LUKAS, Text_1C2531, Text_186223 msgbox Text_186239, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA977:: @ 81AA977 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ISAAC, 0, Text_186263, Text_186291 + trainerbattle_single TRAINER_BIKER_ISAAC, Text_186263, Text_186291 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA99E + goto_if_eq EventScript_1AA99E msgbox Text_18629D, MSGBOX_AUTOCLOSE end EventScript_1AA99E:: @ 81AA99E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ISAAC, 0, Text_1C2572, Text_186291 + trainerbattle_rematch TRAINER_BIKER_ISAAC, Text_1C2572, Text_186291 msgbox Text_18629D, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA9B5:: @ 81AA9B5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_GERALD, 0, Text_1862BD, Text_1862EF + trainerbattle_single TRAINER_BIKER_GERALD, Text_1862BD, Text_1862EF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AA9DC + goto_if_eq EventScript_1AA9DC msgbox Text_1862F8, MSGBOX_AUTOCLOSE end EventScript_1AA9DC:: @ 81AA9DC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_GERALD, 0, Text_1C259E, Text_1862EF + trainerbattle_rematch TRAINER_BIKER_GERALD, Text_1C259E, Text_1862EF msgbox Text_1862F8, MSGBOX_AUTOCLOSE end Route14_EventScript_1AA9F3:: @ 81AA9F3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1860D9, Text_18610A + trainerbattle_single TRAINER_BIRD_KEEPER_DONALD, Text_1860D9, Text_18610A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAA1A + goto_if_eq EventScript_1AAA1A msgbox Text_18611D, MSGBOX_AUTOCLOSE end EventScript_1AAA1A:: @ 81AAA1A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1C24CB, Text_18610A + trainerbattle_rematch TRAINER_BIRD_KEEPER_DONALD, Text_1C24CB, Text_18610A msgbox Text_18611D, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAA31:: @ 81AAA31 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BENNY, 0, Text_18618E, Text_1861B3 + trainerbattle_single TRAINER_BIRD_KEEPER_BENNY, Text_18618E, Text_1861B3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAA58 + goto_if_eq EventScript_1AAA58 msgbox Text_1861BE, MSGBOX_AUTOCLOSE end EventScript_1AAA58:: @ 81AAA58 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_BENNY, 0, Text_1C2505, Text_1861B3 + trainerbattle_rematch TRAINER_BIRD_KEEPER_BENNY, Text_1C2505, Text_1861B3 msgbox Text_1861BE, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAA6F:: @ 81AAA6F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CARTER, 0, Text_185E4D, Text_185E81 + trainerbattle_single TRAINER_BIRD_KEEPER_CARTER, Text_185E4D, Text_185E81 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAA96 + goto_if_eq EventScript_1AAA96 msgbox Text_185E9C, MSGBOX_AUTOCLOSE end EventScript_1AAA96:: @ 81AAA96 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CARTER, 0, Text_1C23C1, Text_185E81 + trainerbattle_rematch TRAINER_BIRD_KEEPER_CARTER, Text_1C23C1, Text_185E81 msgbox Text_185E9C, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAAAD:: @ 81AAAAD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MITCH, 0, Text_185EDF, Text_185F0B + trainerbattle_single TRAINER_BIRD_KEEPER_MITCH, Text_185EDF, Text_185F0B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAAD4 + goto_if_eq EventScript_1AAAD4 msgbox Text_185F1A, MSGBOX_AUTOCLOSE end EventScript_1AAAD4:: @ 81AAAD4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MITCH, 0, Text_1C23EF, Text_185F0B + trainerbattle_rematch TRAINER_BIRD_KEEPER_MITCH, Text_1C23EF, Text_185F0B msgbox Text_185F1A, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAAEB:: @ 81AAAEB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BECK, 0, Text_185F46, Text_185FAE + trainerbattle_single TRAINER_BIRD_KEEPER_BECK, Text_185F46, Text_185FAE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAB12 + goto_if_eq EventScript_1AAB12 msgbox Text_185FBB, MSGBOX_AUTOCLOSE end EventScript_1AAB12:: @ 81AAB12 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_BECK, 0, Text_1C2425, Text_185FAE + trainerbattle_rematch TRAINER_BIRD_KEEPER_BECK, Text_1C2425, Text_185FAE msgbox Text_185FBB, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAB29:: @ 81AAB29 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MARLON, 0, Text_186021, Text_18607C + trainerbattle_single TRAINER_BIRD_KEEPER_MARLON, Text_186021, Text_18607C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAB50 + goto_if_eq EventScript_1AAB50 msgbox Text_186091, MSGBOX_AUTOCLOSE end EventScript_1AAB50:: @ 81AAB50 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MARLON, 0, Text_1C2461, Text_18607C + trainerbattle_rematch TRAINER_BIRD_KEEPER_MARLON, Text_1C2461, Text_18607C msgbox Text_186091, MSGBOX_AUTOCLOSE end Route14_EventScript_1AAB67:: @ 81AAB67 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1863B7, Text_1863EA, Text_18642E + trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_1863B7, Text_1863EA, Text_18642E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAB92 + goto_if_eq EventScript_1AAB92 msgbox Text_18640D, MSGBOX_AUTOCLOSE end EventScript_1AAB92:: @ 81AAB92 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1C25FB, Text_1863EA, Text_18642E + trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Text_1C25FB, Text_1863EA, Text_18642E msgbox Text_18640D, MSGBOX_AUTOCLOSE end Route14_EventScript_1AABAD:: @ 81AABAD - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_18645B, Text_186487, Text_1864D3 + trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_18645B, Text_186487, Text_1864D3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AABD8 + goto_if_eq EventScript_1AABD8 msgbox Text_18649C, MSGBOX_AUTOCLOSE end EventScript_1AABD8:: @ 81AABD8 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1C261B, Text_186487, Text_1864D3 + trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Text_1C261B, Text_186487, Text_1864D3 msgbox Text_18649C, MSGBOX_AUTOCLOSE end Route15_EventScript_1AABF3:: @ 81AABF3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ERNEST, 0, Text_1868B6, Text_1868E8 + trainerbattle_single TRAINER_BIKER_ERNEST, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAC1A + goto_if_eq EventScript_1AAC1A msgbox Text_1868F1, MSGBOX_AUTOCLOSE end EventScript_1AAC1A:: @ 81AAC1A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ERNEST, 0, Text_1C27E7, Text_1868E8 + trainerbattle_rematch TRAINER_BIKER_ERNEST, Text_1C27E7, Text_1868E8 msgbox Text_1868F1, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAC31:: @ 81AAC31 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ALEX, 0, Text_186936, Text_186968 + trainerbattle_single TRAINER_BIKER_ALEX, Text_186936, Text_186968 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAC58 + goto_if_eq EventScript_1AAC58 msgbox Text_18697C, MSGBOX_AUTOCLOSE end EventScript_1AAC58:: @ 81AAC58 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_ALEX, 0, Text_1C2814, Text_186968 + trainerbattle_rematch TRAINER_BIKER_ALEX, Text_1C2814, Text_186968 msgbox Text_18697C, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAC6F:: @ 81AAC6F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_GRACE, 0, Text_18678B, Text_1867C1 + trainerbattle_single TRAINER_BEAUTY_GRACE, Text_18678B, Text_1867C1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAC96 + goto_if_eq EventScript_1AAC96 msgbox Text_1867DA, MSGBOX_AUTOCLOSE end EventScript_1AAC96:: @ 81AAC96 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_GRACE, 0, Text_1C2753, Text_1867C1 + trainerbattle_rematch TRAINER_BEAUTY_GRACE, Text_1C2753, Text_1867C1 msgbox Text_1867DA, MSGBOX_AUTOCLOSE end Route15_EventScript_1AACAD:: @ 81AACAD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_OLIVIA, 0, Text_18680C, Text_186841 + trainerbattle_single TRAINER_BEAUTY_OLIVIA, Text_18680C, Text_186841 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AACD4 + goto_if_eq EventScript_1AACD4 msgbox Text_18686F, MSGBOX_AUTOCLOSE end EventScript_1AACD4:: @ 81AACD4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BEAUTY_OLIVIA, 0, Text_1C279D, Text_186841 + trainerbattle_rematch TRAINER_BEAUTY_OLIVIA, Text_1C279D, Text_186841 msgbox Text_18686F, MSGBOX_AUTOCLOSE end Route15_EventScript_1AACEB:: @ 81AACEB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_18664F, Text_18667A + trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Text_18664F, Text_18667A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAD12 + goto_if_eq EventScript_1AAD12 msgbox Text_18668D, MSGBOX_AUTOCLOSE end EventScript_1AAD12:: @ 81AAD12 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_1C26D3, Text_18667A + trainerbattle_rematch TRAINER_BIRD_KEEPER_EDWIN, Text_1C26D3, Text_18667A msgbox Text_18668D, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAD29:: @ 81AAD29 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1866D1, Text_186707 + trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Text_1866D1, Text_186707 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAD50 + goto_if_eq EventScript_1AAD50 msgbox Text_18671A, MSGBOX_AUTOCLOSE end EventScript_1AAD50:: @ 81AAD50 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1C2717, Text_186707 + trainerbattle_rematch TRAINER_BIRD_KEEPER_CHESTER, Text_1C2717, Text_186707 msgbox Text_18671A, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAD67:: @ 81AAD67 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_YAZMIN, 0, Text_186A22, Text_186A40 + trainerbattle_single TRAINER_PICNICKER_YAZMIN, Text_186A22, Text_186A40 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAD8E + goto_if_eq EventScript_1AAD8E msgbox Text_186A55, MSGBOX_AUTOCLOSE end EventScript_1AAD8E:: @ 81AAD8E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_YAZMIN, 0, Text_1C287D, Text_186A40 + trainerbattle_rematch TRAINER_PICNICKER_YAZMIN, Text_1C287D, Text_186A40 msgbox Text_186A55, MSGBOX_AUTOCLOSE end Route15_EventScript_1AADA5:: @ 81AADA5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KINDRA, 0, Text_18650B, Text_186549 + trainerbattle_single TRAINER_PICNICKER_KINDRA, Text_18650B, Text_186549 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AADCC + goto_if_eq EventScript_1AADCC msgbox Text_18655A, MSGBOX_AUTOCLOSE end EventScript_1AADCC:: @ 81AADCC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_KINDRA, 0, Text_1C2650, Text_186549 + trainerbattle_rematch TRAINER_PICNICKER_KINDRA, Text_1C2650, Text_186549 msgbox Text_18655A, MSGBOX_AUTOCLOSE end Route15_EventScript_1AADE3:: @ 81AADE3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_BECKY, 0, Text_1865D3, Text_186612 + trainerbattle_single TRAINER_PICNICKER_BECKY, Text_1865D3, Text_186612 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAE0A + goto_if_eq EventScript_1AAE0A msgbox Text_18661D, MSGBOX_AUTOCLOSE end EventScript_1AAE0A:: @ 81AAE0A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_BECKY, 0, Text_1C268D, Text_186612 + trainerbattle_rematch TRAINER_PICNICKER_BECKY, Text_1C268D, Text_186612 msgbox Text_18661D, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAE21:: @ 81AAE21 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CELIA, 0, Text_1869BA, Text_1869E6 + trainerbattle_single TRAINER_PICNICKER_CELIA, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAE48 + goto_if_eq EventScript_1AAE48 msgbox Text_1869F4, MSGBOX_AUTOCLOSE end EventScript_1AAE48:: @ 81AAE48 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CELIA, 0, Text_1C2846, Text_1869E6 + trainerbattle_rematch TRAINER_PICNICKER_CELIA, Text_1C2846, Text_1869E6 msgbox Text_1869F4, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAE5F:: @ 81AAE5F - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186A95, Text_186ACB, Text_186B46 + trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAE8A + goto_if_eq EventScript_1AAE8A msgbox Text_186B0A, MSGBOX_AUTOCLOSE end EventScript_1AAE8A:: @ 81AAE8A - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28A1, Text_186ACB, Text_186B46 + trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Text_1C28A1, Text_186ACB, Text_186B46 msgbox Text_186B0A, MSGBOX_AUTOCLOSE end Route15_EventScript_1AAEA5:: @ 81AAEA5 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186B89, Text_186BB1, Text_186BFE + trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAED0 + goto_if_eq EventScript_1AAED0 msgbox Text_186BD2, MSGBOX_AUTOCLOSE end EventScript_1AAED0:: @ 81AAED0 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28EC, Text_186BB1, Text_186BFE + trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Text_1C28EC, Text_186BB1, Text_186BFE msgbox Text_186BD2, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAEEB:: @ 81AAEEB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LAO, 0, Text_186C4D, Text_186C5F + trainerbattle_single TRAINER_BIKER_LAO, Text_186C4D, Text_186C5F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAF12 + goto_if_eq EventScript_1AAF12 msgbox Text_186C75, MSGBOX_AUTOCLOSE end EventScript_1AAF12:: @ 81AAF12 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_LAO, 0, Text_1C2913, Text_186C5F + trainerbattle_rematch TRAINER_BIKER_LAO, Text_1C2913, Text_186C5F msgbox Text_186C75, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAF29:: @ 81AAF29 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_HIDEO, 0, Text_186D39, Text_186D52 + trainerbattle_single TRAINER_BIKER_HIDEO, Text_186D39, Text_186D52 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAF50 + goto_if_eq EventScript_1AAF50 msgbox Text_186D5A, MSGBOX_AUTOCLOSE end EventScript_1AAF50:: @ 81AAF50 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_HIDEO, 0, Text_1C297B, Text_186D52 + trainerbattle_rematch TRAINER_BIKER_HIDEO, Text_1C297B, Text_186D52 msgbox Text_186D5A, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAF67:: @ 81AAF67 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RUBEN, 0, Text_186E86, Text_186EB4 + trainerbattle_single TRAINER_BIKER_RUBEN, Text_186E86, Text_186EB4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAF8E + goto_if_eq EventScript_1AAF8E msgbox Text_186EC7, MSGBOX_AUTOCLOSE end EventScript_1AAF8E:: @ 81AAF8E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_RUBEN, 0, Text_1C29EB, Text_186EB4 + trainerbattle_rematch TRAINER_BIKER_RUBEN, Text_1C29EB, Text_186EB4 msgbox Text_186EC7, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAFA5:: @ 81AAFA5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_KOJI, 0, Text_186CA2, Text_186CBB + trainerbattle_single TRAINER_CUE_BALL_KOJI, Text_186CA2, Text_186CBB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AAFCC + goto_if_eq EventScript_1AAFCC msgbox Text_186CC5, MSGBOX_AUTOCLOSE end EventScript_1AAFCC:: @ 81AAFCC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_KOJI, 0, Text_1C2925, Text_186CBB + trainerbattle_rematch TRAINER_CUE_BALL_KOJI, Text_1C2925, Text_186CBB msgbox Text_186CC5, MSGBOX_AUTOCLOSE end Route16_EventScript_1AAFE3:: @ 81AAFE3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_LUKE, 0, Text_186CE5, Text_186D06 + trainerbattle_single TRAINER_CUE_BALL_LUKE, Text_186CE5, Text_186D06 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB00A + goto_if_eq EventScript_1AB00A msgbox Text_186D16, MSGBOX_AUTOCLOSE end EventScript_1AB00A:: @ 81AB00A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_LUKE, 0, Text_1C2944, Text_186D06 + trainerbattle_rematch TRAINER_CUE_BALL_LUKE, Text_1C2944, Text_186D06 msgbox Text_186D16, MSGBOX_AUTOCLOSE end Route16_EventScript_1AB021:: @ 81AB021 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_CAMRON, 0, Text_186DD9, Text_186E0D + trainerbattle_single TRAINER_CUE_BALL_CAMRON, Text_186DD9, Text_186E0D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB048 + goto_if_eq EventScript_1AB048 msgbox Text_186E1C, MSGBOX_AUTOCLOSE end EventScript_1AB048:: @ 81AB048 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_CAMRON, 0, Text_1C29B0, Text_186E0D + trainerbattle_rematch TRAINER_CUE_BALL_CAMRON, Text_1C29B0, Text_186E0D msgbox Text_186E1C, MSGBOX_AUTOCLOSE end Route16_EventScript_1AB05F:: @ 81AB05F - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_186FBD, Text_186FFA, Text_187057 + trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB08A + goto_if_eq EventScript_1AB08A msgbox Text_187027, MSGBOX_AUTOCLOSE end EventScript_1AB08A:: @ 81AB08A - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A19, Text_186FFA, Text_187057 + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_1C2A19, Text_186FFA, Text_187057 msgbox Text_187027, MSGBOX_AUTOCLOSE end Route16_EventScript_1AB0A5:: @ 81AB0A5 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_187097, Text_1870CC, Text_187120 + trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB0D0 + goto_if_eq EventScript_1AB0D0 msgbox Text_1870F9, MSGBOX_AUTOCLOSE end EventScript_1AB0D0:: @ 81AB0D0 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A53, Text_1870CC, Text_187120 + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_1C2A53, Text_1870CC, Text_187120 msgbox Text_1870F9, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB0EB:: @ 81AB0EB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_BILLY, 0, Text_1872BD, Text_1872E3 + trainerbattle_single TRAINER_BIKER_BILLY, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB112 + goto_if_eq EventScript_1AB112 msgbox Text_1872EB, MSGBOX_AUTOCLOSE end EventScript_1AB112:: @ 81AB112 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_BILLY, 0, Text_1C2B06, Text_1872E3 + trainerbattle_rematch TRAINER_BIKER_BILLY, Text_1C2B06, Text_1872E3 msgbox Text_1872EB, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB129:: @ 81AB129 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_NIKOLAS, 0, Text_18730A, Text_187325 + trainerbattle_single TRAINER_BIKER_NIKOLAS, Text_18730A, Text_187325 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB150 + goto_if_eq EventScript_1AB150 msgbox Text_187333, MSGBOX_AUTOCLOSE end EventScript_1AB150:: @ 81AB150 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_NIKOLAS, 0, Text_1C2B2C, Text_187325 + trainerbattle_rematch TRAINER_BIKER_NIKOLAS, Text_1C2B2C, Text_187325 msgbox Text_187333, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB167:: @ 81AB167 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAXON, 0, Text_187456, Text_187472 + trainerbattle_single TRAINER_BIKER_JAXON, Text_187456, Text_187472 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB18E + goto_if_eq EventScript_1AB18E msgbox Text_187479, MSGBOX_AUTOCLOSE end EventScript_1AB18E:: @ 81AB18E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_JAXON, 0, Text_1C2BE6, Text_187472 + trainerbattle_rematch TRAINER_BIKER_JAXON, Text_1C2BE6, Text_187472 msgbox Text_187479, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB1A5:: @ 81AB1A5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_WILLIAM, 0, Text_18749B, Text_1874B6 + trainerbattle_single TRAINER_BIKER_WILLIAM, Text_18749B, Text_1874B6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB1CC + goto_if_eq EventScript_1AB1CC msgbox Text_1874C9, MSGBOX_AUTOCLOSE end EventScript_1AB1CC:: @ 81AB1CC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_WILLIAM, 0, Text_1C2C10, Text_1874B6 + trainerbattle_rematch TRAINER_BIKER_WILLIAM, Text_1C2C10, Text_1874B6 msgbox Text_1874C9, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB1E3:: @ 81AB1E3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_RAUL, 0, Text_18717E, Text_1871AE + trainerbattle_single TRAINER_CUE_BALL_RAUL, Text_18717E, Text_1871AE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB20A + goto_if_eq EventScript_1AB20A msgbox Text_1871BA, MSGBOX_AUTOCLOSE end EventScript_1AB20A:: @ 81AB20A - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_RAUL, 0, Text_1C2A88, Text_1871AE + trainerbattle_rematch TRAINER_CUE_BALL_RAUL, Text_1C2A88, Text_1871AE msgbox Text_1871BA, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB221:: @ 81AB221 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ISAIAH, 0, Text_187228, Text_187254 + trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Text_187228, Text_187254 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB248 + goto_if_eq EventScript_1AB248 msgbox Text_18725A, MSGBOX_AUTOCLOSE end EventScript_1AB248:: @ 81AB248 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_ISAIAH, 0, Text_1C2AC4, Text_187254 + trainerbattle_rematch TRAINER_CUE_BALL_ISAIAH, Text_1C2AC4, Text_187254 msgbox Text_18725A, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB25F:: @ 81AB25F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ZEEK, 0, Text_187362, Text_187395 + trainerbattle_single TRAINER_CUE_BALL_ZEEK, Text_187362, Text_187395 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB286 + goto_if_eq EventScript_1AB286 msgbox Text_18739F, MSGBOX_AUTOCLOSE end EventScript_1AB286:: @ 81AB286 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_ZEEK, 0, Text_1C2B5E, Text_187395 + trainerbattle_rematch TRAINER_CUE_BALL_ZEEK, Text_1C2B5E, Text_187395 msgbox Text_18739F, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB29D:: @ 81AB29D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_JAMAL, 0, Text_1873D1, Text_1873EB + trainerbattle_single TRAINER_CUE_BALL_JAMAL, Text_1873D1, Text_1873EB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB2C4 + goto_if_eq EventScript_1AB2C4 msgbox Text_1873FF, MSGBOX_AUTOCLOSE end EventScript_1AB2C4:: @ 81AB2C4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_JAMAL, 0, Text_1C2B9C, Text_1873EB + trainerbattle_rematch TRAINER_CUE_BALL_JAMAL, Text_1C2B9C, Text_1873EB msgbox Text_1873FF, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB2DB:: @ 81AB2DB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_COREY, 0, Text_18741D, Text_187429 + trainerbattle_single TRAINER_CUE_BALL_COREY, Text_18741D, Text_187429 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB302 + goto_if_eq EventScript_1AB302 msgbox Text_187432, MSGBOX_AUTOCLOSE end EventScript_1AB302:: @ 81AB302 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CUE_BALL_COREY, 0, Text_1C2BDA, Text_187429 + trainerbattle_rematch TRAINER_CUE_BALL_COREY, Text_1C2BDA, Text_187429 msgbox Text_187432, MSGBOX_AUTOCLOSE end Route17_EventScript_1AB319:: @ 81AB319 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_VIRGIL, 0, Text_18727D, Text_187295 + trainerbattle_single TRAINER_BIKER_VIRGIL, Text_18727D, Text_187295 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB340 + goto_if_eq EventScript_1AB340 msgbox Text_1872A5, MSGBOX_AUTOCLOSE end EventScript_1AB340:: @ 81AB340 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIKER_VIRGIL, 0, Text_1C2AF0, Text_187295 + trainerbattle_rematch TRAINER_BIKER_VIRGIL, Text_1C2AF0, Text_187295 msgbox Text_1872A5, MSGBOX_AUTOCLOSE end Route18_EventScript_1AB357:: @ 81AB357 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_WILTON, 0, Text_187640, Text_187672 + trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Text_187640, Text_187672 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB37E + goto_if_eq EventScript_1AB37E msgbox Text_187677, MSGBOX_AUTOCLOSE end EventScript_1AB37E:: @ 81AB37E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_WILTON, 0, Text_1C2C2B, Text_187672 + trainerbattle_rematch TRAINER_BIRD_KEEPER_WILTON, Text_1C2C2B, Text_187672 msgbox Text_187677, MSGBOX_AUTOCLOSE end Route18_EventScript_1AB395:: @ 81AB395 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_18768C, Text_1876B3 + trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Text_18768C, Text_1876B3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB3BC + goto_if_eq EventScript_1AB3BC msgbox Text_1876C5, MSGBOX_AUTOCLOSE end EventScript_1AB3BC:: @ 81AB3BC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_1C2C7B, Text_1876B3 + trainerbattle_rematch TRAINER_BIRD_KEEPER_RAMIRO, Text_1C2C7B, Text_1876B3 msgbox Text_1876C5, MSGBOX_AUTOCLOSE end Route18_EventScript_1AB3D3:: @ 81AB3D3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_JACOB, 0, Text_187704, Text_187726 + trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Text_187704, Text_187726 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB3FA + goto_if_eq EventScript_1AB3FA msgbox Text_18772C, MSGBOX_AUTOCLOSE end EventScript_1AB3FA:: @ 81AB3FA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_JACOB, 0, Text_1C2CA8, Text_187726 + trainerbattle_rematch TRAINER_BIRD_KEEPER_JACOB, Text_1C2CA8, Text_187726 msgbox Text_18772C, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB411:: @ 81AB411 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1877A3, Text_1877DF + trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Text_1877A3, Text_1877DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB438 + goto_if_eq EventScript_1AB438 msgbox Text_1877EE, MSGBOX_AUTOCLOSE end EventScript_1AB438:: @ 81AB438 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1C2CEE, Text_1877DF + trainerbattle_rematch TRAINER_SWIMMER_MALE_RICHARD, Text_1C2CEE, Text_1877DF msgbox Text_1877EE, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB44F:: @ 81AB44F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_REECE, 0, Text_187811, Text_18783E + trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Text_187811, Text_18783E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB476 + goto_if_eq EventScript_1AB476 msgbox Text_187852, MSGBOX_AUTOCLOSE end EventScript_1AB476:: @ 81AB476 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_REECE, 0, Text_1C2D19, Text_18783E + trainerbattle_rematch TRAINER_SWIMMER_MALE_REECE, Text_1C2D19, Text_18783E msgbox Text_187852, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB48D:: @ 81AB48D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_187884, Text_1878A5 + trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Text_187884, Text_1878A5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB4B4 + goto_if_eq EventScript_1AB4B4 msgbox Text_1878B1, MSGBOX_AUTOCLOSE end EventScript_1AB4B4:: @ 81AB4B4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_1C2D4B, Text_1878A5 + trainerbattle_rematch TRAINER_SWIMMER_MALE_MATTHEW, Text_1C2D4B, Text_1878A5 msgbox Text_1878B1, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB4CB:: @ 81AB4CB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1878DD, Text_1878F8 + trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB4F2 + goto_if_eq EventScript_1AB4F2 msgbox Text_1878FE, MSGBOX_AUTOCLOSE end EventScript_1AB4F2:: @ 81AB4F2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1C2D7D, Text_1878F8 + trainerbattle_rematch TRAINER_SWIMMER_MALE_DOUGLAS, Text_1C2D7D, Text_1878F8 msgbox Text_1878FE, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB509:: @ 81AB509 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DAVID, 0, Text_187925, Text_187955 + trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Text_187925, Text_187955 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB530 + goto_if_eq EventScript_1AB530 msgbox Text_18795B, MSGBOX_AUTOCLOSE end EventScript_1AB530:: @ 81AB530 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DAVID, 0, Text_1C2DA7, Text_187955 + trainerbattle_rematch TRAINER_SWIMMER_MALE_DAVID, Text_1C2DA7, Text_187955 msgbox Text_18795B, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB547:: @ 81AB547 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TONY, 0, Text_187985, Text_1879C3 + trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Text_187985, Text_1879C3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB56E + goto_if_eq EventScript_1AB56E msgbox Text_1879D3, MSGBOX_AUTOCLOSE end EventScript_1AB56E:: @ 81AB56E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_TONY, 0, Text_1C2DE9, Text_1879C3 + trainerbattle_rematch TRAINER_SWIMMER_MALE_TONY, Text_1C2DE9, Text_1879C3 msgbox Text_1879D3, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB585:: @ 81AB585 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_AXLE, 0, Text_187AFA, Text_187B25 + trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Text_187AFA, Text_187B25 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB5AC + goto_if_eq EventScript_1AB5AC msgbox Text_187B35, MSGBOX_AUTOCLOSE end EventScript_1AB5AC:: @ 81AB5AC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_AXLE, 0, Text_1C2EC0, Text_187B25 + trainerbattle_rematch TRAINER_SWIMMER_MALE_AXLE, Text_1C2EC0, Text_187B25 msgbox Text_187B35, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB5C3:: @ 81AB5C3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_187A11, Text_187A44 + trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Text_187A11, Text_187A44 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB5EA + goto_if_eq EventScript_1AB5EA msgbox Text_187A50, MSGBOX_AUTOCLOSE end EventScript_1AB5EA:: @ 81AB5EA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_1C2E4A, Text_187A44 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ANYA, Text_1C2E4A, Text_187A44 msgbox Text_187A50, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB601:: @ 81AB601 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_187A9E, Text_187AC1 + trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB628 + goto_if_eq EventScript_1AB628 msgbox Text_187ACA, MSGBOX_AUTOCLOSE end EventScript_1AB628:: @ 81AB628 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_1C2E9D, Text_187AC1 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ALICE, Text_1C2E9D, Text_187AC1 msgbox Text_187ACA, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB63F:: @ 81AB63F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_187B5D, Text_187B85 + trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Text_187B5D, Text_187B85 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB666 + goto_if_eq EventScript_1AB666 msgbox Text_187B94, MSGBOX_AUTOCLOSE end EventScript_1AB666:: @ 81AB666 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_1C2EFC, Text_187B85 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_CONNIE, Text_1C2EFC, Text_187B85 msgbox Text_187B94, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB67D:: @ 81AB67D - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187C32, Text_187C6F, Text_187CF2 + trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB6A8 + goto_if_eq EventScript_1AB6A8 msgbox Text_187C9E, MSGBOX_AUTOCLOSE end EventScript_1AB6A8:: @ 81AB6A8 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2F41, Text_187C6F, Text_187CF2 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_1C2F41, Text_187C6F, Text_187CF2 msgbox Text_187C9E, MSGBOX_AUTOCLOSE end Route19_EventScript_1AB6C3:: @ 81AB6C3 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187D45, Text_187D7E, Text_187DE8 + trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB6EE + goto_if_eq EventScript_1AB6EE msgbox Text_187DAD, MSGBOX_AUTOCLOSE end EventScript_1AB6EE:: @ 81AB6EE - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2FAE, Text_187D7E, Text_187DE8 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_1C2FAE, Text_187D7E, Text_187DE8 msgbox Text_187DAD, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB709:: @ 81AB709 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_BARRY, 0, Text_187E40, Text_187E7B + trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Text_187E40, Text_187E7B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB730 + goto_if_eq EventScript_1AB730 msgbox Text_187E83, MSGBOX_AUTOCLOSE end EventScript_1AB730:: @ 81AB730 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_BARRY, 0, Text_1C2FF3, Text_187E7B + trainerbattle_rematch TRAINER_SWIMMER_MALE_BARRY, Text_1C2FF3, Text_187E7B msgbox Text_187E83, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB747:: @ 81AB747 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DEAN, 0, Text_187FDB, Text_187FF7 + trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB76E + goto_if_eq EventScript_1AB76E msgbox Text_187FFE, MSGBOX_AUTOCLOSE end EventScript_1AB76E:: @ 81AB76E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DEAN, 0, Text_1C30B0, Text_187FF7 + trainerbattle_rematch TRAINER_SWIMMER_MALE_DEAN, Text_1C30B0, Text_187FF7 msgbox Text_187FFE, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB785:: @ 81AB785 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_18802E, Text_18805C + trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Text_18802E, Text_18805C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB7AC + goto_if_eq EventScript_1AB7AC msgbox Text_18806D, MSGBOX_AUTOCLOSE end EventScript_1AB7AC:: @ 81AB7AC - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_1C30ED, Text_18805C + trainerbattle_rematch TRAINER_SWIMMER_MALE_DARRIN, Text_1C30ED, Text_18805C msgbox Text_18806D, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB7C3:: @ 81AB7C3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_187F24, Text_187F5A + trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Text_187F24, Text_187F5A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB7EA + goto_if_eq EventScript_1AB7EA msgbox Text_187F61, MSGBOX_AUTOCLOSE end EventScript_1AB7EA:: @ 81AB7EA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_1C305F, Text_187F5A + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TIFFANY, Text_1C305F, Text_187F5A msgbox Text_187F61, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB801:: @ 81AB801 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1880F8, Text_188119 + trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Text_1880F8, Text_188119 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB828 + goto_if_eq EventScript_1AB828 msgbox Text_188139, MSGBOX_AUTOCLOSE end EventScript_1AB828:: @ 81AB828 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1C3149, Text_188119 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NORA, Text_1C3149, Text_188119 msgbox Text_188139, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB83F:: @ 81AB83F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_188218, Text_18825C + trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Text_188218, Text_18825C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB866 + goto_if_eq EventScript_1AB866 msgbox Text_18827B, MSGBOX_AUTOCLOSE end EventScript_1AB866:: @ 81AB866 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_1C31C4, Text_18825C + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MELISSA, Text_1C31C4, Text_18825C msgbox Text_18827B, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB87D:: @ 81AB87D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_187EBB, Text_187EED + trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_187EBB, Text_187EED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB8A4 + goto_if_eq EventScript_1AB8A4 msgbox Text_187EF6, MSGBOX_AUTOCLOSE end EventScript_1AB8A4:: @ 81AB8A4 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_1C302E, Text_187EED + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_1C302E, Text_187EED msgbox Text_187EF6, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB8BB:: @ 81AB8BB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROGER, 0, Text_18808E, Text_1880AB + trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Text_18808E, Text_1880AB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB8E2 + goto_if_eq EventScript_1AB8E2 msgbox Text_1880C8, MSGBOX_AUTOCLOSE end EventScript_1AB8E2:: @ 81AB8E2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_ROGER, 0, Text_1C312C, Text_1880AB + trainerbattle_rematch TRAINER_BIRD_KEEPER_ROGER, Text_1C312C, Text_1880AB msgbox Text_1880C8, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB8F9:: @ 81AB8F9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MISSY, 0, Text_188165, Text_1881A3 + trainerbattle_single TRAINER_PICNICKER_MISSY, Text_188165, Text_1881A3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB920 + goto_if_eq EventScript_1AB920 msgbox Text_1881B8, MSGBOX_AUTOCLOSE end EventScript_1AB920:: @ 81AB920 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_MISSY, 0, Text_1C3185, Text_1881A3 + trainerbattle_rematch TRAINER_PICNICKER_MISSY, Text_1C3185, Text_1881A3 msgbox Text_1881B8, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB937:: @ 81AB937 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_IRENE, 0, Text_187F78, Text_187F92 + trainerbattle_single TRAINER_PICNICKER_IRENE, Text_187F78, Text_187F92 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB95E + goto_if_eq EventScript_1AB95E msgbox Text_187FA3, MSGBOX_AUTOCLOSE end EventScript_1AB95E:: @ 81AB95E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_IRENE, 0, Text_1C3095, Text_187F92 + trainerbattle_rematch TRAINER_PICNICKER_IRENE, Text_1C3095, Text_187F92 msgbox Text_187FA3, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1AB975:: @ 81AB975 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_RONALD, 0, Text_18835A, Text_188383 + trainerbattle_single TRAINER_FISHERMAN_RONALD, Text_18835A, Text_188383 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB99C + goto_if_eq EventScript_1AB99C msgbox Text_188389, MSGBOX_AUTOCLOSE end EventScript_1AB99C:: @ 81AB99C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_RONALD, 0, Text_1C3208, Text_188383 + trainerbattle_rematch TRAINER_FISHERMAN_RONALD, Text_1C3208, Text_188383 msgbox Text_188389, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1AB9B3:: @ 81AB9B3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CLAUDE, 0, Text_1885D8, Text_1885F8 + trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AB9DA + goto_if_eq EventScript_1AB9DA msgbox Text_188632, MSGBOX_AUTOCLOSE end EventScript_1AB9DA:: @ 81AB9DA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_CLAUDE, 0, Text_1C331D, Text_1885F8 + trainerbattle_rematch TRAINER_FISHERMAN_CLAUDE, Text_1C331D, Text_1885F8 msgbox Text_188632, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1AB9F1:: @ 81AB9F1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_WADE, 0, Text_1883C6, Text_1883E9 + trainerbattle_single TRAINER_FISHERMAN_WADE, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABA18 + goto_if_eq EventScript_1ABA18 msgbox Text_18841D, MSGBOX_AUTOCLOSE end EventScript_1ABA18:: @ 81ABA18 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_WADE, 0, Text_1C3231, Text_1883E9 + trainerbattle_rematch TRAINER_FISHERMAN_WADE, Text_1C3231, Text_1883E9 msgbox Text_18841D, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1ABA2F:: @ 81ABA2F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NOLAN, 0, Text_18868C, Text_1886AE + trainerbattle_single TRAINER_FISHERMAN_NOLAN, Text_18868C, Text_1886AE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABA56 + goto_if_eq EventScript_1ABA56 msgbox Text_1886C5, MSGBOX_AUTOCLOSE end EventScript_1ABA56:: @ 81ABA56 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_NOLAN, 0, Text_1C3356, Text_1886AE + trainerbattle_rematch TRAINER_FISHERMAN_NOLAN, Text_1C3356, Text_1886AE msgbox Text_1886C5, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1ABA6D:: @ 81ABA6D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_18843C, Text_18845F + trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Text_18843C, Text_18845F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABA94 + goto_if_eq EventScript_1ABA94 msgbox Text_188465, MSGBOX_AUTOCLOSE end EventScript_1ABA94:: @ 81ABA94 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_1C3264, Text_18845F + trainerbattle_rematch TRAINER_SWIMMER_MALE_SPENCER, Text_1C3264, Text_18845F msgbox Text_188465, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1ABAAB:: @ 81ABAAB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JACK, 0, Text_1884D4, Text_1884F0 + trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABAD2 + goto_if_eq EventScript_1ABAD2 msgbox Text_1884FF, MSGBOX_AUTOCLOSE end EventScript_1ABAD2:: @ 81ABAD2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_JACK, 0, Text_1C3298, Text_1884F0 + trainerbattle_rematch TRAINER_SWIMMER_MALE_JACK, Text_1C3298, Text_1884F0 msgbox Text_1884FF, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1ABAE9:: @ 81ABAE9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JEROME, 0, Text_18851F, Text_188543 + trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Text_18851F, Text_188543 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABB10 + goto_if_eq EventScript_1ABB10 msgbox Text_188555, MSGBOX_AUTOCLOSE end EventScript_1ABB10:: @ 81ABB10 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_JEROME, 0, Text_1C32D3, Text_188543 + trainerbattle_rematch TRAINER_SWIMMER_MALE_JEROME, Text_1C32D3, Text_188543 msgbox Text_188555, MSGBOX_AUTOCLOSE end Route21_South_EventScript_1ABB27:: @ 81ABB27 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_188592, Text_1885B2 + trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Text_188592, Text_1885B2 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABB4E + goto_if_eq EventScript_1ABB4E msgbox Text_1885BF, MSGBOX_AUTOCLOSE end EventScript_1ABB4E:: @ 81ABB4E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_1C32FD, Text_1885B2 + trainerbattle_rematch TRAINER_SWIMMER_MALE_ROLAND, Text_1C32FD, Text_1885B2 msgbox Text_1885BF, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1ABB65:: @ 81ABB65 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1886E2, Text_188712, Text_18875E + trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABB90 + goto_if_eq EventScript_1ABB90 msgbox Text_188734, MSGBOX_AUTOCLOSE end EventScript_1ABB90:: @ 81ABB90 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C3378, Text_188712, Text_18875E + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1C3378, Text_188712, Text_18875E msgbox Text_188734, MSGBOX_AUTOCLOSE end Route21_North_EventScript_1ABBAB:: @ 81ABBAB - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1887B4, Text_1887F1, Text_188850 + trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABBD6 + goto_if_eq EventScript_1ABBD6 msgbox Text_188812, MSGBOX_AUTOCLOSE end EventScript_1ABBD6:: @ 81ABBD6 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C33AE, Text_1887F1, Text_188850 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1C33AE, Text_1887F1, Text_188850 msgbox Text_188812, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_18961F, Text_18964D + trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, Text_18961F, Text_18964D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABC18 + goto_if_eq EventScript_1ABC18 msgbox Text_189657, MSGBOX_AUTOCLOSE end EventScript_1ABC18:: @ 81ABC18 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_1C37B5, Text_18964D + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MARIA, Text_1C37B5, Text_18964D msgbox Text_189657, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_18968C, Text_1896AC + trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_18968C, Text_1896AC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABC56 + goto_if_eq EventScript_1ABC56 msgbox Text_1896C1, MSGBOX_AUTOCLOSE end EventScript_1ABC56:: @ 81ABC56 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_1C37E7, Text_1896AC + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_1C37E7, Text_1896AC msgbox Text_1896C1, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_FINN, 0, Text_1896F9, Text_189728 + trainerbattle_single TRAINER_SWIMMER_MALE_FINN, Text_1896F9, Text_189728 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABC94 + goto_if_eq EventScript_1ABC94 msgbox Text_189740, MSGBOX_AUTOCLOSE end EventScript_1ABC94:: @ 81ABC94 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_FINN, 0, Text_1C3807, Text_189728 + trainerbattle_rematch TRAINER_SWIMMER_MALE_FINN, Text_1C3807, Text_189728 msgbox Text_189740, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_189767, Text_1897A4 + trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, Text_189767, Text_1897A4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABCD2 + goto_if_eq EventScript_1ABCD2 msgbox Text_1897C5, MSGBOX_AUTOCLOSE end EventScript_1ABCD2:: @ 81ABCD2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_1C3835, Text_1897A4 + trainerbattle_rematch TRAINER_SWIMMER_MALE_GARRETT, Text_1C3835, Text_1897A4 msgbox Text_1897C5, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TOMMY, 0, Text_1897FF, Text_189833 + trainerbattle_single TRAINER_FISHERMAN_TOMMY, Text_1897FF, Text_189833 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABD10 + goto_if_eq EventScript_1ABD10 msgbox Text_18984B, MSGBOX_AUTOCLOSE end EventScript_1ABD10:: @ 81ABD10 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_TOMMY, 0, Text_1C386A, Text_189833 + trainerbattle_rematch TRAINER_FISHERMAN_TOMMY, Text_1C386A, Text_189833 msgbox Text_18984B, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_SHARON, 0, Text_189883, Text_1898AB + trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, Text_189883, Text_1898AB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABD4E + goto_if_eq EventScript_1ABD4E msgbox Text_1898C4, MSGBOX_AUTOCLOSE end EventScript_1ABD4E:: @ 81ABD4E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_SHARON, 0, Text_1C389F, Text_1898AB + trainerbattle_rematch TRAINER_CRUSH_GIRL_SHARON, Text_1C389F, Text_1898AB msgbox Text_1898C4, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1898F0, Text_18991B + trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, Text_1898F0, Text_18991B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABD8C + goto_if_eq EventScript_1ABD8C msgbox Text_18992C, MSGBOX_AUTOCLOSE end EventScript_1ABD8C:: @ 81ABD8C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1C38CA, Text_18991B + trainerbattle_rematch TRAINER_CRUSH_GIRL_TANYA, Text_1C38CA, Text_18991B msgbox Text_18992C, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_SHEA, 0, Text_189950, Text_18998C + trainerbattle_single TRAINER_BLACK_BELT_SHEA, Text_189950, Text_18998C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABDCA + goto_if_eq EventScript_1ABDCA msgbox Text_189998, MSGBOX_AUTOCLOSE end EventScript_1ABDCA:: @ 81ABDCA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BLACK_BELT_SHEA, 0, Text_1C38FA, Text_18998C + trainerbattle_rematch TRAINER_BLACK_BELT_SHEA, Text_1C38FA, Text_18998C msgbox Text_189998, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HUGH, 0, Text_1899CE, Text_189A0A + trainerbattle_single TRAINER_BLACK_BELT_HUGH, Text_1899CE, Text_189A0A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABE08 + goto_if_eq EventScript_1ABE08 msgbox Text_189A13, MSGBOX_AUTOCLOSE end EventScript_1ABE08:: @ 81ABE08 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BLACK_BELT_HUGH, 0, Text_1C3943, Text_189A0A + trainerbattle_rematch TRAINER_BLACK_BELT_HUGH, Text_1C3943, Text_189A0A msgbox Text_189A13, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_BRYCE, 0, Text_189A53, Text_189A92 + trainerbattle_single TRAINER_CAMPER_BRYCE, Text_189A53, Text_189A92 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABE46 + goto_if_eq EventScript_1ABE46 msgbox Text_189A9F, MSGBOX_AUTOCLOSE end EventScript_1ABE46:: @ 81ABE46 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CAMPER_BRYCE, 0, Text_1C3987, Text_189A92 + trainerbattle_rematch TRAINER_CAMPER_BRYCE, Text_1C3987, Text_189A92 msgbox Text_189A9F, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CLAIRE, 0, Text_189ACB, Text_189B0B + trainerbattle_single TRAINER_PICNICKER_CLAIRE, Text_189ACB, Text_189B0B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABE84 + goto_if_eq EventScript_1ABE84 msgbox Text_189B24, MSGBOX_AUTOCLOSE end EventScript_1ABE84:: @ 81ABE84 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PICNICKER_CLAIRE, 0, Text_1C39C6, Text_189B0B + trainerbattle_rematch TRAINER_PICNICKER_CLAIRE, Text_1C39C6, Text_189B0B msgbox Text_189B24, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189B4D, Text_189B84, Text_189BDE + trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABEC6 + goto_if_eq EventScript_1ABEC6 msgbox Text_189BA3, MSGBOX_AUTOCLOSE end EventScript_1ABEC6:: @ 81ABEC6 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A05, Text_189B84, Text_189BDE + trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, Text_1C3A05, Text_189B84, Text_189BDE msgbox Text_189BA3, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189C33, Text_189C62, Text_189CAB + trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABF0C + goto_if_eq EventScript_1ABF0C msgbox Text_189C7E, MSGBOX_AUTOCLOSE end EventScript_1ABF0C:: @ 81ABF0C - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A55, Text_189C62, Text_189CAB + trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, Text_1C3A55, Text_189C62, Text_189CAB msgbox Text_189C7E, MSGBOX_AUTOCLOSE end OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_189D5A, Text_189D8B + trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, Text_189D5A, Text_189D8B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABF4E + goto_if_eq EventScript_1ABF4E msgbox Text_189DA3, MSGBOX_AUTOCLOSE end EventScript_1ABF4E:: @ 81ABF4E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_1C3773, Text_189D8B + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_AMARA, Text_1C3773, Text_189D8B msgbox Text_189DA3, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_NIKKI, 0, Text_189E42, Text_189E72 + trainerbattle_single TRAINER_AROMA_LADY_NIKKI, Text_189E42, Text_189E72 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABF8C + goto_if_eq EventScript_1ABF8C msgbox Text_189E9E, MSGBOX_AUTOCLOSE end EventScript_1ABF8C:: @ 81ABF8C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_NIKKI, 0, Text_1C3AA7, Text_189E72 + trainerbattle_rematch TRAINER_AROMA_LADY_NIKKI, Text_1C3AA7, Text_189E72 msgbox Text_189E9E, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_VIOLET, 0, Text_189ED4, Text_189EFA + trainerbattle_single TRAINER_AROMA_LADY_VIOLET, Text_189ED4, Text_189EFA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ABFCA + goto_if_eq EventScript_1ABFCA msgbox Text_189F21, MSGBOX_AUTOCLOSE end EventScript_1ABFCA:: @ 81ABFCA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_VIOLET, 0, Text_1C3ABF, Text_189EFA + trainerbattle_rematch TRAINER_AROMA_LADY_VIOLET, Text_1C3ABF, Text_189EFA msgbox Text_189F21, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_AMIRA, 0, Text_189F63, Text_189F9A + trainerbattle_single TRAINER_TUBER_AMIRA, Text_189F63, Text_189F9A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC008 + goto_if_eq EventScript_1AC008 msgbox Text_189FA8, MSGBOX_AUTOCLOSE end EventScript_1AC008:: @ 81AC008 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TUBER_AMIRA, 0, Text_1C3AF2, Text_189F9A + trainerbattle_rematch TRAINER_TUBER_AMIRA, Text_1C3AF2, Text_189F9A msgbox Text_189FA8, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_ALEXIS, 0, Text_189FDB, Text_189FEE + trainerbattle_single TRAINER_TUBER_ALEXIS, Text_189FDB, Text_189FEE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC046 + goto_if_eq EventScript_1AC046 msgbox Text_18A000, MSGBOX_AUTOCLOSE end EventScript_1AC046:: @ 81AC046 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TUBER_ALEXIS, 0, Text_1C3B1D, Text_189FEE + trainerbattle_rematch TRAINER_TUBER_ALEXIS, Text_1C3B1D, Text_189FEE msgbox Text_18A000, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_18A01F, Text_18A053 + trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, Text_18A01F, Text_18A053 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC084 + goto_if_eq EventScript_1AC084 msgbox Text_18A082, MSGBOX_AUTOCLOSE end EventScript_1AC084:: @ 81AC084 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_1C3B30, Text_18A053 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TISHA, Text_1C3B30, Text_18A053 msgbox Text_18A082, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A0C4, Text_18A0F7, Text_18A138 + trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC0C6 + goto_if_eq EventScript_1AC0C6 msgbox Text_18A106, MSGBOX_AUTOCLOSE end EventScript_1AC0C6:: @ 81AC0C6 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B6E, Text_18A0F7, Text_18A138 + trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, Text_1C3B6E, Text_18A0F7, Text_18A138 msgbox Text_18A106, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A179, Text_18A1A3, Text_18A1CD + trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC10C + goto_if_eq EventScript_1AC10C msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end EventScript_1AC10C:: @ 81AC10C - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B99, Text_18A1A3, Text_18A1CD + trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, Text_1C3B99, Text_18A1A3, Text_18A1CD msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_DAISY, 0, Text_18A3E2, Text_18A40E + trainerbattle_single TRAINER_PAINTER_DAISY, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC14E + goto_if_eq EventScript_1AC14E msgbox Text_18A430, MSGBOX_AUTOCLOSE end EventScript_1AC14E:: @ 81AC14E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_DAISY, 0, Text_1C3BF6, Text_18A40E + trainerbattle_rematch TRAINER_PAINTER_DAISY, Text_1C3BF6, Text_18A40E msgbox Text_18A430, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_CELINA, 0, Text_18A461, Text_18A49E + trainerbattle_single TRAINER_PAINTER_CELINA, Text_18A461, Text_18A49E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC18C + goto_if_eq EventScript_1AC18C msgbox Text_18A4C6, MSGBOX_AUTOCLOSE end EventScript_1AC18C:: @ 81AC18C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_CELINA, 0, Text_1C3C28, Text_18A49E + trainerbattle_rematch TRAINER_PAINTER_CELINA, Text_1C3C28, Text_18A49E msgbox Text_18A4C6, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_RAYNA, 0, Text_18A50E, Text_18A535 + trainerbattle_single TRAINER_PAINTER_RAYNA, Text_18A50E, Text_18A535 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC1CA + goto_if_eq EventScript_1AC1CA msgbox Text_18A555, MSGBOX_AUTOCLOSE end EventScript_1AC1CA:: @ 81AC1CA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_RAYNA, 0, Text_1C3C70, Text_18A535 + trainerbattle_rematch TRAINER_PAINTER_RAYNA, Text_1C3C70, Text_18A535 msgbox Text_18A555, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_JACKI, 0, Text_18A5B9, Text_18A5EE + trainerbattle_single TRAINER_LADY_JACKI, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC208 + goto_if_eq EventScript_1AC208 msgbox Text_18A601, MSGBOX_AUTOCLOSE end EventScript_1AC208:: @ 81AC208 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LADY_JACKI, 0, Text_1C3CB0, Text_18A5EE + trainerbattle_rematch TRAINER_LADY_JACKI, Text_1C3CB0, Text_18A5EE msgbox Text_18A601, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_GILLIAN, 0, Text_18A645, Text_18A67F + trainerbattle_single TRAINER_LADY_GILLIAN, Text_18A645, Text_18A67F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC246 + goto_if_eq EventScript_1AC246 msgbox Text_18A699, MSGBOX_AUTOCLOSE end EventScript_1AC246:: @ 81AC246 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_LADY_GILLIAN, 0, Text_1C3CF1, Text_18A67F + trainerbattle_rematch TRAINER_LADY_GILLIAN, Text_1C3CF1, Text_18A67F msgbox Text_18A699, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DESTIN, 0, Text_18A6DA, Text_18A6FE + trainerbattle_single TRAINER_YOUNGSTER_DESTIN, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC284 + goto_if_eq EventScript_1AC284 msgbox Text_18A715, MSGBOX_AUTOCLOSE end EventScript_1AC284:: @ 81AC284 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_YOUNGSTER_DESTIN, 0, Text_1C3D47, Text_18A6FE + trainerbattle_rematch TRAINER_YOUNGSTER_DESTIN, Text_1C3D47, Text_18A6FE msgbox Text_18A715, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TOBY, 0, Text_18A74A, Text_18A786 + trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, Text_18A74A, Text_18A786 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC2C2 + goto_if_eq EventScript_1AC2C2 msgbox Text_18A7AC, MSGBOX_AUTOCLOSE end EventScript_1AC2C2:: @ 81AC2C2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_TOBY, 0, Text_1C3D73, Text_18A786 + trainerbattle_rematch TRAINER_SWIMMER_MALE_TOBY, Text_1C3D73, Text_18A786 msgbox Text_18A7AC, MSGBOX_AUTOCLOSE end FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_18AAD5, Text_18AB0B + trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC300 + goto_if_eq EventScript_1AC300 msgbox Text_18AB37, MSGBOX_AUTOCLOSE end EventScript_1AC300:: @ 81AC300 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_1C3BB7, Text_18AB0B + trainerbattle_rematch TRAINER_PKMN_BREEDER_ALIZE, Text_1C3BB7, Text_18AB0B msgbox Text_18AB37, MSGBOX_AUTOCLOSE end FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MILO, 0, Text_18AE50, Text_18AEA8 + trainerbattle_single TRAINER_BIRD_KEEPER_MILO, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC33E + goto_if_eq EventScript_1AC33E msgbox Text_18AEB6, MSGBOX_AUTOCLOSE end EventScript_1AC33E:: @ 81AC33E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_MILO, 0, Text_1C3DA2, Text_18AEA8 + trainerbattle_rematch TRAINER_BIRD_KEEPER_MILO, Text_1C3DA2, Text_18AEA8 msgbox Text_18AEB6, MSGBOX_AUTOCLOSE end FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_18AEDC, Text_18AF39 + trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC37C + goto_if_eq EventScript_1AC37C msgbox Text_18AF45, MSGBOX_AUTOCLOSE end EventScript_1AC37C:: @ 81AC37C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_1C3E0F, Text_18AF39 + trainerbattle_rematch TRAINER_BIRD_KEEPER_CHAZ, Text_1C3E0F, Text_18AF39 msgbox Text_18AF45, MSGBOX_AUTOCLOSE end FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_18AF72, Text_18AFCC + trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC3BA + goto_if_eq EventScript_1AC3BA msgbox Text_18AFF2, MSGBOX_AUTOCLOSE end EventScript_1AC3BA:: @ 81AC3BA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_1C3E6A, Text_18AFCC + trainerbattle_rematch TRAINER_BIRD_KEEPER_HAROLD, Text_1C3E6A, Text_18AFCC msgbox Text_18AFF2, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TYLOR, 0, Text_18B400, Text_18B43B + trainerbattle_single TRAINER_FISHERMAN_TYLOR, Text_18B400, Text_18B43B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC3F8 + goto_if_eq EventScript_1AC3F8 msgbox Text_18B451, MSGBOX_AUTOCLOSE end EventScript_1AC3F8:: @ 81AC3F8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_FISHERMAN_TYLOR, 0, Text_1C3ED0, Text_18B43B + trainerbattle_rematch TRAINER_FISHERMAN_TYLOR, Text_1C3ED0, Text_18B43B msgbox Text_18B451, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MYMO, 0, Text_18B48F, Text_18B4C5 + trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC436 + goto_if_eq EventScript_1AC436 msgbox Text_18B4D1, MSGBOX_AUTOCLOSE end EventScript_1AC436:: @ 81AC436 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_MYMO, 0, Text_1C3F11, Text_18B4C5 + trainerbattle_rematch TRAINER_SWIMMER_MALE_MYMO, Text_1C3F11, Text_18B4C5 msgbox Text_18B4D1, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_18B4FA, Text_18B539 + trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC474 + goto_if_eq EventScript_1AC474 msgbox Text_18B573, MSGBOX_AUTOCLOSE end EventScript_1AC474:: @ 81AC474 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_1C3F51, Text_18B539 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NICOLE, Text_1C3F51, Text_18B539 msgbox Text_18B573, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B5C8, Text_18B5F4, Text_18B660 + trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC4B6 + goto_if_eq EventScript_1AC4B6 msgbox Text_18B62E, MSGBOX_AUTOCLOSE end EventScript_1AC4B6:: @ 81AC4B6 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3F7B, Text_18B5F4, Text_18B660 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_1C3F7B, Text_18B5F4, Text_18B660 msgbox Text_18B62E, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B6C1, Text_18B6EF, Text_18B762 + trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC4FC + goto_if_eq EventScript_1AC4FC msgbox Text_18B720, MSGBOX_AUTOCLOSE end EventScript_1AC4FC:: @ 81AC4FC - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3FB3, Text_18B6EF, Text_18B762 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_1C3FB3, Text_18B6EF, Text_18B762 msgbox Text_18B720, MSGBOX_AUTOCLOSE end SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JACLYN, 0, Text_18B7B0, Text_18B7F0 + trainerbattle_single TRAINER_PSYCHIC_JACLYN, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC53E + goto_if_eq EventScript_1AC53E msgbox Text_18B7FD, MSGBOX_AUTOCLOSE end EventScript_1AC53E:: @ 81AC53E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_JACLYN, 0, Text_1C3FE9, Text_18B7F0 + trainerbattle_rematch TRAINER_PSYCHIC_JACLYN, Text_1C3FE9, Text_18B7F0 msgbox Text_18B7FD, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_ROSE, 0, Text_18B896, Text_18B8C8 + trainerbattle_single TRAINER_AROMA_LADY_ROSE, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC57C + goto_if_eq EventScript_1AC57C msgbox Text_18B8F7, MSGBOX_AUTOCLOSE end EventScript_1AC57C:: @ 81AC57C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_ROSE, 0, Text_1C4028, Text_18B8C8 + trainerbattle_rematch TRAINER_AROMA_LADY_ROSE, Text_1C4028, Text_18B8C8 msgbox Text_18B8F7, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_EDWARD, 0, Text_18B959, Text_18B988 + trainerbattle_single TRAINER_JUGGLER_EDWARD, Text_18B959, Text_18B988 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC5BA + goto_if_eq EventScript_1AC5BA msgbox Text_18B9A5, MSGBOX_AUTOCLOSE end EventScript_1AC5BA:: @ 81AC5BA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_JUGGLER_EDWARD, 0, Text_1C4057, Text_18B988 + trainerbattle_rematch TRAINER_JUGGLER_EDWARD, Text_1C4057, Text_18B988 msgbox Text_18B9A5, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_18B9EC, Text_18BA47 + trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC5F8 + goto_if_eq EventScript_1AC5F8 msgbox Text_18BA57, MSGBOX_AUTOCLOSE end EventScript_1AC5F8:: @ 81AC5F8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_1C407F, Text_18BA47 + trainerbattle_rematch TRAINER_SWIMMER_MALE_SAMIR, Text_1C407F, Text_18BA47 msgbox Text_18BA57, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_18BA86, Text_18BAC0 + trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC636 + goto_if_eq EventScript_1AC636 msgbox Text_18BAE0, MSGBOX_AUTOCLOSE end EventScript_1AC636:: @ 81AC636 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_1C40D9, Text_18BAC0 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_DENISE, Text_1C40D9, Text_18BAC0 msgbox Text_18BAE0, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 + trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC678 + goto_if_eq EventScript_1AC678 msgbox Text_18BBF6, MSGBOX_AUTOCLOSE end EventScript_1AC678:: @ 81AC678 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_1C4138, Text_18BBE2, Text_18BC24 + trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, Text_1C4138, Text_18BBE2, Text_18BC24 msgbox Text_18BBF6, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BC5A, Text_18BC84, Text_18BCCF + trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC6BE + goto_if_eq EventScript_1AC6BE msgbox Text_18BCAE, MSGBOX_AUTOCLOSE end EventScript_1AC6BE:: @ 81AC6BE - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_1C4166, Text_18BC84, Text_18BCCF + trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, Text_1C4166, Text_18BC84, Text_18BCCF msgbox Text_18BCAE, MSGBOX_AUTOCLOSE end SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_EARL, 0, Text_18BB2D, Text_18BB62 + trainerbattle_single TRAINER_HIKER_EARL, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC700 + goto_if_eq EventScript_1AC700 msgbox Text_18BB8B, MSGBOX_AUTOCLOSE end EventScript_1AC700:: @ 81AC700 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_EARL, 0, Text_1C40FA, Text_18BB62 + trainerbattle_rematch TRAINER_HIKER_EARL, Text_1C40FA, Text_18BB62 msgbox Text_18BB8B, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_STANLY, 0, Text_18BE5D, Text_18BE9B + trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC73E + goto_if_eq EventScript_1AC73E msgbox Text_18BEA0, MSGBOX_AUTOCLOSE end EventScript_1AC73E:: @ 81AC73E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_STANLY, 0, Text_1C4196, Text_18BE9B + trainerbattle_rematch TRAINER_RUIN_MANIAC_STANLY, Text_1C4196, Text_18BE9B msgbox Text_18BEA0, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_18BF05, Text_18BF33 + trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC77C + goto_if_eq EventScript_1AC77C msgbox Text_18BF6C, MSGBOX_AUTOCLOSE end EventScript_1AC77C:: @ 81AC77C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_1C41D4, Text_18BF33 + trainerbattle_rematch TRAINER_RUIN_MANIAC_FOSTER, Text_1C41D4, Text_18BF33 msgbox Text_18BF6C, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LARRY, 0, Text_18BFC5, Text_18C03B + trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC7BA + goto_if_eq EventScript_1AC7BA msgbox Text_18C04C, MSGBOX_AUTOCLOSE end EventScript_1AC7BA:: @ 81AC7BA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_LARRY, 0, Text_1C4210, Text_18C03B + trainerbattle_rematch TRAINER_RUIN_MANIAC_LARRY, Text_1C4210, Text_18C03B msgbox Text_18C04C, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DARYL, 0, Text_18C09C, Text_18C0BB + trainerbattle_single TRAINER_HIKER_DARYL, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC7F8 + goto_if_eq EventScript_1AC7F8 msgbox Text_18C0EA, MSGBOX_AUTOCLOSE end EventScript_1AC7F8:: @ 81AC7F8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_HIKER_DARYL, 0, Text_1C4280, Text_18C0BB + trainerbattle_rematch TRAINER_HIKER_DARYL, Text_1C4280, Text_18C0BB msgbox Text_18C0EA, MSGBOX_AUTOCLOSE end SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HECTOR, 0, Text_18C10A, Text_18C140 + trainerbattle_single TRAINER_POKEMANIAC_HECTOR, Text_18C10A, Text_18C140 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC836 + goto_if_eq EventScript_1AC836 msgbox Text_18C17A, MSGBOX_AUTOCLOSE end EventScript_1AC836:: @ 81AC836 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_POKEMANIAC_HECTOR, 0, Text_1C42A0, Text_18C140 + trainerbattle_rematch TRAINER_POKEMANIAC_HECTOR, Text_1C42A0, Text_18C140 msgbox Text_18C17A, MSGBOX_AUTOCLOSE end SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_DARIO, 0, Text_18C1ED, Text_18C205 + trainerbattle_single TRAINER_PSYCHIC_DARIO, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC874 + goto_if_eq EventScript_1AC874 msgbox Text_18C20E, MSGBOX_AUTOCLOSE end EventScript_1AC874:: @ 81AC874 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_DARIO, 0, Text_1C42D6, Text_18C205 + trainerbattle_rematch TRAINER_PSYCHIC_DARIO, Text_1C42D6, Text_18C205 msgbox Text_18C20E, MSGBOX_AUTOCLOSE end SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_RODETTE, 0, Text_18C283, Text_18C2BC + trainerbattle_single TRAINER_PSYCHIC_RODETTE, Text_18C283, Text_18C2BC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC8B2 + goto_if_eq EventScript_1AC8B2 msgbox Text_18C2D5, MSGBOX_AUTOCLOSE end EventScript_1AC8B2:: @ 81AC8B2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PSYCHIC_RODETTE, 0, Text_1C42EE, Text_18C2BC + trainerbattle_rematch TRAINER_PSYCHIC_RODETTE, Text_1C42EE, Text_18C2BC msgbox Text_18C2D5, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_MIAH, 0, Text_18C3BC, Text_18C3E7 + trainerbattle_single TRAINER_AROMA_LADY_MIAH, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC8F0 + goto_if_eq EventScript_1AC8F0 msgbox Text_18C3FF, MSGBOX_AUTOCLOSE end EventScript_1AC8F0:: @ 81AC8F0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_AROMA_LADY_MIAH, 0, Text_1C4327, Text_18C3E7 + trainerbattle_rematch TRAINER_AROMA_LADY_MIAH, Text_1C4327, Text_18C3E7 msgbox Text_18C3FF, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C632, Text_18C662, Text_18C6AB + trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC932 + goto_if_eq EventScript_1AC932 msgbox Text_18C683, MSGBOX_AUTOCLOSE end EventScript_1AC932:: @ 81AC932 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C4416, Text_18C662, Text_18C6AB + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_1C4416, Text_18C662, Text_18C6AB msgbox Text_18C683, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C700, Text_18C73B, Text_18C7BD + trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC978 + goto_if_eq EventScript_1AC978 msgbox Text_18C773, MSGBOX_AUTOCLOSE end EventScript_1AC978:: @ 81AC978 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C444C, Text_18C73B, Text_18C7BD + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_1C444C, Text_18C73B, Text_18C7BD msgbox Text_18C773, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_MASON, 0, Text_18C44B, Text_18C473 + trainerbattle_single TRAINER_JUGGLER_MASON, Text_18C44B, Text_18C473 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC9BA + goto_if_eq EventScript_1AC9BA msgbox Text_18C4BA, MSGBOX_AUTOCLOSE end EventScript_1AC9BA:: @ 81AC9BA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_JUGGLER_MASON, 0, Text_1C4374, Text_18C473 + trainerbattle_rematch TRAINER_JUGGLER_MASON, Text_1C4374, Text_18C473 msgbox Text_18C4BA, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_18C500, Text_18C543 + trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, Text_18C500, Text_18C543 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1AC9F8 + goto_if_eq EventScript_1AC9F8 msgbox Text_18C54B, MSGBOX_AUTOCLOSE end EventScript_1AC9F8:: @ 81AC9F8 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_1C43AD, Text_18C543 + trainerbattle_rematch TRAINER_PKMN_RANGER_NICOLAS, Text_1C43AD, Text_18C543 msgbox Text_18C54B, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_MADELINE, 0, Text_18C5AA, Text_18C5CD + trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACA36 + goto_if_eq EventScript_1ACA36 msgbox Text_18C5F5, MSGBOX_AUTOCLOSE end EventScript_1ACA36:: @ 81ACA36 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_MADELINE, 0, Text_1C43EC, Text_18C5CD + trainerbattle_rematch TRAINER_PKMN_RANGER_MADELINE, Text_1C43EC, Text_18C5CD msgbox Text_18C5F5, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_18C887, Text_18C8A6 + trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACA74 + goto_if_eq EventScript_1ACA74 msgbox Text_18C8C2, MSGBOX_AUTOCLOSE end EventScript_1ACA74:: @ 81ACA74 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_1C4491, Text_18C8A6 + trainerbattle_rematch TRAINER_CRUSH_GIRL_CYNDY, Text_1C4491, Text_18C8A6 msgbox Text_18C8C2, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EVAN, 0, Text_18C8FD, Text_18C980 + trainerbattle_single TRAINER_TAMER_EVAN, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACAB2 + goto_if_eq EventScript_1ACAB2 msgbox Text_18C999, MSGBOX_AUTOCLOSE end EventScript_1ACAB2:: @ 81ACAB2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_TAMER_EVAN, 0, Text_1C44CB, Text_18C980 + trainerbattle_rematch TRAINER_TAMER_EVAN, Text_1C44CB, Text_18C980 msgbox Text_18C999, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_JACKSON, 0, Text_18CA2F, Text_18CA6F + trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACAF0 + goto_if_eq EventScript_1ACAF0 msgbox Text_18CA9C, MSGBOX_AUTOCLOSE end EventScript_1ACAF0:: @ 81ACAF0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_JACKSON, 0, Text_1C454E, Text_18CA6F + trainerbattle_rematch TRAINER_PKMN_RANGER_JACKSON, Text_1C454E, Text_18CA6F msgbox Text_18CA9C, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_KATELYN, 0, Text_18CB16, Text_18CB3E + trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACB2E + goto_if_eq EventScript_1ACB2E msgbox Text_18CB6C, MSGBOX_AUTOCLOSE end EventScript_1ACB2E:: @ 81ACB2E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PKMN_RANGER_KATELYN, 0, Text_1C458E, Text_18CB3E + trainerbattle_rematch TRAINER_PKMN_RANGER_KATELYN, Text_1C458E, Text_18CB3E msgbox Text_18CB6C, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_LEROY, 0, Text_18CBB4, Text_18CBE0 + trainerbattle_single TRAINER_COOLTRAINER_LEROY, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACB6C + goto_if_eq EventScript_1ACB6C msgbox Text_18CC09, MSGBOX_AUTOCLOSE end EventScript_1ACB6C:: @ 81ACB6C - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_COOLTRAINER_LEROY, 0, Text_1C45C2, Text_18CBE0 + trainerbattle_rematch TRAINER_COOLTRAINER_LEROY, Text_1C45C2, Text_18CBE0 msgbox Text_18CC09, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MICHELLE, 0, Text_18CC4F, Text_18CCAE + trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACBAA + goto_if_eq EventScript_1ACBAA msgbox Text_18CCEA, MSGBOX_AUTOCLOSE end EventScript_1ACBAA:: @ 81ACBAA - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_COOLTRAINER_MICHELLE, 0, Text_1C45FB, Text_18CCAE + trainerbattle_rematch TRAINER_COOLTRAINER_MICHELLE, Text_1C45FB, Text_18CCAE msgbox Text_18CCEA, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CD49, Text_18CD75, Text_18CDE2 + trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACBEC + goto_if_eq EventScript_1ACBEC msgbox Text_18CD9C, MSGBOX_AUTOCLOSE end EventScript_1ACBEC:: @ 81ACBEC - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4662, Text_18CD75, Text_18CDE2 + trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, Text_1C4662, Text_18CD75, Text_18CDE2 msgbox Text_18CD9C, MSGBOX_AUTOCLOSE end SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 + trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACC32 + goto_if_eq EventScript_1ACC32 msgbox Text_18CE78, MSGBOX_AUTOCLOSE end EventScript_1ACC32:: @ 81ACC32 - trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4699, Text_18CE5A, Text_18CEF4 + trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, Text_1C4699, Text_18CE5A, Text_18CEF4 msgbox Text_18CE78, MSGBOX_AUTOCLOSE end SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_18CFFB, Text_18D02A + trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, Text_18CFFB, Text_18D02A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACC74 + goto_if_eq EventScript_1ACC74 msgbox Text_18D061, MSGBOX_AUTOCLOSE end EventScript_1ACC74:: @ 81ACC74 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_1C46D3, Text_18D02A + trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, Text_1C46D3, Text_18D02A msgbox Text_18D061, MSGBOX_AUTOCLOSE end SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_18D0D9, Text_18D108 + trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, Text_18D0D9, Text_18D108 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACCB2 + goto_if_eq EventScript_1ACCB2 msgbox Text_18D125, MSGBOX_AUTOCLOSE end EventScript_1ACCB2:: @ 81ACCB2 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_1C470A, Text_18D108 + trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, Text_1C470A, Text_18D108 msgbox Text_18D125, MSGBOX_AUTOCLOSE end SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_EDNA, 0, Text_18D18F, Text_18D1B5 + trainerbattle_single TRAINER_PAINTER_EDNA, Text_18D18F, Text_18D1B5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACCF0 + goto_if_eq EventScript_1ACCF0 msgbox Text_18D1E3, MSGBOX_AUTOCLOSE end EventScript_1ACCF0:: @ 81ACCF0 - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_PAINTER_EDNA, 0, Text_1C4739, Text_18D1B5 + trainerbattle_rematch TRAINER_PAINTER_EDNA, Text_1C4739, Text_18D1B5 msgbox Text_18D1E3, MSGBOX_AUTOCLOSE end SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_18D22F, Text_18D26D + trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, Text_18D22F, Text_18D26D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if eq, EventScript_1ACD2E + goto_if_eq EventScript_1ACD2E msgbox Text_18D284, MSGBOX_AUTOCLOSE end EventScript_1ACD2E:: @ 81ACD2E - trainerbattle TRAINER_BATTLE_REMATCH, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_1C476A, Text_18D26D + trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, Text_1C476A, Text_18D26D msgbox Text_18D284, MSGBOX_AUTOCLOSE end From 29e4446a03b83a822f5dd8b11b60728cadbcb0f6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 01:45:31 -0500 Subject: [PATCH 12/20] Use MSGBOX constants --- data/maps/CeladonCity/scripts.inc | 28 ++++++------- .../CeladonCity_Condominiums_1F/scripts.inc | 2 +- .../CeladonCity_Condominiums_2F/scripts.inc | 2 +- .../CeladonCity_Condominiums_3F/scripts.inc | 14 +++---- .../CeladonCity_Condominiums_Roof/scripts.inc | 2 +- .../scripts.inc | 8 ++-- .../scripts.inc | 6 +-- .../scripts.inc | 6 +-- .../scripts.inc | 22 +++++----- .../scripts.inc | 6 +-- .../scripts.inc | 6 +-- .../scripts.inc | 6 +-- data/maps/CeladonCity_GameCorner/scripts.inc | 12 +++--- .../scripts.inc | 14 +++---- data/maps/CeladonCity_Gym/scripts.inc | 14 +++---- data/maps/CeladonCity_Hotel/scripts.inc | 8 ++-- data/maps/CeladonCity_House1/scripts.inc | 6 +-- .../CeladonCity_PokemonCenter_1F/scripts.inc | 6 +-- data/maps/CeladonCity_Restaurant/scripts.inc | 8 ++-- data/maps/CeruleanCity/scripts.inc | 12 +++--- data/maps/CeruleanCity_BikeShop/scripts.inc | 4 +- data/maps/CeruleanCity_Gym/scripts.inc | 4 +- data/maps/CeruleanCity_House2/scripts.inc | 4 +- data/maps/CeruleanCity_House3/scripts.inc | 4 +- data/maps/CeruleanCity_House5/scripts.inc | 6 +-- data/maps/CeruleanCity_Mart/scripts.inc | 4 +- .../CeruleanCity_PokemonCenter_1F/scripts.inc | 6 +-- data/maps/CinnabarIsland/scripts.inc | 10 ++--- data/maps/CinnabarIsland_Gym/scripts.inc | 38 +++++++++--------- data/maps/CinnabarIsland_Mart/scripts.inc | 4 +- .../scripts.inc | 8 ++-- .../scripts.inc | 10 ++--- .../scripts.inc | 12 +++--- .../scripts.inc | 6 +-- .../scripts.inc | 6 +-- .../DiglettsCave_NorthEntrance/scripts.inc | 2 +- .../DiglettsCave_SouthEntrance/scripts.inc | 2 +- data/maps/FiveIsland/scripts.inc | 6 +-- data/maps/FiveIsland_House1/scripts.inc | 2 +- data/maps/FiveIsland_House2/scripts.inc | 2 +- .../FiveIsland_LostCave_Room1/scripts.inc | 2 +- .../FiveIsland_LostCave_Room4/scripts.inc | 2 +- data/maps/FiveIsland_Meadow/scripts.inc | 6 +-- .../FiveIsland_MemorialPillar/scripts.inc | 2 +- .../FiveIsland_PokemonCenter_1F/scripts.inc | 4 +- .../FiveIsland_ResortGorgeous/scripts.inc | 2 +- .../scripts.inc | 2 +- .../FiveIsland_RocketWarehouse/scripts.inc | 16 ++++---- data/maps/FourIsland/scripts.inc | 10 ++--- data/maps/FourIsland_House1/scripts.inc | 2 +- .../FourIsland_IcefallCave_Back/scripts.inc | 2 +- data/maps/FourIsland_Mart/scripts.inc | 2 +- .../FourIsland_PokemonCenter_1F/scripts.inc | 6 +-- .../FourIsland_PokemonDayCare/scripts.inc | 14 +++---- data/maps/FuchsiaCity/scripts.inc | 18 ++++----- data/maps/FuchsiaCity_Building1/scripts.inc | 8 ++-- data/maps/FuchsiaCity_Gym/scripts.inc | 12 +++--- data/maps/FuchsiaCity_House1/scripts.inc | 4 +- data/maps/FuchsiaCity_House2/scripts.inc | 2 +- data/maps/FuchsiaCity_House3/scripts.inc | 4 +- data/maps/FuchsiaCity_Mart/scripts.inc | 4 +- .../FuchsiaCity_PokemonCenter_1F/scripts.inc | 6 +-- .../scripts.inc | 6 +-- data/maps/FuchsiaCity_ZooBuilding/scripts.inc | 8 ++-- .../scripts.inc | 2 +- data/maps/LavenderTown/scripts.inc | 14 +++---- data/maps/LavenderTown_House2/scripts.inc | 12 +++--- data/maps/LavenderTown_Mart/scripts.inc | 6 +-- .../LavenderTown_PokemonCenter_1F/scripts.inc | 6 +-- .../scripts.inc | 4 +- data/maps/MtEmber_Exterior/scripts.inc | 6 +-- data/maps/MtMoon_1F/scripts.inc | 16 ++++---- data/maps/MtMoon_B2F/scripts.inc | 12 +++--- data/maps/OneIsland/scripts.inc | 6 +-- data/maps/OneIsland_House1/scripts.inc | 4 +- data/maps/OneIsland_House2/scripts.inc | 2 +- data/maps/OneIsland_KindleRoad/scripts.inc | 4 +- .../OneIsland_KindleRoad_EmberSpa/scripts.inc | 8 ++-- .../OneIsland_PokemonCenter_1F/scripts.inc | 8 ++-- data/maps/OneIsland_TreasureBeach/scripts.inc | 2 +- data/maps/PalletTown/scripts.inc | 8 ++-- data/maps/PalletTown_GarysHouse/scripts.inc | 8 ++-- .../PalletTown_PlayersHouse_2F/scripts.inc | 4 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 22 +++++----- data/maps/PewterCity/scripts.inc | 14 +++---- data/maps/PewterCity_Gym/scripts.inc | 6 +-- data/maps/PewterCity_House1/scripts.inc | 2 +- data/maps/PewterCity_House2/scripts.inc | 4 +- data/maps/PewterCity_Mart/scripts.inc | 4 +- data/maps/PewterCity_Museum_1F/scripts.inc | 12 +++--- data/maps/PewterCity_Museum_2F/scripts.inc | 14 +++---- .../PewterCity_PokemonCenter_1F/scripts.inc | 6 +-- data/maps/PokemonMansion_1F/scripts.inc | 4 +- data/maps/PokemonMansion_2F/scripts.inc | 6 +-- data/maps/PokemonMansion_3F/scripts.inc | 6 +-- data/maps/PokemonMansion_B1F/scripts.inc | 6 +-- data/maps/PokemonTower_1F/scripts.inc | 8 ++-- data/maps/PokemonTower_2F/scripts.inc | 2 +- data/maps/PokemonTower_3F/scripts.inc | 6 +-- data/maps/PokemonTower_4F/scripts.inc | 6 +-- data/maps/PokemonTower_5F/scripts.inc | 10 ++--- data/maps/PokemonTower_6F/scripts.inc | 6 +-- data/maps/PokemonTower_7F/scripts.inc | 6 +-- data/maps/RockTunnel_1F/scripts.inc | 16 ++++---- data/maps/RockTunnel_B1F/scripts.inc | 16 ++++---- data/maps/RocketHideout_B1F/scripts.inc | 10 ++--- data/maps/RocketHideout_B2F/scripts.inc | 2 +- data/maps/RocketHideout_B3F/scripts.inc | 4 +- data/maps/RocketHideout_B4F/scripts.inc | 4 +- data/maps/Route1/scripts.inc | 4 +- data/maps/Route10/scripts.inc | 6 +-- .../maps/Route10_PokemonCenter_1F/scripts.inc | 8 ++-- data/maps/Route11/scripts.inc | 2 +- data/maps/Route11_EastEntrance_1F/scripts.inc | 4 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 6 +-- data/maps/Route12/scripts.inc | 6 +-- data/maps/Route12_FishingHouse/scripts.inc | 2 +- .../maps/Route12_NorthEntrance_1F/scripts.inc | 2 +- .../maps/Route12_NorthEntrance_2F/scripts.inc | 4 +- data/maps/Route13/scripts.inc | 6 +-- data/maps/Route14/scripts.inc | 2 +- data/maps/Route15/scripts.inc | 2 +- data/maps/Route15_WestEntrance_1F/scripts.inc | 2 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 4 +- data/maps/Route16/scripts.inc | 6 +-- .../maps/Route16_NorthEntrance_1F/scripts.inc | 4 +- .../maps/Route16_NorthEntrance_2F/scripts.inc | 10 ++--- data/maps/Route17/scripts.inc | 12 +++--- data/maps/Route18/scripts.inc | 4 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 2 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 6 +-- data/maps/Route19/scripts.inc | 2 +- data/maps/Route2/scripts.inc | 4 +- data/maps/Route20/scripts.inc | 2 +- data/maps/Route22/scripts.inc | 2 +- data/maps/Route23/scripts.inc | 2 +- data/maps/Route25/scripts.inc | 4 +- data/maps/Route25_SeaCottage/scripts.inc | 2 +- data/maps/Route2_EastBuilding/scripts.inc | 4 +- data/maps/Route2_House/scripts.inc | 4 +- .../scripts.inc | 6 +-- .../scripts.inc | 4 +- data/maps/Route3/scripts.inc | 4 +- data/maps/Route4/scripts.inc | 6 +-- data/maps/Route4_PokemonCenter_1F/scripts.inc | 10 ++--- data/maps/Route5/scripts.inc | 2 +- data/maps/Route5_SouthEntrance/scripts.inc | 2 +- data/maps/Route6/scripts.inc | 2 +- data/maps/Route6_NorthEntrance/scripts.inc | 2 +- data/maps/Route7/scripts.inc | 2 +- data/maps/Route7_EastEntrance/scripts.inc | 2 +- data/maps/Route8/scripts.inc | 2 +- data/maps/Route8_WestEntrance/scripts.inc | 2 +- data/maps/Route9/scripts.inc | 2 +- data/maps/SSAnne_1F_Corridor/scripts.inc | 4 +- data/maps/SSAnne_1F_Room1/scripts.inc | 2 +- data/maps/SSAnne_1F_Room2/scripts.inc | 6 +-- data/maps/SSAnne_1F_Room3/scripts.inc | 4 +- data/maps/SSAnne_1F_Room5/scripts.inc | 2 +- data/maps/SSAnne_1F_Room6/scripts.inc | 2 +- data/maps/SSAnne_1F_Room7/scripts.inc | 2 +- data/maps/SSAnne_2F_Corridor/scripts.inc | 2 +- data/maps/SSAnne_2F_Room2/scripts.inc | 4 +- data/maps/SSAnne_2F_Room3/scripts.inc | 4 +- data/maps/SSAnne_2F_Room4/scripts.inc | 4 +- data/maps/SSAnne_2F_Room5/scripts.inc | 4 +- data/maps/SSAnne_2F_Room6/scripts.inc | 4 +- data/maps/SSAnne_3F_Corridor/scripts.inc | 2 +- data/maps/SSAnne_B1F_Room1/scripts.inc | 4 +- data/maps/SSAnne_B1F_Room2/scripts.inc | 2 +- data/maps/SSAnne_B1F_Room3/scripts.inc | 2 +- data/maps/SSAnne_B1F_Room4/scripts.inc | 4 +- data/maps/SSAnne_B1F_Room5/scripts.inc | 2 +- data/maps/SSAnne_CaptainsOffice/scripts.inc | 4 +- data/maps/SSAnne_Deck/scripts.inc | 10 ++--- data/maps/SSAnne_Kitchen/scripts.inc | 12 +++--- data/maps/SafariZone_Building1/scripts.inc | 4 +- data/maps/SafariZone_Building2/scripts.inc | 6 +-- data/maps/SafariZone_Building3/scripts.inc | 6 +-- data/maps/SafariZone_Building4/scripts.inc | 6 +-- data/maps/SafariZone_Center/scripts.inc | 6 +-- data/maps/SafariZone_East/scripts.inc | 6 +-- data/maps/SafariZone_North/scripts.inc | 10 ++--- data/maps/SafariZone_West/scripts.inc | 8 ++-- data/maps/SaffronCity/scripts.inc | 40 +++++++++---------- data/maps/SaffronCity_Dojo/scripts.inc | 24 +++++------ data/maps/SaffronCity_Gym/scripts.inc | 14 +++---- data/maps/SaffronCity_House1_1F/scripts.inc | 4 +- data/maps/SaffronCity_House1_2F/scripts.inc | 4 +- data/maps/SaffronCity_House2/scripts.inc | 6 +-- data/maps/SaffronCity_Mart/scripts.inc | 4 +- .../SaffronCity_PokemonCenter_1F/scripts.inc | 4 +- data/maps/SeafoamIslands_B4F/scripts.inc | 4 +- data/maps/SevenIsland/scripts.inc | 6 +-- data/maps/SevenIsland_House_Room1/scripts.inc | 6 +-- data/maps/SevenIsland_Mart/scripts.inc | 6 +-- .../SevenIsland_PokemonCenter_1F/scripts.inc | 6 +-- .../SevenIsland_SevaultCanyon/scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../maps/SevenIsland_TrainerTower/scripts.inc | 4 +- .../scripts.inc | 4 +- data/maps/SilphCo_10F/scripts.inc | 6 +-- data/maps/SilphCo_11F/scripts.inc | 10 ++--- data/maps/SilphCo_1F/scripts.inc | 4 +- data/maps/SilphCo_2F/scripts.inc | 10 ++--- data/maps/SilphCo_3F/scripts.inc | 6 +-- data/maps/SilphCo_4F/scripts.inc | 8 ++-- data/maps/SilphCo_5F/scripts.inc | 16 ++++---- data/maps/SilphCo_6F/scripts.inc | 8 ++-- data/maps/SilphCo_7F/scripts.inc | 14 +++---- data/maps/SilphCo_8F/scripts.inc | 8 ++-- data/maps/SilphCo_9F/scripts.inc | 8 ++-- data/maps/SixIsland/scripts.inc | 6 +-- data/maps/SixIsland_GreenPath/scripts.inc | 4 +- data/maps/SixIsland_House/scripts.inc | 2 +- data/maps/SixIsland_Mart/scripts.inc | 2 +- data/maps/SixIsland_OutcastIsland/scripts.inc | 2 +- data/maps/SixIsland_PatternBush/scripts.inc | 24 +++++------ .../SixIsland_PokemonCenter_1F/scripts.inc | 4 +- data/maps/SixIsland_RuinValley/scripts.inc | 2 +- data/maps/SixIsland_WaterPath/scripts.inc | 4 +- .../SixIsland_WaterPath_House2/scripts.inc | 2 +- data/maps/ThreeIsland/scripts.inc | 10 ++--- data/maps/ThreeIsland_BerryForest/scripts.inc | 4 +- data/maps/ThreeIsland_BondBridge/scripts.inc | 4 +- data/maps/ThreeIsland_House1/scripts.inc | 2 +- data/maps/ThreeIsland_House2/scripts.inc | 2 +- data/maps/ThreeIsland_House3/scripts.inc | 2 +- data/maps/ThreeIsland_House4/scripts.inc | 4 +- data/maps/ThreeIsland_Mart/scripts.inc | 6 +-- .../ThreeIsland_PokemonCenter_1F/scripts.inc | 6 +-- data/maps/ThreeIsland_Port/scripts.inc | 2 +- data/maps/TwoIsland/scripts.inc | 16 ++++---- data/maps/TwoIsland_House/scripts.inc | 2 +- .../TwoIsland_PokemonCenter_1F/scripts.inc | 4 +- .../UndergroundPath_EastEntrance/scripts.inc | 2 +- .../UndergroundPath_NorthEntrance/scripts.inc | 2 +- .../UndergroundPath_SouthEntrance/scripts.inc | 2 +- .../UndergroundPath_WestEntrance/scripts.inc | 2 +- data/maps/VermilionCity/scripts.inc | 14 +++---- data/maps/VermilionCity_Gym/scripts.inc | 6 +-- data/maps/VermilionCity_House1/scripts.inc | 2 +- data/maps/VermilionCity_House2/scripts.inc | 2 +- data/maps/VermilionCity_House3/scripts.inc | 6 +-- data/maps/VermilionCity_Mart/scripts.inc | 4 +- .../scripts.inc | 6 +-- .../VermilionCity_PokemonFanClub/scripts.inc | 6 +-- data/maps/VictoryRoad_1F/scripts.inc | 4 +- data/maps/VictoryRoad_2F/scripts.inc | 10 ++--- data/maps/VictoryRoad_3F/scripts.inc | 12 +++--- data/maps/ViridianCity/scripts.inc | 18 ++++----- data/maps/ViridianCity_Gym/scripts.inc | 16 ++++---- data/maps/ViridianCity_House1/scripts.inc | 6 +-- data/maps/ViridianCity_House2/scripts.inc | 6 +-- data/maps/ViridianCity_Mart/scripts.inc | 4 +- .../ViridianCity_PokemonCenter_1F/scripts.inc | 6 +-- data/maps/ViridianForest/scripts.inc | 26 ++++++------ data/scripts/day_care.inc | 8 ++-- data/scripts/field_moves.inc | 36 ++++++++--------- data/scripts/surf.inc | 4 +- 261 files changed, 844 insertions(+), 844 deletions(-) diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index ba8a9fa51..225feeff6 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -7,7 +7,7 @@ CeladonCity_OnTransition:: @ 8166C95 end CeladonCity_EventScript_166C99:: @ 8166C99 - msgbox gUnknown_817FEC3, 2 + msgbox gUnknown_817FEC3, MSGBOX_NPC end CeladonCity_EventScript_166CA2:: @ 8166CA2 @@ -17,11 +17,11 @@ CeladonCity_EventScript_166CA2:: @ 8166CA2 end CeladonCity_EventScript_166CAD:: @ 8166CAD - msgbox gUnknown_817FF4A, 2 + msgbox gUnknown_817FF4A, MSGBOX_NPC end CeladonCity_EventScript_166CB6:: @ 8166CB6 - msgbox gUnknown_817FFC5, 2 + msgbox gUnknown_817FFC5, MSGBOX_NPC end CeladonCity_EventScript_166CBF:: @ 8166CBF @@ -52,27 +52,27 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC end CeladonCity_EventScript_166CFA:: @ 8166CFA - msgbox gUnknown_81800C2, 2 + msgbox gUnknown_81800C2, MSGBOX_NPC end CeladonCity_EventScript_166D03:: @ 8166D03 - msgbox gUnknown_818008C, 2 + msgbox gUnknown_818008C, MSGBOX_NPC end CeladonCity_EventScript_166D0C:: @ 8166D0C - msgbox gUnknown_8180300, 2 + msgbox gUnknown_8180300, MSGBOX_NPC end CeladonCity_EventScript_166D15:: @ 8166D15 - msgbox gUnknown_81804E1, 2 + msgbox gUnknown_81804E1, MSGBOX_NPC end CeladonCity_EventScript_166D1E:: @ 8166D1E - msgbox gUnknown_81800E1, 3 + msgbox gUnknown_81800E1, MSGBOX_SIGN end CeladonCity_EventScript_166D27:: @ 8166D27 - msgbox gUnknown_818017A, 3 + msgbox gUnknown_818017A, MSGBOX_SIGN end CeladonCity_EventScript_166D30:: @ 8166D30 @@ -83,21 +83,21 @@ CeladonCity_EventScript_166D30:: @ 8166D30 end CeladonCity_EventScript_166D48:: @ 8166D48 - msgbox gUnknown_81801E5, 3 + msgbox gUnknown_81801E5, MSGBOX_SIGN end CeladonCity_EventScript_166D51:: @ 8166D51 - msgbox gUnknown_81801F5, 3 + msgbox gUnknown_81801F5, MSGBOX_SIGN end CeladonCity_EventScript_166D5A:: @ 8166D5A - msgbox gUnknown_8180224, 3 + msgbox gUnknown_8180224, MSGBOX_SIGN end CeladonCity_EventScript_166D63:: @ 8166D63 - msgbox gUnknown_81802A4, 3 + msgbox gUnknown_81802A4, MSGBOX_SIGN end CeladonCity_EventScript_166D6C:: @ 8166D6C - msgbox gUnknown_81802CF, 3 + msgbox gUnknown_81802CF, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index f5afb1851..2842caec7 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -59,5 +59,5 @@ CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 end CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 - msgbox gUnknown_8196287, 3 + msgbox gUnknown_8196287, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc index cab71a823..53c0a90c0 100644 --- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -2,5 +2,5 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 .byte 0 CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 - msgbox gUnknown_81962A7, 3 + msgbox gUnknown_81962A7, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index e8d1bef2b..dfa1836f0 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -2,15 +2,15 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA .byte 0 CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB - msgbox gUnknown_81962BF, 2 + msgbox gUnknown_81962BF, MSGBOX_NPC end CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4 - msgbox gUnknown_81962D7, 2 + msgbox gUnknown_81962D7, MSGBOX_NPC end CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED - msgbox gUnknown_81962FB, 2 + msgbox gUnknown_81962FB, MSGBOX_NPC end CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 @@ -40,17 +40,17 @@ EventScript_16C418:: @ 816C418 end CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435 - msgbox gUnknown_81964A8, 3 + msgbox gUnknown_81964A8, MSGBOX_SIGN end CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E - msgbox gUnknown_819640C, 3 + msgbox gUnknown_819640C, MSGBOX_SIGN end CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 - msgbox gUnknown_819644B, 3 + msgbox gUnknown_819644B, MSGBOX_SIGN end CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 - msgbox gUnknown_8196478, 3 + msgbox gUnknown_8196478, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc index a074d5778..59631d86c 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -2,5 +2,5 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 .byte 0 CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A - msgbox gUnknown_81964C4, 3 + msgbox gUnknown_81964C4, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 4271cff79..4e9d2b7ae 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -2,7 +2,7 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 .byte 0 CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 - msgbox gUnknown_81964D7, 2 + msgbox gUnknown_81964D7, MSGBOX_NPC end CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D @@ -27,7 +27,7 @@ EventScript_16C4A6:: @ 816C4A6 waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB @@ -42,7 +42,7 @@ EventScript_16C4DA:: @ 816C4DA waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 @@ -59,7 +59,7 @@ EventScript_16C514:: @ 816C514 end CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 - msgbox gUnknown_81967E3, 3 + msgbox gUnknown_81967E3, MSGBOX_SIGN end CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc index 593bf0016..4e5bcc05e 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -2,13 +2,13 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 .byte 0 CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 - msgbox gUnknown_81954DD, 2 + msgbox gUnknown_81954DD, MSGBOX_NPC end CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 - msgbox gUnknown_8195537, 3 + msgbox gUnknown_8195537, MSGBOX_SIGN end CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB - msgbox gUnknown_81955B3, 3 + msgbox gUnknown_81955B3, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 24cc47519..b9c3b056e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -2,15 +2,15 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 .byte 0 CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 - msgbox gUnknown_81955C7, 2 + msgbox gUnknown_81955C7, MSGBOX_NPC end CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE - msgbox gUnknown_819560F, 2 + msgbox gUnknown_819560F, MSGBOX_NPC end CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 - msgbox gUnknown_8195638, 3 + msgbox gUnknown_8195638, MSGBOX_SIGN end CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index 0ce4515d2..46b2ebf4e 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -6,45 +6,45 @@ CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85 end CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B - msgbox gUnknown_81956E9, 2 + msgbox gUnknown_81956E9, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94 - msgbox gUnknown_8195769, 2 + msgbox gUnknown_8195769, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D - msgbox gUnknown_81957B0, 2 + msgbox gUnknown_81957B0, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6 - msgbox gUnknown_8195823, 2 + msgbox gUnknown_8195823, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF - msgbox gUnknown_8195863, 3 + msgbox gUnknown_8195863, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8 - msgbox gUnknown_8195875, 3 + msgbox gUnknown_8195875, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1 - msgbox gUnknown_8195897, 3 + msgbox gUnknown_8195897, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA - msgbox gUnknown_81958B8, 3 + msgbox gUnknown_81958B8, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3 - msgbox gUnknown_81958D8, 3 + msgbox gUnknown_81958D8, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC - msgbox gUnknown_81958F6, 3 + msgbox gUnknown_81958F6, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 - msgbox gUnknown_8195907, 3 + msgbox gUnknown_8195907, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 57d7469a6..6844069bf 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -2,15 +2,15 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE .byte 0 CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF - msgbox gUnknown_8195A68, 2 + msgbox gUnknown_8195A68, MSGBOX_NPC end CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8 - msgbox gUnknown_8195AC9, 2 + msgbox gUnknown_8195AC9, MSGBOX_NPC end CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 - msgbox gUnknown_8195B5B, 3 + msgbox gUnknown_8195B5B, MSGBOX_SIGN end CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 88aced082..71a190c86 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -2,15 +2,15 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 .byte 0 CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 - msgbox gUnknown_8195BBA, 2 + msgbox gUnknown_8195BBA, MSGBOX_NPC end CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A - msgbox gUnknown_8195CA0, 2 + msgbox gUnknown_8195CA0, MSGBOX_NPC end CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 - msgbox gUnknown_8195D14, 3 + msgbox gUnknown_8195D14, MSGBOX_SIGN end CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index e6341f5d9..a39810d94 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -41,7 +41,7 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16C00C textcolor 3 message Text_195D5F @@ -201,11 +201,11 @@ EventScript_16C018:: @ 816C018 end CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 - msgbox gUnknown_8195F98, 2 + msgbox gUnknown_8195F98, MSGBOX_NPC end CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B - msgbox gUnknown_8196017, 3 + msgbox gUnknown_8196017, MSGBOX_SIGN end CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 17756a332..3e4f49fe5 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -15,7 +15,7 @@ EventScript_16C656:: @ 816C656 return CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 - msgbox gUnknown_8196940, 2 + msgbox gUnknown_8196940, MSGBOX_NPC end CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D @@ -254,7 +254,7 @@ EventScript_16C96A:: @ 816C96A EventScript_16C96C:: @ 816C96C goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 @@ -417,7 +417,7 @@ EventScript_16CABE:: @ 816CABE CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10 - msgbox gUnknown_8196E9B, 6 + msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE end EventScript_16CB10:: @ 816CB10 @@ -462,13 +462,13 @@ Movement_16CB53:: @ 816CB53 step_end CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A - msgbox gUnknown_8196F64, 3 + msgbox gUnknown_8196F64, MSGBOX_SIGN end CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 - msgbox gUnknown_8196F81, 3 + msgbox gUnknown_8196F81, MSGBOX_SIGN end CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C - msgbox gUnknown_8196FA0, 3 + msgbox gUnknown_8196FA0, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 7eb986640..663a3a4f1 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -2,11 +2,11 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 .byte 0 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 - msgbox gUnknown_8196FC1, 2 + msgbox gUnknown_8196FC1, MSGBOX_NPC end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F - msgbox gUnknown_8196FFF, 2 + msgbox gUnknown_8196FFF, MSGBOX_NPC end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 @@ -108,7 +108,7 @@ EventScript_16CC55:: @ 816CC55 EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16CC10 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 @@ -221,7 +221,7 @@ EventScript_16CDB3:: @ 816CDB3 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16CD83 goto EventScript_16CC10 end @@ -235,7 +235,7 @@ EventScript_16CDE0:: @ 816CDE0 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 @@ -309,7 +309,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -317,7 +317,7 @@ EventScript_16CF09:: @ 816CF09 EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 4948ace5f..e280f1a51 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -37,39 +37,39 @@ EventScript_16D107:: @ 816D107 CeladonCity_Gym_EventScript_16D111:: @ 816D111 trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4 - msgbox gUnknown_81974D6, 6 + msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D128:: @ 816D128 trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF famechecker FAMECHECKER_ERIKA, 2 - msgbox gUnknown_8197708, 6 + msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB - msgbox gUnknown_81975D1, 6 + msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D163:: @ 816D163 trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C - msgbox gUnknown_8197527, 6 + msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660 famechecker FAMECHECKER_ERIKA, 3 - msgbox gUnknown_8197664, 6 + msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A - msgbox gUnknown_8197788, 6 + msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832 - msgbox gUnknown_819783E, 6 + msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc index 39326647a..4f136bad3 100644 --- a/data/maps/CeladonCity_Hotel/scripts.inc +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -2,17 +2,17 @@ CeladonCity_Hotel_MapScripts:: @ 816D283 .byte 0 CeladonCity_Hotel_EventScript_16D284:: @ 816D284 - msgbox gUnknown_8197B77, 2 + msgbox gUnknown_8197B77, MSGBOX_NPC end CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D - msgbox gUnknown_8197BBE, 2 + msgbox gUnknown_8197BBE, MSGBOX_NPC end CeladonCity_Hotel_EventScript_16D296:: @ 816D296 - msgbox gUnknown_8197C0C, 2 + msgbox gUnknown_8197C0C, MSGBOX_NPC end CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F - msgbox gUnknown_8197C30, 2 + msgbox gUnknown_8197C30, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc index be1415217..6c8dab4ff 100644 --- a/data/maps/CeladonCity_House1/scripts.inc +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -2,13 +2,13 @@ CeladonCity_House1_MapScripts:: @ 816D267 .byte 0 CeladonCity_House1_EventScript_16D268:: @ 816D268 - msgbox gUnknown_8197A9F, 2 + msgbox gUnknown_8197A9F, MSGBOX_NPC end CeladonCity_House1_EventScript_16D271:: @ 816D271 - msgbox gUnknown_8197AD3, 2 + msgbox gUnknown_8197AD3, MSGBOX_NPC end CeladonCity_House1_EventScript_16D27A:: @ 816D27A - msgbox gUnknown_8197B20, 2 + msgbox gUnknown_8197B20, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 1d7318ac7..943d1e396 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB end CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604 - msgbox gUnknown_819685B, 2 + msgbox gUnknown_819685B, MSGBOX_NPC end CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D - msgbox gUnknown_81968C2, 2 + msgbox gUnknown_81968C2, MSGBOX_NPC end CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 - msgbox gUnknown_8196913, 2 + msgbox gUnknown_8196913, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index d6ba4496c..760624c64 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -2,11 +2,11 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA .byte 0 CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB - msgbox gUnknown_81978E6, 2 + msgbox gUnknown_81978E6, MSGBOX_NPC end CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 - msgbox gUnknown_8197915, 2 + msgbox gUnknown_8197915, MSGBOX_NPC end CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD @@ -33,9 +33,9 @@ EventScript_16D24B:: @ 816D24B end CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 - msgbox gUnknown_8197952, 2 + msgbox gUnknown_8197952, MSGBOX_NPC end CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E - msgbox gUnknown_819798A, 2 + msgbox gUnknown_819798A, MSGBOX_NPC end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index ef102064b..a266a6c93 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -255,15 +255,15 @@ EventScript_166713:: @ 8166713 end CeruleanCity_EventScript_16671D:: @ 816671D - msgbox gUnknown_817F0B2, 2 + msgbox gUnknown_817F0B2, MSGBOX_NPC end CeruleanCity_EventScript_166726:: @ 8166726 - msgbox gUnknown_817EF3F, 2 + msgbox gUnknown_817EF3F, MSGBOX_NPC end CeruleanCity_EventScript_16672F:: @ 816672F - msgbox gUnknown_817F319, 2 + msgbox gUnknown_817F319, MSGBOX_NPC end CeruleanCity_EventScript_166738:: @ 8166738 @@ -357,15 +357,15 @@ EventScript_16682F:: @ 816682F return CeruleanCity_EventScript_166838:: @ 8166838 - msgbox gUnknown_817F420, 3 + msgbox gUnknown_817F420, MSGBOX_SIGN end CeruleanCity_EventScript_166841:: @ 8166841 - msgbox gUnknown_817F453, 3 + msgbox gUnknown_817F453, MSGBOX_SIGN end CeruleanCity_EventScript_16684A:: @ 816684A - msgbox gUnknown_817F4C5, 3 + msgbox gUnknown_817F4C5, MSGBOX_SIGN end CeruleanCity_EventScript_166853:: @ 8166853 diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 9c137f644..88c8108cc 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -48,7 +48,7 @@ EventScript_16AC62:: @ 816AC62 end CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C - msgbox gUnknown_81928CF, 2 + msgbox gUnknown_81928CF, MSGBOX_NPC end CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 @@ -66,5 +66,5 @@ EventScript_16AC8A:: @ 816AC8A CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94 CeruleanCity_EventScript_16AC94:: @ 816AC94 - msgbox gUnknown_81929AD, 3 + msgbox gUnknown_81929AD, MSGBOX_SIGN end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 0da4f93a7..1d2c46416 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -36,13 +36,13 @@ EventScript_16AB3A:: @ 816AB3A CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0 - msgbox gUnknown_81924E4, 6 + msgbox gUnknown_81924E4, MSGBOX_AUTOCLOSE end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, Text_192524, Text_192547 famechecker FAMECHECKER_MISTY, 2 - msgbox gUnknown_8192556, 6 + msgbox gUnknown_8192556, MSGBOX_AUTOCLOSE end CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index 630b4b919..1ebae8838 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -15,9 +15,9 @@ EventScript_16A98B:: @ 816A98B end CeruleanCity_House2_EventScript_16A995:: @ 816A995 - msgbox gUnknown_8191F2A, 2 + msgbox gUnknown_8191F2A, MSGBOX_NPC end CeruleanCity_House2_EventScript_16A99E:: @ 816A99E - msgbox gUnknown_8191F64, 3 + msgbox gUnknown_8191F64, MSGBOX_SIGN end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 9d02b8743..ce76ef039 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -2,7 +2,7 @@ CeruleanCity_House3_MapScripts:: @ 816A9A7 .byte 0 CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8 - msgbox gUnknown_8191F80, 2 + msgbox gUnknown_8191F80, MSGBOX_NPC end CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 @@ -12,7 +12,7 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 call EventScript_1A8CAD goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16AA0B call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 3a37f94be..b4c8b16be 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -6,7 +6,7 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 faceplayer goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16AEAD goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3 msgbox gUnknown_8193003 @@ -141,7 +141,7 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 @@ -154,7 +154,7 @@ EventScript_16B055:: @ 816B055 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index d51b2f96e..4008c5dd2 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -2,11 +2,11 @@ CeruleanCity_Mart_MapScripts:: @ 816AC9D .byte 0 CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E - msgbox gUnknown_81929C2, 2 + msgbox gUnknown_81929C2, MSGBOX_NPC end CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 - msgbox gUnknown_8192A79, 2 + msgbox gUnknown_8192A79, MSGBOX_NPC end CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index 01d9dfd82..f7b309f3e 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -15,11 +15,11 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C end CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45 - msgbox gUnknown_8192079, 2 + msgbox gUnknown_8192079, MSGBOX_NPC end CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E - msgbox gUnknown_8191FFB, 2 + msgbox gUnknown_8191FFB, MSGBOX_NPC end CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 @@ -31,5 +31,5 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 end CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70 - msgbox gUnknown_819214C, 2 + msgbox gUnknown_819214C, MSGBOX_NPC end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 9c07369b7..b3cd646b4 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -103,9 +103,9 @@ EventScript_166FCD:: @ 8166FCD call_if_set FLAG_TEMP_2, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_167068 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_167078 end @@ -337,15 +337,15 @@ CinnabarIsland_EventScript_1671EF:: @ 81671EF end CinnabarIsland_EventScript_167208:: @ 8167208 - msgbox gUnknown_8180BA0, 2 + msgbox gUnknown_8180BA0, MSGBOX_NPC end CinnabarIsland_EventScript_167211:: @ 8167211 - msgbox gUnknown_8180C0D, 3 + msgbox gUnknown_8180C0D, MSGBOX_SIGN end CinnabarIsland_EventScript_16721A:: @ 816721A - msgbox gUnknown_8180C3E, 3 + msgbox gUnknown_8180C3E, MSGBOX_SIGN end CinnabarIsland_EventScript_167223:: @ 8167223 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 2de722229..c475e3c2a 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -82,12 +82,12 @@ EventScript_16DA75:: @ 816DA75 CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6 - msgbox gUnknown_81997EA, 6 + msgbox gUnknown_81997EA, MSGBOX_AUTOCLOSE end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1 - msgbox gUnknown_8199911, 6 + msgbox gUnknown_8199911, MSGBOX_AUTOCLOSE end EventScript_16DAB1:: @ 816DAB1 @@ -102,7 +102,7 @@ EventScript_16DABC:: @ 816DABC CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA famechecker FAMECHECKER_BLAINE, 2 - msgbox gUnknown_81999DF, 6 + msgbox gUnknown_81999DF, MSGBOX_AUTOCLOSE end EventScript_16DAEA:: @ 816DAEA @@ -116,7 +116,7 @@ EventScript_16DAF5:: @ 816DAF5 CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16 - msgbox gUnknown_8199B27, 6 + msgbox gUnknown_8199B27, MSGBOX_AUTOCLOSE end EventScript_16DB16:: @ 816DB16 @@ -130,7 +130,7 @@ EventScript_16DB21:: @ 816DB21 CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42 - msgbox gUnknown_819987D, 6 + msgbox gUnknown_819987D, MSGBOX_AUTOCLOSE end EventScript_16DB42:: @ 816DB42 @@ -144,7 +144,7 @@ EventScript_16DB4D:: @ 816DB4D CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E - msgbox gUnknown_8199986, 6 + msgbox gUnknown_8199986, MSGBOX_AUTOCLOSE end EventScript_16DB6E:: @ 816DB6E @@ -158,7 +158,7 @@ EventScript_16DB79:: @ 816DB79 CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A - msgbox gUnknown_8199AC9, 6 + msgbox gUnknown_8199AC9, MSGBOX_AUTOCLOSE end EventScript_16DB9A:: @ 816DB9A @@ -210,9 +210,9 @@ CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DC43 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DC6A end @@ -305,9 +305,9 @@ CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DD41 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DD1C end @@ -391,9 +391,9 @@ CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DE1F - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DDFA end @@ -468,9 +468,9 @@ CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DEF6 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DED1 end @@ -545,9 +545,9 @@ CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DFA8 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DFCD end @@ -622,9 +622,9 @@ CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16E0A4 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E07F end diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index 75dc94f46..7893e41bc 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -2,11 +2,11 @@ CinnabarIsland_Mart_MapScripts:: @ 816EA0F .byte 0 CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10 - msgbox gUnknown_819A7A0, 2 + msgbox gUnknown_819A7A0, MSGBOX_NPC end CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 - msgbox gUnknown_819A7F1, 2 + msgbox gUnknown_819A7F1, MSGBOX_NPC end CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 3fc84f92f..c3137faec 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -15,22 +15,22 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 end CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF - msgbox gUnknown_819A5BE, 2 + msgbox gUnknown_819A5BE, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8 - msgbox gUnknown_819A4F8, 2 + msgbox gUnknown_819A4F8, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 - msgbox gUnknown_819A6B1, 2 + msgbox gUnknown_819A6B1, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A lock faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E9A5 msgbox gUnknown_819A785 closemessage diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index d11407f14..caf07f29d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -12,21 +12,21 @@ EventScript_16E285:: @ 816E285 return CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B - msgbox gUnknown_8199EE5, 2 + msgbox gUnknown_8199EE5, MSGBOX_NPC end CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294 - msgbox gUnknown_8199F41, 3 + msgbox gUnknown_8199F41, MSGBOX_SIGN end CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D - msgbox gUnknown_8199F6A, 3 + msgbox gUnknown_8199F6A, MSGBOX_SIGN end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6 - msgbox gUnknown_8199F83, 3 + msgbox gUnknown_8199F83, MSGBOX_SIGN end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF - msgbox gUnknown_8199F9A, 3 + msgbox gUnknown_8199F9A, MSGBOX_SIGN end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index c0dc92ca0..41e0bc938 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -8,7 +8,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 call EventScript_1A8CAD goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E45B call EventScript_1A8CBD compare VAR_0x8004, 6 @@ -147,7 +147,7 @@ EventScript_16E668:: @ 816E668 getspeciesname 0, SPECIES_OMANYTE getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -162,7 +162,7 @@ EventScript_16E6A6:: @ 816E6A6 getspeciesname 0, SPECIES_KABUTO getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -177,7 +177,7 @@ EventScript_16E6E4:: @ 816E6E4 getspeciesname 0, SPECIES_AERODACTYL getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -257,7 +257,7 @@ EventScript_16E827:: @ 816E827 waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB @@ -272,7 +272,7 @@ EventScript_16E85B:: @ 816E85B waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 96af461d3..2a9dc1edf 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -2,7 +2,7 @@ CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8 .byte 0 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9 - msgbox gUnknown_8199FB3, 2 + msgbox gUnknown_8199FB3, MSGBOX_NPC end CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 @@ -12,7 +12,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 call EventScript_1A8CAD goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E31C call EventScript_1A8CBD compare VAR_0x8004, 6 @@ -51,7 +51,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E copyvar VAR_0x8009, VAR_RESULT goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E3BC special Special_ChooseMonFromParty waitstate diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc index e390fd266..dd38a85b5 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc @@ -6,13 +6,13 @@ CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5 - msgbox gUnknown_819A015, 2 + msgbox gUnknown_819A015, MSGBOX_NPC end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE - msgbox gUnknown_819A04A, 3 + msgbox gUnknown_819A04A, MSGBOX_SIGN end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7 - msgbox gUnknown_819A128, 3 + msgbox gUnknown_819A128, MSGBOX_SIGN end diff --git a/data/maps/DiglettsCave_NorthEntrance/scripts.inc b/data/maps/DiglettsCave_NorthEntrance/scripts.inc index 890c5183c..a11fa4c3a 100644 --- a/data/maps/DiglettsCave_NorthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_NorthEntrance/scripts.inc @@ -2,5 +2,5 @@ DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7 .byte 0 DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8 - msgbox gUnknown_817462C, 2 + msgbox gUnknown_817462C, MSGBOX_NPC end diff --git a/data/maps/DiglettsCave_SouthEntrance/scripts.inc b/data/maps/DiglettsCave_SouthEntrance/scripts.inc index 0aab02b7f..2ee397c02 100644 --- a/data/maps/DiglettsCave_SouthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_SouthEntrance/scripts.inc @@ -2,5 +2,5 @@ DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB .byte 0 DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC - msgbox gUnknown_81746A7, 2 + msgbox gUnknown_81746A7, MSGBOX_NPC end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index a26723b11..6b925d8f9 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -7,13 +7,13 @@ FiveIsland_OnTransition:: @ 8167E94 end FiveIsland_EventScript_167E98:: @ 8167E98 - msgbox gUnknown_8182DFB, 3 + msgbox gUnknown_8182DFB, MSGBOX_SIGN end FiveIsland_EventScript_167EA1:: @ 8167EA1 - msgbox gUnknown_8182E26, 2 + msgbox gUnknown_8182E26, MSGBOX_NPC end FiveIsland_EventScript_167EAA:: @ 8167EAA - msgbox gUnknown_8182E96, 2 + msgbox gUnknown_8182E96, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc index 4f34587d7..86f6cbcb4 100644 --- a/data/maps/FiveIsland_House1/scripts.inc +++ b/data/maps/FiveIsland_House1/scripts.inc @@ -2,5 +2,5 @@ FiveIsland_House1_MapScripts:: @ 8171D56 .byte 0 FiveIsland_House1_EventScript_171D57:: @ 8171D57 - msgbox gUnknown_81A3CAC, 2 + msgbox gUnknown_81A3CAC, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc index e46909905..79cfa755f 100644 --- a/data/maps/FiveIsland_House2/scripts.inc +++ b/data/maps/FiveIsland_House2/scripts.inc @@ -2,5 +2,5 @@ FiveIsland_House2_MapScripts:: @ 8171D60 .byte 0 FiveIsland_House2_EventScript_171D61:: @ 8171D61 - msgbox gUnknown_81A3D5E, 2 + msgbox gUnknown_81A3D5E, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 1f608669b..b6f4e0257 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -3,5 +3,5 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42 - msgbox gUnknown_817CF54, 6 + msgbox gUnknown_817CF54, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 6beca99ec..38241ab71 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -3,5 +3,5 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 trainerbattle_single TRAINER_PSYCHIC_LAURA, Text_17CFC1, Text_17CFFB - msgbox gUnknown_817D037, 6 + msgbox gUnknown_817D037, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index bf9844b12..21fd9be76 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -37,15 +37,15 @@ EventScript_168983:: @ 8168983 FiveIsland_Meadow_EventScript_16898D:: @ 816898D trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, Text_18AC88, Text_18ACB3 - msgbox gUnknown_818ACC5, 6 + msgbox gUnknown_818ACC5, MSGBOX_AUTOCLOSE end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, Text_18ACF0, Text_18AD39 - msgbox gUnknown_818AD59, 6 + msgbox gUnknown_818AD59, MSGBOX_AUTOCLOSE end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, Text_18ADC6, Text_18ADFB - msgbox gUnknown_818AE16, 6 + msgbox gUnknown_818AE16, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 9e3c0d8e1..00dab6998 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -48,7 +48,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_168A9B releaseall end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index 8336c5fcb..01da41d52 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -15,9 +15,9 @@ FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 end FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 - msgbox gUnknown_81A3BBA, 2 + msgbox gUnknown_81A3BBA, MSGBOX_NPC end FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 - msgbox gUnknown_81A3BFD, 2 + msgbox gUnknown_81A3BFD, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 4a8b01c27..4a5502062 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -40,5 +40,5 @@ Movement_168841:: @ 8168841 step_end FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 - msgbox gUnknown_818A7FE, 3 + msgbox gUnknown_818A7FE, MSGBOX_SIGN end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index e8c30c862..946508db5 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -144,5 +144,5 @@ Movement_172060:: @ 8172060 step_end FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 - msgbox gUnknown_81A4657, 2 + msgbox gUnknown_81A4657, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index d3d5f7fba..1ad6a2991 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -30,7 +30,7 @@ EventScript_163F6E:: @ 8163F6E end FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78 - msgbox gUnknown_817BB15, 3 + msgbox gUnknown_817BB15, MSGBOX_SIGN end FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 @@ -44,12 +44,12 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7 - msgbox gUnknown_817BCA3, 6 + msgbox gUnknown_817BCA3, MSGBOX_AUTOCLOSE end EventScript_163FB7:: @ 8163FB7 famechecker FAMECHECKER_GIOVANNI, 5 - msgbox gUnknown_817BCD7, 6 + msgbox gUnknown_817BCD7, MSGBOX_AUTOCLOSE end EventScript_163FCD:: @ 8163FCD @@ -61,17 +61,17 @@ EventScript_163FCD:: @ 8163FCD FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585 - msgbox gUnknown_817B5A6, 6 + msgbox gUnknown_817B5A6, MSGBOX_AUTOCLOSE end FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9 - msgbox gUnknown_817B6EF, 6 + msgbox gUnknown_817B6EF, MSGBOX_AUTOCLOSE end FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F - msgbox gUnknown_817BA64, 6 + msgbox gUnknown_817BA64, MSGBOX_AUTOCLOSE end EventScript_16402F:: @ 816402F @@ -99,12 +99,12 @@ EventScript_164065:: @ 8164065 FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F - msgbox gUnknown_817B642, 6 + msgbox gUnknown_817B642, MSGBOX_AUTOCLOSE end FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2 - msgbox gUnknown_817B7FA, 6 + msgbox gUnknown_817B7FA, MSGBOX_AUTOCLOSE end EventScript_1640A2:: @ 81640A2 diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 890891c10..8f84b1e6c 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -90,10 +90,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG @@ -161,13 +161,13 @@ FourIsland_EventScript_167E5A:: @ 8167E5A end FourIsland_EventScript_167E73:: @ 8167E73 - msgbox gUnknown_8182D8E, 2 + msgbox gUnknown_8182D8E, MSGBOX_NPC end FourIsland_EventScript_167E7C:: @ 8167E7C - msgbox gUnknown_8182A03, 3 + msgbox gUnknown_8182A03, MSGBOX_SIGN end FourIsland_EventScript_167E85:: @ 8167E85 - msgbox gUnknown_8182DEB, 3 + msgbox gUnknown_8182DEB, MSGBOX_SIGN end diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc index d7139c370..46ec500fe 100644 --- a/data/maps/FourIsland_House1/scripts.inc +++ b/data/maps/FourIsland_House1/scripts.inc @@ -2,5 +2,5 @@ FourIsland_House1_MapScripts:: @ 8171C44 .byte 0 FourIsland_House1_EventScript_171C45:: @ 8171C45 - msgbox gUnknown_81A3802, 2 + msgbox gUnknown_81A3802, MSGBOX_NPC end diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 54c60cb56..39eb3f0b4 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -188,5 +188,5 @@ Movement_163F23:: @ 8163F23 step_end FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 - msgbox gUnknown_817B457, 2 + msgbox gUnknown_817B457, MSGBOX_NPC end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 5074a4f39..9918fb307 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -29,5 +29,5 @@ Items_171CD4:: @ 8171CD4 end FourIsland_Mart_EventScript_171CE8:: @ 8171CE8 - msgbox gUnknown_81A3B14, 2 + msgbox gUnknown_81A3B14, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 656354413..3d99baddb 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 end FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02 - msgbox gUnknown_81A3627, 2 + msgbox gUnknown_81A3627, MSGBOX_NPC end FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B - msgbox gUnknown_81A3697, 2 + msgbox gUnknown_81A3697, MSGBOX_NPC end FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 - msgbox gUnknown_81A3734, 2 + msgbox gUnknown_81A3734, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 3d5409e19..d7034d740 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -15,7 +15,7 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 compare VAR_RESULT, 3 goto_if_eq EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171993 msgbox gUnknown_81BF916 release @@ -54,7 +54,7 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171993 goto EventScript_1719F7 end @@ -89,10 +89,10 @@ EventScript_171A52:: @ 8171A52 setvar VAR_0x8004, 0 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171A90 goto EventScript_1719F7 end @@ -116,7 +116,7 @@ EventScript_171A90:: @ 8171A90 EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171AEB goto EventScript_1719F7 end @@ -150,7 +150,7 @@ EventScript_171B05:: @ 8171B05 EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171A90 goto EventScript_1719F7 end @@ -192,7 +192,7 @@ EventScript_171B86:: @ 8171B86 setvar VAR_0x8004, 1 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171A90 msgbox gUnknown_81BF976 release diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 15c3330d7..cde08dd9b 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -17,19 +17,19 @@ EventScript_166D97:: @ 8166D97 return FuchsiaCity_EventScript_166D9D:: @ 8166D9D - msgbox gUnknown_818056E, 2 + msgbox gUnknown_818056E, MSGBOX_NPC end FuchsiaCity_EventScript_166DA6:: @ 8166DA6 - msgbox gUnknown_81805C6, 2 + msgbox gUnknown_81805C6, MSGBOX_NPC end FuchsiaCity_EventScript_166DAF:: @ 8166DAF - msgbox gUnknown_818062C, 2 + msgbox gUnknown_818062C, MSGBOX_NPC end FuchsiaCity_EventScript_166DB8:: @ 8166DB8 - msgbox gUnknown_818065A, 2 + msgbox gUnknown_818065A, MSGBOX_NPC end FuchsiaCity_EventScript_166DC1:: @ 8166DC1 @@ -41,23 +41,23 @@ FuchsiaCity_EventScript_166DC1:: @ 8166DC1 end FuchsiaCity_EventScript_166DDA:: @ 8166DDA - msgbox gUnknown_81806AB, 3 + msgbox gUnknown_81806AB, MSGBOX_SIGN end FuchsiaCity_EventScript_166DE3:: @ 8166DE3 - msgbox gUnknown_81806D3, 3 + msgbox gUnknown_81806D3, MSGBOX_SIGN end FuchsiaCity_EventScript_166DEC:: @ 8166DEC - msgbox gUnknown_81806F0, 3 + msgbox gUnknown_81806F0, MSGBOX_SIGN end FuchsiaCity_EventScript_166DF5:: @ 8166DF5 - msgbox gUnknown_818070D, 3 + msgbox gUnknown_818070D, MSGBOX_SIGN end EventScript_166DFE:: @ 8166DFE - msgbox gUnknown_8180727, 3 + msgbox gUnknown_8180727, MSGBOX_SIGN end FuchsiaCity_EventScript_166E07:: @ 8166E07 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index f0d1e1a01..72dbb8e8e 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -7,9 +7,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C goto_if_set FLAG_GOT_HM04, EventScript_16D7FA goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES call_if_eq EventScript_16D7E8 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO call_if_eq EventScript_16D7F1 release end @@ -55,9 +55,9 @@ EventScript_16D7FA:: @ 816D7FA end FuchsiaCity_Building1_EventScript_16D804:: @ 816D804 - msgbox gUnknown_819913C, 3 + msgbox gUnknown_819913C, MSGBOX_SIGN end FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D - msgbox gUnknown_8199167, 3 + msgbox gUnknown_8199167, MSGBOX_SIGN end diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 38e4190ce..2e299a867 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -36,33 +36,33 @@ EventScript_16D5E7:: @ 816D5E7 FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 trainerbattle_single TRAINER_TAMER_PHIL, Text_198866, Text_1988B6 - msgbox gUnknown_81988CB, 6 + msgbox gUnknown_81988CB, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 trainerbattle_single TRAINER_TAMER_EDGAR, Text_19891F, Text_19897F - msgbox gUnknown_8198985, 6 + msgbox gUnknown_8198985, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F trainerbattle_single TRAINER_JUGGLER_KIRK, Text_19871E, Text_198779 famechecker FAMECHECKER_KOGA, 2 - msgbox gUnknown_8198787, 6 + msgbox gUnknown_8198787, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 trainerbattle_single TRAINER_JUGGLER_SHAWN, Text_1989A1, Text_1989EA - msgbox gUnknown_8198A10, 6 + msgbox gUnknown_8198A10, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A trainerbattle_single TRAINER_JUGGLER_KAYDEN, Text_198629, Text_1986B4 - msgbox gUnknown_81986C9, 6 + msgbox gUnknown_81986C9, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 trainerbattle_single TRAINER_JUGGLER_NATE, Text_1987E8, Text_198812 - msgbox gUnknown_8198825, 6 + msgbox gUnknown_8198825, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc index 32be06c57..dc32f78c4 100644 --- a/data/maps/FuchsiaCity_House1/scripts.inc +++ b/data/maps/FuchsiaCity_House1/scripts.inc @@ -2,7 +2,7 @@ FuchsiaCity_House1_MapScripts:: @ 816D6C5 .byte 0 FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6 - msgbox gUnknown_8198BBB, 2 + msgbox gUnknown_8198BBB, MSGBOX_NPC end FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF @@ -14,5 +14,5 @@ FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF end FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8 - msgbox gUnknown_8198C7B, 2 + msgbox gUnknown_8198C7B, MSGBOX_NPC end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index d0f842a0e..78fb5ffb8 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -6,7 +6,7 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817 faceplayer goto_if_set FLAG_GOT_GOOD_ROD, EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D849 msgbox gUnknown_8199337 release diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 99af39686..ab6f4e658 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -5,7 +5,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 lock faceplayer msgbox gUnknown_81993B9, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D8B0 goto EventScript_16D941 end @@ -30,7 +30,7 @@ EventScript_16D8B0:: @ 816D8B0 goto_if_eq EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D919 goto EventScript_16D941 end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index 85390e4a0..67fceb572 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -2,11 +2,11 @@ FuchsiaCity_Mart_MapScripts:: @ 816D4E0 .byte 0 FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1 - msgbox gUnknown_8198134, 2 + msgbox gUnknown_8198134, MSGBOX_NPC end FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA - msgbox gUnknown_81980BC, 2 + msgbox gUnknown_81980BC, MSGBOX_NPC end FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index a5ebbfb56..864a2cb86 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700 end FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709 - msgbox gUnknown_8198CB7, 2 + msgbox gUnknown_8198CB7, MSGBOX_NPC end FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712 - msgbox gUnknown_8198D2E, 2 + msgbox gUnknown_8198D2E, MSGBOX_NPC end FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B - msgbox gUnknown_8198D9B, 2 + msgbox gUnknown_8198D9B, MSGBOX_NPC end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index f04639875..b2085a32f 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -38,7 +38,7 @@ EventScript_16D312:: @ 816D312 lockall textcolor 0 msgbox gUnknown_8197E1A, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16D345 msgbox gUnknown_8197E48 closemessage @@ -102,7 +102,7 @@ EventScript_16D391:: @ 816D391 waitmovement 0 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A @@ -200,7 +200,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 lock faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D4D6 msgbox gUnknown_819809E release diff --git a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc index bbff0b929..210acd87f 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc +++ b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc @@ -2,17 +2,17 @@ FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528 .byte 0 FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529 - msgbox gUnknown_819816B, 2 + msgbox gUnknown_819816B, MSGBOX_NPC end FuchsiaCity_ZooBuilding_EventScript_16D532:: @ 816D532 - msgbox gUnknown_81981C2, 2 + msgbox gUnknown_81981C2, MSGBOX_NPC end FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B - msgbox gUnknown_819822A, 2 + msgbox gUnknown_819822A, MSGBOX_NPC end FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544 - msgbox gUnknown_8198285, 2 + msgbox gUnknown_8198285, MSGBOX_NPC end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 09647da0b..5eb676e9d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -37,7 +37,7 @@ EventScript_16EAB9:: @ 816EAB9 end IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 - msgbox gUnknown_819A837, 2 + msgbox gUnknown_819A837, MSGBOX_NPC end IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 97c308549..3996e80dd 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -12,7 +12,7 @@ LavenderTown_EventScript_16687D:: @ 816687D lock faceplayer msgbox gUnknown_817F52E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16689C msgbox gUnknown_817F568 release @@ -24,25 +24,25 @@ EventScript_16689C:: @ 816689C end LavenderTown_EventScript_1668A6:: @ 81668A6 - msgbox gUnknown_817F5B6, 2 + msgbox gUnknown_817F5B6, MSGBOX_NPC end LavenderTown_EventScript_1668AF:: @ 81668AF - msgbox gUnknown_817F614, 2 + msgbox gUnknown_817F614, MSGBOX_NPC end LavenderTown_EventScript_1668B8:: @ 81668B8 - msgbox gUnknown_817F676, 3 + msgbox gUnknown_817F676, MSGBOX_SIGN end LavenderTown_EventScript_1668C1:: @ 81668C1 - msgbox gUnknown_817F69A, 3 + msgbox gUnknown_817F69A, MSGBOX_SIGN end LavenderTown_EventScript_1668CA:: @ 81668CA - msgbox gUnknown_817F6D6, 3 + msgbox gUnknown_817F6D6, MSGBOX_SIGN end LavenderTown_EventScript_1668D3:: @ 81668D3 - msgbox gUnknown_817F6F7, 3 + msgbox gUnknown_817F6F7, MSGBOX_SIGN end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 21cbd52db..b6d5ae142 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -5,9 +5,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 lock faceplayer msgbox gUnknown_8193A4B, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16B287 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16B2AA end @@ -15,9 +15,9 @@ EventScript_16B287:: @ 816B287 msgbox gUnknown_8193AA6 special Special_ChooseMonFromParty waitstate - compare VAR_0x8004, 6 + compare VAR_0x8004, PARTY_SIZE goto_if_lt EventScript_16B2B4 - compare VAR_0x8004, 6 + compare VAR_0x8004, PARTY_SIZE goto_if_ge EventScript_16B2AA end @@ -39,9 +39,9 @@ EventScript_16B2B4:: @ 816B2B4 compare VAR_RESULT, 1 goto_if_eq EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16B31B - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16B2AA end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index a09858f03..a0352ca88 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -2,15 +2,15 @@ LavenderTown_Mart_MapScripts:: @ 816B34F .byte 0 LavenderTown_Mart_EventScript_16B350:: @ 816B350 - msgbox gUnknown_8193CE5, 2 + msgbox gUnknown_8193CE5, MSGBOX_NPC end LavenderTown_Mart_EventScript_16B359:: @ 816B359 - msgbox gUnknown_8193DB6, 2 + msgbox gUnknown_8193DB6, MSGBOX_NPC end LavenderTown_Mart_EventScript_16B362:: @ 816B362 - msgbox gUnknown_8193DF1, 2 + msgbox gUnknown_8193DF1, MSGBOX_NPC end LavenderTown_Mart_EventScript_16B36B:: @ 816B36B diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index df6eb0e89..7718ecbfd 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE end LavenderTown_PokemonCenter_1F_EventScript_16B107:: @ 816B107 - msgbox gUnknown_8193465, 2 + msgbox gUnknown_8193465, MSGBOX_NPC end LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110 - msgbox gUnknown_81934DE, 2 + msgbox gUnknown_81934DE, MSGBOX_NPC end LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119 - msgbox gUnknown_819353A, 2 + msgbox gUnknown_819353A, MSGBOX_NPC end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index a8c35b814..612993321 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -34,7 +34,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA end LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 - msgbox gUnknown_81936B4, 2 + msgbox gUnknown_81936B4, MSGBOX_NPC end LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC @@ -78,5 +78,5 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211 end LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229 - msgbox gUnknown_819392B, 3 + msgbox gUnknown_819392B, MSGBOX_SIGN end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 00209f3c9..75e6813e8 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -117,15 +117,15 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, Text_17AB73, Text_17ABAA - msgbox gUnknown_817ABD8, 6 + msgbox gUnknown_817ABD8, MSGBOX_AUTOCLOSE end MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB trainerbattle_single TRAINER_PKMN_RANGER_BETH, Text_17AC55, Text_17AC82 - msgbox gUnknown_817ACA2, 6 + msgbox gUnknown_817ACA2, MSGBOX_AUTOCLOSE end MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, Text_17AD06, Text_17AD6B - msgbox gUnknown_817AD89, 6 + msgbox gUnknown_817AD89, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index b4506a56c..4c80943d1 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -7,40 +7,40 @@ MtMoon_1F_OnTransition:: @ 81605EA end MtMoon_1F_EventScript_1605EE:: @ 81605EE - msgbox gUnknown_8172AE0, 3 + msgbox gUnknown_8172AE0, MSGBOX_SIGN end MtMoon_1F_EventScript_1605F7:: @ 81605F7 trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB - msgbox gUnknown_81727DF, 6 + msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_16060E:: @ 816060E trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844 - msgbox gUnknown_8172863, 6 + msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_160625:: @ 8160625 trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3 - msgbox gUnknown_81728D2, 6 + msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_16063C:: @ 816063C trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4 - msgbox gUnknown_81729AC, 6 + msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_160653:: @ 8160653 trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927 - msgbox gUnknown_817293C, 6 + msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_16066A:: @ 816066A trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A - msgbox gUnknown_8172A26, 6 + msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_160681:: @ 8160681 trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F - msgbox gUnknown_8172A97, 6 + msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index cb37f0cbf..0ebee79d6 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -55,7 +55,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B lock faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1607DE removeobject 1 giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 @@ -87,7 +87,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F lock faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1607DE removeobject 2 giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 @@ -120,20 +120,20 @@ Movement_1607E0:: @ 81607E0 MtMoon_B2F_EventScript_1607E4:: @ 81607E4 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8 - msgbox gUnknown_8172CCB, 6 + msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_1607FB:: @ 81607FB trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46 - msgbox gUnknown_8172D51, 6 + msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_160812:: @ 8160812 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF - msgbox gUnknown_8172DC1, 6 + msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_160829:: @ 8160829 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E - msgbox gUnknown_8172E4B, 6 + msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index eae7004c8..545a3d333 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -100,13 +100,13 @@ EventScript_16753F:: @ 816753F end OneIsland_EventScript_167549:: @ 8167549 - msgbox gUnknown_8181A4A, 2 + msgbox gUnknown_8181A4A, MSGBOX_NPC end OneIsland_EventScript_167552:: @ 8167552 - msgbox gUnknown_81819E1, 3 + msgbox gUnknown_81819E1, MSGBOX_SIGN end OneIsland_EventScript_16755B:: @ 816755B - msgbox gUnknown_8181A0A, 3 + msgbox gUnknown_8181A0A, MSGBOX_SIGN end diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc index 957dcada9..172f5f4a9 100644 --- a/data/maps/OneIsland_House1/scripts.inc +++ b/data/maps/OneIsland_House1/scripts.inc @@ -2,9 +2,9 @@ OneIsland_House1_MapScripts:: @ 817135B .byte 0 OneIsland_House1_EventScript_17135C:: @ 817135C - msgbox gUnknown_81A2332, 2 + msgbox gUnknown_81A2332, MSGBOX_NPC end OneIsland_House1_EventScript_171365:: @ 8171365 - msgbox gUnknown_81A2380, 2 + msgbox gUnknown_81A2380, MSGBOX_NPC end diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc index 9966217cd..0b1761475 100644 --- a/data/maps/OneIsland_House2/scripts.inc +++ b/data/maps/OneIsland_House2/scripts.inc @@ -2,5 +2,5 @@ OneIsland_House2_MapScripts:: @ 817136E .byte 0 OneIsland_House2_EventScript_17136F:: @ 817136F - msgbox gUnknown_81A23B8, 2 + msgbox gUnknown_81A23B8, MSGBOX_NPC end diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc index 78c2efb13..00c5106a7 100644 --- a/data/maps/OneIsland_KindleRoad/scripts.inc +++ b/data/maps/OneIsland_KindleRoad/scripts.inc @@ -2,9 +2,9 @@ OneIsland_KindleRoad_MapScripts:: @ 8168758 .byte 0 OneIsland_KindleRoad_EventScript_168759:: @ 8168759 - msgbox gUnknown_8189D02, 3 + msgbox gUnknown_8189D02, MSGBOX_SIGN end OneIsland_KindleRoad_EventScript_168762:: @ 8168762 - msgbox gUnknown_8189D32, 3 + msgbox gUnknown_8189D32, MSGBOX_SIGN end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index c0f9e08ed..74027ec35 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -2,19 +2,19 @@ OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B .byte 0 OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C - msgbox gUnknown_817D34A, 2 + msgbox gUnknown_817D34A, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365 - msgbox gUnknown_817D3DE, 2 + msgbox gUnknown_817D3DE, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E - msgbox gUnknown_817D4AA, 2 + msgbox gUnknown_817D4AA, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377 - msgbox gUnknown_817D4E3, 2 + msgbox gUnknown_817D4E3, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index fac29facf..b3cc2117f 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -316,14 +316,14 @@ EventScript_171044:: @ 8171044 applymovement 3, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_171099 goto EventScript_1710B2 end @@ -386,11 +386,11 @@ Movement_171142:: @ 8171142 step_end OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148 - msgbox gUnknown_81A20D5, 2 + msgbox gUnknown_81A20D5, MSGBOX_NPC end OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 - msgbox gUnknown_81A212D, 2 + msgbox gUnknown_81A212D, MSGBOX_NPC end OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc index 192cf4898..a49a763a1 100644 --- a/data/maps/OneIsland_TreasureBeach/scripts.inc +++ b/data/maps/OneIsland_TreasureBeach/scripts.inc @@ -2,5 +2,5 @@ OneIsland_TreasureBeach_MapScripts:: @ 816876B .byte 0 OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C - msgbox gUnknown_8189DCE, 2 + msgbox gUnknown_8189DCE, MSGBOX_NPC end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 1925cabd4..4d3356019 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -438,7 +438,7 @@ Movement_16582C:: @ 816582C step_end PalletTown_EventScript_16582F:: @ 816582F - msgbox gUnknown_817D80D, 2 + msgbox gUnknown_817D80D, MSGBOX_NPC end PalletTown_EventScript_165838:: @ 8165838 @@ -449,15 +449,15 @@ PalletTown_EventScript_165838:: @ 8165838 end PalletTown_EventScript_165850:: @ 8165850 - msgbox gUnknown_817D87F, 3 + msgbox gUnknown_817D87F, MSGBOX_SIGN end PalletTown_EventScript_165859:: @ 8165859 - msgbox gUnknown_817D88A, 3 + msgbox gUnknown_817D88A, MSGBOX_SIGN end PalletTown_EventScript_165862:: @ 8165862 - msgbox gUnknown_817D895, 3 + msgbox gUnknown_817D895, MSGBOX_SIGN end PalletTown_EventScript_16586B:: @ 816586B diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index d9c3729ae..b8d786c41 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -51,7 +51,7 @@ EventScript_168DB9:: @ 8168DB9 compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 goto_if_lt EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_168E3C msgbox gUnknown_818D8B2 special Special_ChooseMonFromParty @@ -167,13 +167,13 @@ EventScript_168F59:: @ 8168F59 end PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63 - msgbox gUnknown_818D763, 2 + msgbox gUnknown_818D763, MSGBOX_NPC end PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C - msgbox gUnknown_818D7A1, 3 + msgbox gUnknown_818D7A1, MSGBOX_SIGN end PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75 - msgbox gUnknown_818DC47, 3 + msgbox gUnknown_818DC47, MSGBOX_SIGN end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 983e1b1d3..0c623394d 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -22,11 +22,11 @@ EventScript_168CC8:: @ 8168CC8 end PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 - msgbox gUnknown_818D50B, 3 + msgbox gUnknown_818D50B, MSGBOX_SIGN end PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB - msgbox gUnknown_818D53B, 3 + msgbox gUnknown_818D53B, MSGBOX_SIGN end gUnknown_8168CE4:: @ 8168CE4 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 8e20d3cab..825b86e7f 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1167,25 +1167,25 @@ EventScript_169BE1:: @ 8169BE1 EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_ThisPokeIsRealyEnergetic - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_ThisPokeIsRealyEnergetic - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_ThisPokeIsRealyEnergetic - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_DeclinedStarter end @@ -1209,9 +1209,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 playfanfare MUS_FAN5 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_GiveNicknameToStarter - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_SkipGiveNicknameToStarter end @@ -1368,15 +1368,15 @@ PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46 end PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F - msgbox gUnknown_818E9E5, 2 + msgbox gUnknown_818E9E5, MSGBOX_NPC end PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68 - msgbox gUnknown_818EAF4, 3 + msgbox gUnknown_818EAF4, MSGBOX_SIGN end PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 - msgbox gUnknown_818EA66, 3 + msgbox gUnknown_818EA66, MSGBOX_SIGN end PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 4f9cef868..fd8b6ec9a 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1025,14 +1025,14 @@ Movement_166042:: @ 8166042 step_end PewterCity_EventScript_166075:: @ 8166075 - msgbox gUnknown_817E436, 2 + msgbox gUnknown_817E436, MSGBOX_NPC end PewterCity_EventScript_16607E:: @ 816607E lock faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_166136 msgbox gUnknown_817E589 closemessage @@ -1351,7 +1351,7 @@ PewterCity_EventScript_166244:: @ 8166244 lock faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_166263 msgbox gUnknown_817E644 release @@ -1363,15 +1363,15 @@ EventScript_166263:: @ 8166263 end PewterCity_EventScript_16626D:: @ 816626D - msgbox gUnknown_817E6F6, 3 + msgbox gUnknown_817E6F6, MSGBOX_SIGN end PewterCity_EventScript_166276:: @ 8166276 - msgbox gUnknown_817E748, 3 + msgbox gUnknown_817E748, MSGBOX_SIGN end PewterCity_EventScript_16627F:: @ 816627F - msgbox gUnknown_817E7C5, 3 + msgbox gUnknown_817E7C5, MSGBOX_SIGN end PewterCity_EventScript_166288:: @ 8166288 @@ -1382,7 +1382,7 @@ PewterCity_EventScript_166288:: @ 8166288 end PewterCity_EventScript_1662A0:: @ 81662A0 - msgbox gUnknown_817E824, 3 + msgbox gUnknown_817E824, MSGBOX_SIGN end PewterCity_EventScript_1662A9:: @ 81662A9 diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 540cf7965..92bafee06 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -38,7 +38,7 @@ EventScript_16A634:: @ 816A634 PewterCity_Gym_EventScript_16A63E:: @ 816A63E trainerbattle_single TRAINER_CAMPER_LIAM, Text_1911EC, Text_191237 - msgbox gUnknown_819126B, 6 + msgbox gUnknown_819126B, MSGBOX_AUTOCLOSE end PewterCity_Gym_EventScript_16A655:: @ 816A655 @@ -46,9 +46,9 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 faceplayer goto_if_set FLAG_DEFEATED_BROCK, EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16A689 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A697 end diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index cbd49c57a..58d201193 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -2,7 +2,7 @@ PewterCity_House1_MapScripts:: @ 816A71C .byte 0 PewterCity_House1_EventScript_16A71D:: @ 816A71D - msgbox gUnknown_81915DB, 2 + msgbox gUnknown_81915DB, MSGBOX_NPC end PewterCity_House1_EventScript_16A726:: @ 816A726 diff --git a/data/maps/PewterCity_House2/scripts.inc b/data/maps/PewterCity_House2/scripts.inc index 2db341b30..52a5bbc02 100644 --- a/data/maps/PewterCity_House2/scripts.inc +++ b/data/maps/PewterCity_House2/scripts.inc @@ -2,9 +2,9 @@ PewterCity_House2_MapScripts:: @ 816A7DC .byte 0 PewterCity_House2_EventScript_16A7DD:: @ 816A7DD - msgbox gUnknown_81917E4, 2 + msgbox gUnknown_81917E4, MSGBOX_NPC end PewterCity_House2_EventScript_16A7E6:: @ 816A7E6 - msgbox gUnknown_8191840, 2 + msgbox gUnknown_8191840, MSGBOX_NPC end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 72b021f20..d4f0b37c4 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -2,11 +2,11 @@ PewterCity_Mart_MapScripts:: @ 816A6CD .byte 0 PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE - msgbox gUnknown_81914DE, 2 + msgbox gUnknown_81914DE, MSGBOX_NPC end PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 - msgbox gUnknown_8191541, 2 + msgbox gUnknown_8191541, MSGBOX_NPC end PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index be0f797f3..f4a0345c5 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -16,9 +16,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16A367 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A37B end @@ -64,7 +64,7 @@ EventScript_16A3D1:: @ 816A3D1 textcolor 0 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16A402 msgbox gUnknown_81904F9 closemessage @@ -142,11 +142,11 @@ Movement_16A499:: @ 816A499 step_end PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C - msgbox gUnknown_81908CD, 2 + msgbox gUnknown_81908CD, MSGBOX_NPC end PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 - msgbox gUnknown_81906B4, 2 + msgbox gUnknown_81906B4, MSGBOX_NPC end PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE @@ -174,7 +174,7 @@ EventScript_16A4FF:: @ 816A4FF end PewterCity_Museum_1F_EventScript_16A509:: @ 816A509 - msgbox gUnknown_819090A, 2 + msgbox gUnknown_819090A, MSGBOX_NPC end PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 diff --git a/data/maps/PewterCity_Museum_2F/scripts.inc b/data/maps/PewterCity_Museum_2F/scripts.inc index 0e57e2c70..11b1af625 100644 --- a/data/maps/PewterCity_Museum_2F/scripts.inc +++ b/data/maps/PewterCity_Museum_2F/scripts.inc @@ -2,29 +2,29 @@ PewterCity_Museum_2F_MapScripts:: @ 816A552 .byte 0 PewterCity_Museum_2F_EventScript_16A553:: @ 816A553 - msgbox gUnknown_8190B30, 2 + msgbox gUnknown_8190B30, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C - msgbox gUnknown_8190B80, 2 + msgbox gUnknown_8190B80, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A565:: @ 816A565 - msgbox gUnknown_8190BF3, 2 + msgbox gUnknown_8190BF3, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E - msgbox gUnknown_8190C1E, 2 + msgbox gUnknown_8190C1E, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A577:: @ 816A577 - msgbox gUnknown_8190C60, 2 + msgbox gUnknown_8190C60, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A580:: @ 816A580 - msgbox gUnknown_8190C81, 3 + msgbox gUnknown_8190C81, MSGBOX_SIGN end PewterCity_Museum_2F_EventScript_16A589:: @ 816A589 - msgbox gUnknown_8190C8F, 3 + msgbox gUnknown_8190C8F, MSGBOX_SIGN end diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index d8e30aff3..ababfb549 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -15,7 +15,7 @@ PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F end PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778 - msgbox gUnknown_81916A9, 2 + msgbox gUnknown_81916A9, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 @@ -31,7 +31,7 @@ PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 end PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798 - msgbox gUnknown_8191701, 2 + msgbox gUnknown_8191701, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 @@ -41,5 +41,5 @@ PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 end PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC - msgbox gUnknown_8191780, 2 + msgbox gUnknown_8191780, MSGBOX_NPC end diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 42fe1d0b1..6fd52bafc 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -23,10 +23,10 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 PokemonMansion_1F_EventScript_162226:: @ 8162226 trainerbattle_single TRAINER_SCIENTIST_TED, Text_177364, Text_177391 - msgbox gUnknown_8177397, 6 + msgbox gUnknown_8177397, MSGBOX_AUTOCLOSE end PokemonMansion_1F_EventScript_16223D:: @ 816223D trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, Text_1773C6, Text_1773FD - msgbox gUnknown_8177418, 6 + msgbox gUnknown_8177418, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index bc80d5344..e19c2ed7f 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -17,14 +17,14 @@ PokemonMansion_2F_EventScript_162264:: @ 8162264 end PokemonMansion_2F_EventScript_162278:: @ 8162278 - msgbox gUnknown_817751F, 3 + msgbox gUnknown_817751F, MSGBOX_SIGN end PokemonMansion_2F_EventScript_162281:: @ 8162281 - msgbox gUnknown_8177574, 3 + msgbox gUnknown_8177574, MSGBOX_SIGN end PokemonMansion_2F_EventScript_16228A:: @ 816228A trainerbattle_single TRAINER_BURGLAR_ARNIE, Text_177498, Text_1774CB - msgbox gUnknown_81774E3, 6 + msgbox gUnknown_81774E3, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index ff194f1ec..fe6eefcb0 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -17,15 +17,15 @@ PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 end PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 - msgbox gUnknown_8177685, 3 + msgbox gUnknown_8177685, MSGBOX_SIGN end PokemonMansion_3F_EventScript_1622CE:: @ 81622CE trainerbattle_single TRAINER_BURGLAR_SIMON, Text_1775E7, Text_177602 - msgbox gUnknown_8177608, 6 + msgbox gUnknown_8177608, MSGBOX_AUTOCLOSE end PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 trainerbattle_single TRAINER_SCIENTIST_BRAYDON, Text_177628, Text_177643 - msgbox gUnknown_8177657, 6 + msgbox gUnknown_8177657, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index db087a466..d1641f28a 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -17,15 +17,15 @@ PokemonMansion_B1F_EventScript_16230C:: @ 816230C end PokemonMansion_B1F_EventScript_162320:: @ 8162320 - msgbox gUnknown_8177798, 3 + msgbox gUnknown_8177798, MSGBOX_SIGN end PokemonMansion_B1F_EventScript_162329:: @ 8162329 trainerbattle_single TRAINER_BURGLAR_LEWIS, Text_1776C0, Text_1776D7 - msgbox gUnknown_81776DE, 6 + msgbox gUnknown_81776DE, MSGBOX_AUTOCLOSE end PokemonMansion_B1F_EventScript_162340:: @ 8162340 trainerbattle_single TRAINER_SCIENTIST_IVAN, Text_177720, Text_177757 - msgbox gUnknown_817776A, 6 + msgbox gUnknown_817776A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index 01686671a..961468138 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -7,15 +7,15 @@ PokemonTower_1F_OnTransition:: @ 816323B end PokemonTower_1F_EventScript_16323F:: @ 816323F - msgbox gUnknown_8179CAB, 2 + msgbox gUnknown_8179CAB, MSGBOX_NPC end PokemonTower_1F_EventScript_163248:: @ 8163248 - msgbox gUnknown_8179C8C, 2 + msgbox gUnknown_8179C8C, MSGBOX_NPC end PokemonTower_1F_EventScript_163251:: @ 8163251 - msgbox gUnknown_8179C41, 2 + msgbox gUnknown_8179C41, MSGBOX_NPC end PokemonTower_1F_EventScript_16325A:: @ 816325A @@ -34,5 +34,5 @@ EventScript_163272:: @ 8163272 end PokemonTower_1F_EventScript_16327C:: @ 816327C - msgbox gUnknown_8179B7A, 2 + msgbox gUnknown_8179B7A, MSGBOX_NPC end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 802247402..7180936fb 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -2,7 +2,7 @@ PokemonTower_2F_MapScripts:: @ 8163285 .byte 0 PokemonTower_2F_EventScript_163286:: @ 8163286 - msgbox gUnknown_8179EAE, 2 + msgbox gUnknown_8179EAE, MSGBOX_NPC end PokemonTower_2F_EventScript_16328F:: @ 816328F diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index d38b39b66..a6a278554 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -3,15 +3,15 @@ PokemonTower_3F_MapScripts:: @ 81633A6 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 trainerbattle_single TRAINER_CHANNELER_PATRICIA, Text_179FA0, Text_179FBC - msgbox gUnknown_8179FD3, 6 + msgbox gUnknown_8179FD3, MSGBOX_AUTOCLOSE end PokemonTower_3F_EventScript_1633BE:: @ 81633BE trainerbattle_single TRAINER_CHANNELER_CARLY, Text_179F62, Text_179F72 - msgbox gUnknown_8179F88, 6 + msgbox gUnknown_8179F88, MSGBOX_AUTOCLOSE end PokemonTower_3F_EventScript_1633D5:: @ 81633D5 trainerbattle_single TRAINER_CHANNELER_HOPE, Text_179F09, Text_179F21 - msgbox gUnknown_8179F31, 6 + msgbox gUnknown_8179F31, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index c6745eb70..238e600e7 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -3,15 +3,15 @@ PokemonTower_4F_MapScripts:: @ 81633EC PokemonTower_4F_EventScript_1633ED:: @ 81633ED trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017 - msgbox gUnknown_817A02B, 6 + msgbox gUnknown_817A02B, MSGBOX_AUTOCLOSE end PokemonTower_4F_EventScript_163404:: @ 8163404 trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061 - msgbox gUnknown_817A067, 6 + msgbox gUnknown_817A067, MSGBOX_AUTOCLOSE end PokemonTower_4F_EventScript_16341B:: @ 816341B trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB - msgbox gUnknown_817A0BB, 6 + msgbox gUnknown_817A0BB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 156cfd038..c96354826 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -2,7 +2,7 @@ PokemonTower_5F_MapScripts:: @ 8163432 .byte 0 PokemonTower_5F_EventScript_163433:: @ 8163433 - msgbox gUnknown_817A0E3, 2 + msgbox gUnknown_817A0E3, MSGBOX_NPC end PokemonTower_5F_EventScript_16343C:: @ 816343C @@ -23,20 +23,20 @@ PokemonTower_5F_EventScript_163453:: @ 8163453 PokemonTower_5F_EventScript_16345B:: @ 816345B trainerbattle_single TRAINER_CHANNELER_TAMMY, Text_17A11F, Text_17A132 - msgbox gUnknown_817A138, 6 + msgbox gUnknown_817A138, MSGBOX_AUTOCLOSE end PokemonTower_5F_EventScript_163472:: @ 8163472 trainerbattle_single TRAINER_CHANNELER_RUTH, Text_17A150, Text_17A164 - msgbox gUnknown_817A176, 6 + msgbox gUnknown_817A176, MSGBOX_AUTOCLOSE end PokemonTower_5F_EventScript_163489:: @ 8163489 trainerbattle_single TRAINER_CHANNELER_KARINA, Text_17A187, Text_17A190 - msgbox gUnknown_817A194, 6 + msgbox gUnknown_817A194, MSGBOX_AUTOCLOSE end PokemonTower_5F_EventScript_1634A0:: @ 81634A0 trainerbattle_single TRAINER_CHANNELER_JANAE, Text_17A1AA, Text_17A1B7 - msgbox gUnknown_817A1BD, 6 + msgbox gUnknown_817A1BD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 3d74508e6..8f4500615 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -37,15 +37,15 @@ Movement_163512:: @ 8163512 PokemonTower_6F_EventScript_163514:: @ 8163514 trainerbattle_single TRAINER_CHANNELER_ANGELICA, Text_17A243, Text_17A253 - msgbox gUnknown_817A25A, 6 + msgbox gUnknown_817A25A, MSGBOX_AUTOCLOSE end PokemonTower_6F_EventScript_16352B:: @ 816352B trainerbattle_single TRAINER_CHANNELER_EMILIA, Text_17A272, Text_17A27F - msgbox gUnknown_817A293, 6 + msgbox gUnknown_817A293, MSGBOX_AUTOCLOSE end PokemonTower_6F_EventScript_163542:: @ 8163542 trainerbattle_single TRAINER_CHANNELER_JENNIFER, Text_17A2C8, Text_17A2DC - msgbox gUnknown_817A2E2, 6 + msgbox gUnknown_817A2E2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 5ce28e764..9f7986523 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -17,7 +17,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A PokemonTower_7F_EventScript_163586:: @ 8163586 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, Text_17A380, Text_17A3A4, EventScript_1635A1 - msgbox gUnknown_817A3AF, 6 + msgbox gUnknown_817A3AF, MSGBOX_AUTOCLOSE end EventScript_1635A1:: @ 81635A1 @@ -104,7 +104,7 @@ Movement_163633:: @ 8163633 PokemonTower_7F_EventScript_16363D:: @ 816363D trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, Text_17A3CD, Text_17A466, EventScript_163658 - msgbox gUnknown_817A477, 6 + msgbox gUnknown_817A477, MSGBOX_AUTOCLOSE end EventScript_163658:: @ 8163658 @@ -170,7 +170,7 @@ Movement_1636CD:: @ 81636CD PokemonTower_7F_EventScript_1636D6:: @ 81636D6 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, Text_17A4CF, Text_17A4EE, EventScript_1636F1 - msgbox gUnknown_817A506, 6 + msgbox gUnknown_817A506, MSGBOX_AUTOCLOSE end EventScript_1636F1:: @ 81636F1 diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index 8049032dd..49daa21a7 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -7,40 +7,40 @@ RockTunnel_1F_OnTransition:: @ 8162DDC end RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 - msgbox gUnknown_817962D, 3 + msgbox gUnknown_817962D, MSGBOX_SIGN end RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388 - msgbox gUnknown_8179396, 6 + msgbox gUnknown_8179396, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E00:: @ 8162E00 trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E - msgbox gUnknown_817943A, 6 + msgbox gUnknown_817943A, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E17:: @ 8162E17 trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC - msgbox gUnknown_81794B4, 6 + msgbox gUnknown_81794B4, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E2E:: @ 8162E2E trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE - msgbox gUnknown_81794F9, 6 + msgbox gUnknown_81794F9, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E45:: @ 8162E45 trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547 - msgbox gUnknown_8179558, 6 + msgbox gUnknown_8179558, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E5C:: @ 8162E5C trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604 - msgbox gUnknown_8179613, 6 + msgbox gUnknown_8179613, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E73:: @ 8162E73 trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1 - msgbox gUnknown_81795B5, 6 + msgbox gUnknown_81795B5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 39cf01a9b..e2c34b53e 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -3,40 +3,40 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9 - msgbox gUnknown_81796CE, 6 + msgbox gUnknown_81796CE, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD - msgbox gUnknown_81798E9, 6 + msgbox gUnknown_81798E9, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700 - msgbox gUnknown_8179712, 6 + msgbox gUnknown_8179712, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856 - msgbox gUnknown_817987A, 6 + msgbox gUnknown_817987A, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932 - msgbox gUnknown_817993E, 6 + msgbox gUnknown_817993E, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F - msgbox gUnknown_8179777, 6 + msgbox gUnknown_8179777, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162F15:: @ 8162F15 trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB - msgbox gUnknown_81797DE, 6 + msgbox gUnknown_81797DE, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997 - msgbox gUnknown_81799AC, 6 + msgbox gUnknown_81799AC, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index a5158b6f3..e9f52ceef 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -14,27 +14,27 @@ RocketHideout_B1F_OnTransition:: @ 81611AA RocketHideout_B1F_EventScript_1611AE:: @ 81611AE trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED - msgbox gUnknown_8174EFA, 6 + msgbox gUnknown_8174EFA, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60 - msgbox gUnknown_8174F66, 6 + msgbox gUnknown_8174F66, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4 - msgbox gUnknown_8174FB3, 6 + msgbox gUnknown_8174FB3, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8 - msgbox gUnknown_8175007, 6 + msgbox gUnknown_8175007, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_16120A:: @ 816120A trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225 - msgbox gUnknown_8175060, 6 + msgbox gUnknown_8175060, MSGBOX_AUTOCLOSE end EventScript_161225:: @ 8161225 diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 9e6338f9c..07916ad03 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -3,5 +3,5 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF - msgbox gUnknown_81750CC, 6 + msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index 962aa3385..d6a57ab77 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -3,10 +3,10 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A - msgbox gUnknown_817515B, 6 + msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE end RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE - msgbox gUnknown_81751E0, 6 + msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 2324e6fc6..ab1fb6865 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -73,7 +73,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD RocketHideout_B4F_EventScript_1613CE:: @ 81613CE trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9 - msgbox gUnknown_817540C, 6 + msgbox gUnknown_817540C, MSGBOX_AUTOCLOSE end EventScript_1613E9:: @ 81613E9 @@ -91,7 +91,7 @@ EventScript_1613E9:: @ 81613E9 RocketHideout_B4F_EventScript_161418:: @ 8161418 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433 - msgbox gUnknown_817546A, 6 + msgbox gUnknown_817546A, MSGBOX_AUTOCLOSE end EventScript_161433:: @ 8161433 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 96e12e7da..e4f5feb16 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -28,9 +28,9 @@ EventScript_167F48:: @ 8167F48 end Route1_EventScript_167F52:: @ 8167F52 - msgbox gUnknown_81833B9, 2 + msgbox gUnknown_81833B9, MSGBOX_NPC end Route1_EventScript_167F5B:: @ 8167F5B - msgbox gUnknown_818343A, 3 + msgbox gUnknown_818343A, MSGBOX_SIGN end diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc index 96ce99c8e..7fb5d64cd 100644 --- a/data/maps/Route10/scripts.inc +++ b/data/maps/Route10/scripts.inc @@ -5,13 +5,13 @@ Route10_EventScript_167FDA:: @ 8167FDA end Route10_EventScript_167FDB:: @ 8167FDB - msgbox gUnknown_8184EC5, 3 + msgbox gUnknown_8184EC5, MSGBOX_SIGN end Route10_EventScript_167FE4:: @ 8167FE4 - msgbox gUnknown_8184EE9, 3 + msgbox gUnknown_8184EE9, MSGBOX_SIGN end Route10_EventScript_167FED:: @ 8167FED - msgbox gUnknown_8184EF5, 3 + msgbox gUnknown_8184EF5, MSGBOX_SIGN end diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 32864b8fb..e902a3896 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -16,15 +16,15 @@ Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 end Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A - msgbox gUnknown_819E59D, 2 + msgbox gUnknown_819E59D, MSGBOX_NPC end Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53 - msgbox gUnknown_819E523, 2 + msgbox gUnknown_819E523, MSGBOX_NPC end Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C - msgbox gUnknown_819E5D2, 2 + msgbox gUnknown_819E5D2, MSGBOX_NPC end Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 @@ -33,7 +33,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 call EventScript_16FCF1 goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc index fa85a5bb8..11f052030 100644 --- a/data/maps/Route11/scripts.inc +++ b/data/maps/Route11/scripts.inc @@ -2,5 +2,5 @@ Route11_MapScripts:: @ 8167FF6 .byte 0 Route11_EventScript_167FF7:: @ 8167FF7 - msgbox gUnknown_8185308, 3 + msgbox gUnknown_8185308, MSGBOX_SIGN end diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc index 476379753..0a2f2cb75 100644 --- a/data/maps/Route11_EastEntrance_1F/scripts.inc +++ b/data/maps/Route11_EastEntrance_1F/scripts.inc @@ -2,9 +2,9 @@ Route11_EastEntrance_1F_MapScripts:: @ 816FD21 .byte 0 Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 - msgbox gUnknown_819E8A6, 2 + msgbox gUnknown_819E8A6, MSGBOX_NPC end Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B - msgbox gUnknown_819E97B, 2 + msgbox gUnknown_819E97B, MSGBOX_NPC end diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 28222d32a..ec61893ec 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -14,7 +14,7 @@ EventScript_16FD49:: @ 816FD49 end Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53 - msgbox gUnknown_819ED1F, 3 + msgbox gUnknown_819ED1F, MSGBOX_SIGN end Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C @@ -24,7 +24,7 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C call EventScript_1A8CAD goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD compare VAR_0x8004, 6 @@ -60,7 +60,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 call EventScript_16FE64 goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 5aa50bfc1..fe21ac1d2 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -19,7 +19,7 @@ Route12_EventScript_168014:: @ 8168014 goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE @@ -57,9 +57,9 @@ EventScript_168099:: @ 8168099 end Route12_EventScript_1680A3:: @ 81680A3 - msgbox gUnknown_8185797, 3 + msgbox gUnknown_8185797, MSGBOX_SIGN end Route12_EventScript_1680AC:: @ 81680AC - msgbox gUnknown_81857B3, 3 + msgbox gUnknown_81857B3, MSGBOX_SIGN end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index d69b1a68a..8421e5ffa 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -6,7 +6,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C faceplayer goto_if_set FLAG_GOT_SUPER_ROD, EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16FF34 msgbox gUnknown_819F1FA release diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc index d91f0c7c8..990d5f793 100644 --- a/data/maps/Route12_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc @@ -2,5 +2,5 @@ Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D .byte 0 Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E - msgbox gUnknown_819EDA7, 2 + msgbox gUnknown_819EDA7, MSGBOX_NPC end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 1c6014110..e56f096f6 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -2,11 +2,11 @@ Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 .byte 0 Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78 - msgbox gUnknown_819EF5D, 3 + msgbox gUnknown_819EF5D, MSGBOX_SIGN end Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 - msgbox gUnknown_819EFA0, 3 + msgbox gUnknown_819EFA0, MSGBOX_SIGN end Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc index fcec8204a..6524d5dd6 100644 --- a/data/maps/Route13/scripts.inc +++ b/data/maps/Route13/scripts.inc @@ -2,13 +2,13 @@ Route13_MapScripts:: @ 81680B5 .byte 0 Route13_EventScript_1680B6:: @ 81680B6 - msgbox gUnknown_8185DB7, 3 + msgbox gUnknown_8185DB7, MSGBOX_SIGN end Route13_EventScript_1680BF:: @ 81680BF - msgbox gUnknown_8185DEF, 3 + msgbox gUnknown_8185DEF, MSGBOX_SIGN end Route13_EventScript_1680C8:: @ 81680C8 - msgbox gUnknown_8185E2C, 3 + msgbox gUnknown_8185E2C, MSGBOX_SIGN end diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc index 207604cdc..551940250 100644 --- a/data/maps/Route14/scripts.inc +++ b/data/maps/Route14/scripts.inc @@ -2,5 +2,5 @@ Route14_MapScripts:: @ 81680D1 .byte 0 Route14_EventScript_1680D2:: @ 81680D2 - msgbox gUnknown_8186399, 3 + msgbox gUnknown_8186399, MSGBOX_SIGN end diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc index a4d0a3240..40890250c 100644 --- a/data/maps/Route15/scripts.inc +++ b/data/maps/Route15/scripts.inc @@ -2,5 +2,5 @@ Route15_MapScripts:: @ 81680DB .byte 0 Route15_EventScript_1680DC:: @ 81680DC - msgbox gUnknown_8186A77, 3 + msgbox gUnknown_8186A77, MSGBOX_SIGN end diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc index 458f5e010..9f753e6c9 100644 --- a/data/maps/Route15_WestEntrance_1F/scripts.inc +++ b/data/maps/Route15_WestEntrance_1F/scripts.inc @@ -2,5 +2,5 @@ Route15_WestEntrance_1F_MapScripts:: @ 8170088 .byte 0 Route15_WestEntrance_1F_EventScript_170089:: @ 8170089 - msgbox gUnknown_819F560, 2 + msgbox gUnknown_819F560, MSGBOX_NPC end diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 3968fc32d..8bd966692 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -14,7 +14,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 end Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0 - msgbox gUnknown_819F7F8, 3 + msgbox gUnknown_819F7F8, MSGBOX_SIGN end Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 @@ -23,7 +23,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 call EventScript_170145 goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 837ad0fc7..135858798 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -38,7 +38,7 @@ Route16_EventScript_168121:: @ 8168121 goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE @@ -75,9 +75,9 @@ EventScript_1681A3:: @ 81681A3 end Route16_EventScript_1681AD:: @ 81681AD - msgbox gUnknown_8186F7A, 3 + msgbox gUnknown_8186F7A, MSGBOX_SIGN end Route16_EventScript_1681B6:: @ 81681B6 - msgbox gUnknown_8186F98, 3 + msgbox gUnknown_8186F98, MSGBOX_SIGN end diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index a8abfb255..a99a1ec18 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -12,7 +12,7 @@ EventScript_1701D5:: @ 81701D5 return Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB - msgbox gUnknown_819F98B, 2 + msgbox gUnknown_819F98B, MSGBOX_NPC end Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4 @@ -114,5 +114,5 @@ Movement_1702B3:: @ 81702B3 step_end Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 - msgbox gUnknown_819F9E8, 2 + msgbox gUnknown_819F9E8, MSGBOX_NPC end diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 9b2dd6737..18c15c1e2 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -2,19 +2,19 @@ Route16_NorthEntrance_2F_MapScripts:: @ 81702BE .byte 0 Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF - msgbox gUnknown_819FA07, 2 + msgbox gUnknown_819FA07, MSGBOX_NPC end Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8 - msgbox gUnknown_819FA41, 2 + msgbox gUnknown_819FA41, MSGBOX_NPC end Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1 - msgbox gUnknown_819FA6F, 3 + msgbox gUnknown_819FA6F, MSGBOX_SIGN end Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA - msgbox gUnknown_819FAB9, 3 + msgbox gUnknown_819FAB9, MSGBOX_SIGN end Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 @@ -23,7 +23,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 call EventScript_17036F goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc index 12d99102a..8633ab23e 100644 --- a/data/maps/Route17/scripts.inc +++ b/data/maps/Route17/scripts.inc @@ -2,25 +2,25 @@ Route17_MapScripts:: @ 81681BF .byte 0 Route17_EventScript_1681C0:: @ 81681C0 - msgbox gUnknown_81874E4, 3 + msgbox gUnknown_81874E4, MSGBOX_SIGN end Route17_EventScript_1681C9:: @ 81681C9 - msgbox gUnknown_8187512, 3 + msgbox gUnknown_8187512, MSGBOX_SIGN end Route17_EventScript_1681D2:: @ 81681D2 - msgbox gUnknown_818757B, 3 + msgbox gUnknown_818757B, MSGBOX_SIGN end Route17_EventScript_1681DB:: @ 81681DB - msgbox gUnknown_81875BE, 3 + msgbox gUnknown_81875BE, MSGBOX_SIGN end Route17_EventScript_1681E4:: @ 81681E4 - msgbox gUnknown_81875E3, 3 + msgbox gUnknown_81875E3, MSGBOX_SIGN end Route17_EventScript_1681ED:: @ 81681ED - msgbox gUnknown_8187622, 3 + msgbox gUnknown_8187622, MSGBOX_SIGN end diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index c988ccb1b..25fda03c2 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -21,9 +21,9 @@ EventScript_16821B:: @ 816821B end Route18_EventScript_16821F:: @ 816821F - msgbox gUnknown_8187757, 3 + msgbox gUnknown_8187757, MSGBOX_SIGN end Route18_EventScript_168228:: @ 8168228 - msgbox gUnknown_818777C, 3 + msgbox gUnknown_818777C, MSGBOX_SIGN end diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 8e8b8a531..e49eb285f 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -12,7 +12,7 @@ EventScript_17038B:: @ 817038B return Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 - msgbox gUnknown_819FD3A, 2 + msgbox gUnknown_819FD3A, MSGBOX_NPC end Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 8878cfa1f..83c79b9ae 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -2,11 +2,11 @@ Route18_EastEntrance_2F_MapScripts:: @ 817046B .byte 0 Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C - msgbox gUnknown_819FD6B, 3 + msgbox gUnknown_819FD6B, MSGBOX_SIGN end Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 - msgbox gUnknown_819FDB3, 3 + msgbox gUnknown_819FDB3, MSGBOX_SIGN end Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E @@ -16,7 +16,7 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E call EventScript_1A8CAD goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1704D8 call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc index 28a71830d..16d6e4669 100644 --- a/data/maps/Route19/scripts.inc +++ b/data/maps/Route19/scripts.inc @@ -2,5 +2,5 @@ Route19_MapScripts:: @ 8168231 .byte 0 Route19_EventScript_168232:: @ 8168232 - msgbox gUnknown_8187C06, 3 + msgbox gUnknown_8187C06, MSGBOX_SIGN end diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc index 67ba5729e..75a3dd87b 100644 --- a/data/maps/Route2/scripts.inc +++ b/data/maps/Route2/scripts.inc @@ -2,9 +2,9 @@ Route2_MapScripts:: @ 8167F64 .byte 0 Route2_EventScript_167F65:: @ 8167F65 - msgbox gUnknown_818345E, 3 + msgbox gUnknown_818345E, MSGBOX_SIGN end Route2_EventScript_167F6E:: @ 8167F6E - msgbox gUnknown_8183482, 3 + msgbox gUnknown_8183482, MSGBOX_SIGN end diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index 2131ca106..a034c3610 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -28,5 +28,5 @@ EventScript_16826D:: @ 816826D return Route20_EventScript_168280:: @ 8168280 - msgbox gUnknown_81882D1, 3 + msgbox gUnknown_81882D1, MSGBOX_SIGN end diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 58380f0e9..8036883f3 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -257,5 +257,5 @@ Movement_1684DA:: @ 81684DA step_end Route22_EventScript_1684E2:: @ 81684E2 - msgbox gUnknown_8188BFF, 3 + msgbox gUnknown_8188BFF, MSGBOX_SIGN end diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index 4a3fcaf60..b5c8da4f3 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -124,5 +124,5 @@ Route23_EventScript_168601:: @ 8168601 end Route23_EventScript_168616:: @ 8168616 - msgbox gUnknown_8188C19, 3 + msgbox gUnknown_8188C19, MSGBOX_SIGN end diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc index 81b2704d4..d214cdbf6 100644 --- a/data/maps/Route25/scripts.inc +++ b/data/maps/Route25/scripts.inc @@ -2,9 +2,9 @@ Route25_MapScripts:: @ 8168745 .byte 0 Route25_EventScript_168746:: @ 8168746 - msgbox gUnknown_818954C, 3 + msgbox gUnknown_818954C, MSGBOX_SIGN end Route25_EventScript_16874F:: @ 816874F - msgbox gUnknown_81895C2, 2 + msgbox gUnknown_81895C2, MSGBOX_NPC end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 1a35552e4..725728930 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -40,7 +40,7 @@ EventScript_17058E:: @ 817058E end EventScript_17059C:: @ 817059C - compare VAR_RESULT, 0 + compare VAR_RESULT, NO call_if_eq EventScript_170600 msgbox gUnknown_819FFD3 closemessage diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index dec1a7e0c..7b9f92e44 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -7,7 +7,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F call EventScript_16F70B goto_if_set FLAG_GOT_HM05, EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount @@ -36,5 +36,5 @@ EventScript_16F70B:: @ 816F70B return Route2_EastBuilding_EventScript_16F714:: @ 816F714 - msgbox gUnknown_819D81E, 2 + msgbox gUnknown_819D81E, MSGBOX_NPC end diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 5b92d8298..f4bc2d0ed 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -2,7 +2,7 @@ Route2_House_MapScripts:: @ 816F5F8 .byte 0 Route2_House_EventScript_16F5F9:: @ 816F5F9 - msgbox gUnknown_819D5E7, 2 + msgbox gUnknown_819D5E7, MSGBOX_NPC end Route2_House_EventScript_16F602:: @ 816F602 @@ -12,7 +12,7 @@ Route2_House_EventScript_16F602:: @ 816F602 call EventScript_1A8CAD goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16F65C call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc index 6ed3f355a..29e6bd757 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc @@ -2,13 +2,13 @@ Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D .byte 0 Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E - msgbox gUnknown_819D85C, 2 + msgbox gUnknown_819D85C, MSGBOX_NPC end Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727 - msgbox gUnknown_819D8D0, 2 + msgbox gUnknown_819D8D0, MSGBOX_NPC end Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730 - msgbox gUnknown_819D93B, 2 + msgbox gUnknown_819D93B, MSGBOX_NPC end diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc index a8aba4941..aea8bfaa4 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc @@ -2,9 +2,9 @@ Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5 .byte 0 Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6 - msgbox gUnknown_819D52C, 2 + msgbox gUnknown_819D52C, MSGBOX_NPC end Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF - msgbox gUnknown_819D58B, 2 + msgbox gUnknown_819D58B, MSGBOX_NPC end diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc index 7bf593794..bc44936d0 100644 --- a/data/maps/Route3/scripts.inc +++ b/data/maps/Route3/scripts.inc @@ -2,9 +2,9 @@ Route3_MapScripts:: @ 8167F77 .byte 0 Route3_EventScript_167F78:: @ 8167F78 - msgbox gUnknown_8183491, 2 + msgbox gUnknown_8183491, MSGBOX_NPC end Route3_EventScript_167F81:: @ 8167F81 - msgbox gUnknown_81838C0, 3 + msgbox gUnknown_81838C0, MSGBOX_SIGN end diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index 230c13d3b..9055722eb 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -5,13 +5,13 @@ Route4_EventScript_167F8B:: @ 8167F8B end Route4_EventScript_167F8C:: @ 8167F8C - msgbox gUnknown_81838D7, 2 + msgbox gUnknown_81838D7, MSGBOX_NPC end Route4_EventScript_167F95:: @ 8167F95 - msgbox gUnknown_818399B, 3 + msgbox gUnknown_818399B, MSGBOX_SIGN end Route4_EventScript_167F9E:: @ 8167F9E - msgbox gUnknown_81839B4, 3 + msgbox gUnknown_81839B4, MSGBOX_SIGN end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index bb8294e6d..7e236951a 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ Route4_PokemonCenter_1F_OnTransition:: @ 816F744 end Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - msgbox gUnknown_819D9D4, 2 + msgbox gUnknown_819D9D4, MSGBOX_NPC end Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 @@ -41,7 +41,7 @@ EventScript_16F794:: @ 816F794 end EventScript_16F7A2:: @ 816F7A2 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16F888 checkmoney 500, 0 compare VAR_RESULT, 0 @@ -60,7 +60,7 @@ EventScript_16F7A2:: @ 816F7A2 EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16F861 call EventScript_1A8C27 fadescreen 1 @@ -73,7 +73,7 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16F84B fadescreen 1 hidemoneybox 0, 0 @@ -146,7 +146,7 @@ Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB end Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - msgbox gUnknown_819DCDB, 2 + msgbox gUnknown_819DCDB, MSGBOX_NPC end Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index 8356751b7..3e1b507d2 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -2,5 +2,5 @@ Route5_MapScripts:: @ 8167FA7 .byte 0 Route5_EventScript_167FA8:: @ 8167FA8 - msgbox gUnknown_8183DD4, 3 + msgbox gUnknown_8183DD4, MSGBOX_SIGN end diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index ca7a34e0c..f20da71ae 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -2,7 +2,7 @@ Route5_SouthEntrance_MapScripts:: @ 816F900 .byte 0 Route5_SouthEntrance_EventScript_16F901:: @ 816F901 - msgbox gUnknown_819E16D, 2 + msgbox gUnknown_819E16D, MSGBOX_NPC end Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 773e1c091..00b3efb56 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -2,5 +2,5 @@ Route6_MapScripts:: @ 8167FB1 .byte 0 Route6_EventScript_167FB2:: @ 8167FB2 - msgbox gUnknown_8184067, 3 + msgbox gUnknown_8184067, MSGBOX_SIGN end diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 393c7ee6a..d1b9a4555 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -2,7 +2,7 @@ Route6_NorthEntrance_MapScripts:: @ 816F9C6 .byte 0 Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 - msgbox gUnknown_819E2A3, 2 + msgbox gUnknown_819E2A3, MSGBOX_NPC end Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc index ec34892f4..52d0f5f36 100644 --- a/data/maps/Route7/scripts.inc +++ b/data/maps/Route7/scripts.inc @@ -2,5 +2,5 @@ Route7_MapScripts:: @ 8167FBB .byte 0 Route7_EventScript_167FBC:: @ 8167FBC - msgbox gUnknown_8184097, 3 + msgbox gUnknown_8184097, MSGBOX_SIGN end diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 17ac82ef8..cac72463b 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -2,7 +2,7 @@ Route7_EastEntrance_MapScripts:: @ 816FA8D .byte 0 Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E - msgbox gUnknown_819E3D9, 2 + msgbox gUnknown_819E3D9, MSGBOX_NPC end Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc index d2bc3749b..c0f7475f3 100644 --- a/data/maps/Route8/scripts.inc +++ b/data/maps/Route8/scripts.inc @@ -2,5 +2,5 @@ Route8_MapScripts:: @ 8167FC5 .byte 0 Route8_EventScript_167FC6:: @ 8167FC6 - msgbox gUnknown_8184576, 3 + msgbox gUnknown_8184576, MSGBOX_SIGN end diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 0ce1d1f69..df9d1035c 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -2,7 +2,7 @@ Route8_WestEntrance_MapScripts:: @ 816FB53 .byte 0 Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 - msgbox gUnknown_819E50F, 2 + msgbox gUnknown_819E50F, MSGBOX_NPC end Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index 6c3b7927b..1b48cd68e 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -2,5 +2,5 @@ Route9_MapScripts:: @ 8167FCF .byte 0 Route9_EventScript_167FD0:: @ 8167FD0 - msgbox gUnknown_8184B66, 3 + msgbox gUnknown_8184B66, MSGBOX_SIGN end diff --git a/data/maps/SSAnne_1F_Corridor/scripts.inc b/data/maps/SSAnne_1F_Corridor/scripts.inc index d9bd8c051..21967cf04 100644 --- a/data/maps/SSAnne_1F_Corridor/scripts.inc +++ b/data/maps/SSAnne_1F_Corridor/scripts.inc @@ -2,9 +2,9 @@ SSAnne_1F_Corridor_MapScripts:: @ 81608CB .byte 0 SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC - msgbox gUnknown_8172EE7, 2 + msgbox gUnknown_8172EE7, MSGBOX_NPC end SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5 - msgbox gUnknown_8172F60, 2 + msgbox gUnknown_8172F60, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Room1/scripts.inc b/data/maps/SSAnne_1F_Room1/scripts.inc index ca75fd46d..5f610c830 100644 --- a/data/maps/SSAnne_1F_Room1/scripts.inc +++ b/data/maps/SSAnne_1F_Room1/scripts.inc @@ -2,5 +2,5 @@ SSAnne_1F_Room1_MapScripts:: @ 8160BDB .byte 0 SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC - msgbox gUnknown_817393B, 2 + msgbox gUnknown_817393B, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index 24414384f..3a80d3cfe 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -2,15 +2,15 @@ SSAnne_1F_Room2_MapScripts:: @ 8160BE5 .byte 0 SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 - msgbox gUnknown_8173AC5, 2 + msgbox gUnknown_8173AC5, MSGBOX_NPC end SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F - msgbox gUnknown_8173A7A, 6 + msgbox gUnknown_8173A7A, MSGBOX_AUTOCLOSE end SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1 - msgbox gUnknown_81739C5, 6 + msgbox gUnknown_81739C5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc index bdfe2cc07..7b9651040 100644 --- a/data/maps/SSAnne_1F_Room3/scripts.inc +++ b/data/maps/SSAnne_1F_Room3/scripts.inc @@ -2,11 +2,11 @@ SSAnne_1F_Room3_MapScripts:: @ 8160C1D .byte 0 SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E - msgbox gUnknown_8173B21, 2 + msgbox gUnknown_8173B21, MSGBOX_NPC end SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27 - msgbox gUnknown_8173AFA, 2 + msgbox gUnknown_8173AFA, MSGBOX_NPC end SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30 diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 91407ef92..028442449 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -3,5 +3,5 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA - msgbox gUnknown_8173C30, 6 + msgbox gUnknown_8173C30, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 78a0f51e7..356e61152 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -5,7 +5,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 lock faceplayer msgbox gUnknown_817445B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_160E18 closemessage call EventScript_FadeOut_Heal_FadeIn diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index cde454332..5901ee65b 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -3,5 +3,5 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4 - msgbox gUnknown_8173CC4, 6 + msgbox gUnknown_8173CC4, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 46a69aa10..02b06920a 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -180,5 +180,5 @@ Movement_160A4C:: @ 8160A4C step_end SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54 - msgbox gUnknown_8172FC3, 2 + msgbox gUnknown_8172FC3, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index 90cf0a1fc..6568baa0e 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -3,10 +3,10 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7 - msgbox gUnknown_8173E04, 6 + msgbox gUnknown_8173E04, MSGBOX_AUTOCLOSE end SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92 - msgbox gUnknown_8173DB6, 6 + msgbox gUnknown_8173DB6, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc index 577503151..33924805b 100644 --- a/data/maps/SSAnne_2F_Room3/scripts.inc +++ b/data/maps/SSAnne_2F_Room3/scripts.inc @@ -2,9 +2,9 @@ SSAnne_2F_Room3_MapScripts:: @ 8160CDF .byte 0 SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0 - msgbox gUnknown_8173E3A, 2 + msgbox gUnknown_8173E3A, MSGBOX_NPC end SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9 - msgbox gUnknown_8173E7B, 2 + msgbox gUnknown_8173E7B, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 46fd35501..85ecb21bf 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -3,10 +3,10 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 trainerbattle_single TRAINER_GENTLEMAN_LAMAR, Text_173F07, Text_173F42 - msgbox gUnknown_8173F55, 6 + msgbox gUnknown_8173F55, MSGBOX_AUTOCLOSE end SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A trainerbattle_single TRAINER_LASS_DAWN, Text_173F83, Text_173FAB - msgbox gUnknown_8173FB9, 6 + msgbox gUnknown_8173FB9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc index fb835d315..9635b4bf7 100644 --- a/data/maps/SSAnne_2F_Room5/scripts.inc +++ b/data/maps/SSAnne_2F_Room5/scripts.inc @@ -2,9 +2,9 @@ SSAnne_2F_Room5_MapScripts:: @ 8160D21 .byte 0 SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 - msgbox gUnknown_8173FF7, 2 + msgbox gUnknown_8173FF7, MSGBOX_NPC end SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B - msgbox gUnknown_817404F, 2 + msgbox gUnknown_817404F, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room6/scripts.inc b/data/maps/SSAnne_2F_Room6/scripts.inc index 2fb6544da..e92a5501e 100644 --- a/data/maps/SSAnne_2F_Room6/scripts.inc +++ b/data/maps/SSAnne_2F_Room6/scripts.inc @@ -2,9 +2,9 @@ SSAnne_2F_Room6_MapScripts:: @ 8160D34 .byte 0 SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35 - msgbox gUnknown_81740A1, 2 + msgbox gUnknown_81740A1, MSGBOX_NPC end SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E - msgbox gUnknown_81740D6, 2 + msgbox gUnknown_81740D6, MSGBOX_NPC end diff --git a/data/maps/SSAnne_3F_Corridor/scripts.inc b/data/maps/SSAnne_3F_Corridor/scripts.inc index b4f61fe75..5e67f5532 100644 --- a/data/maps/SSAnne_3F_Corridor/scripts.inc +++ b/data/maps/SSAnne_3F_Corridor/scripts.inc @@ -2,5 +2,5 @@ SSAnne_3F_Corridor_MapScripts:: @ 8160A5D .byte 0 SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E - msgbox gUnknown_817320C, 2 + msgbox gUnknown_817320C, MSGBOX_NPC end diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index 68d7ae9d0..44cb7d2d1 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -3,10 +3,10 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 trainerbattle_single TRAINER_FISHERMAN_BARNY, Text_174177, Text_1741EF - msgbox gUnknown_817420E, 6 + msgbox gUnknown_817420E, MSGBOX_AUTOCLOSE end SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F trainerbattle_single TRAINER_SAILOR_PHILLIP, Text_1740F6, Text_174123 - msgbox gUnknown_817413A, 6 + msgbox gUnknown_817413A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index 9f28f7cf5..db9f37fe3 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -3,5 +3,5 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 trainerbattle_single TRAINER_SAILOR_HUEY, Text_174239, Text_17425C - msgbox gUnknown_8174272, 6 + msgbox gUnknown_8174272, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index af2277e2c..df90031ac 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -3,5 +3,5 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F trainerbattle_single TRAINER_SAILOR_DYLAN, Text_1742A6, Text_1742C3 - msgbox gUnknown_81742D2, 6 + msgbox gUnknown_81742D2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index 1c5766a91..c84b55b07 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -3,10 +3,10 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 trainerbattle_single TRAINER_SAILOR_LEONARD, Text_174315, Text_174348 - msgbox gUnknown_8174362, 6 + msgbox gUnknown_8174362, MSGBOX_AUTOCLOSE end SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE trainerbattle_single TRAINER_SAILOR_DUNCAN, Text_174385, Text_1743B3 - msgbox gUnknown_81743C8, 6 + msgbox gUnknown_81743C8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc index c449d1164..37d26661b 100644 --- a/data/maps/SSAnne_B1F_Room5/scripts.inc +++ b/data/maps/SSAnne_B1F_Room5/scripts.inc @@ -2,7 +2,7 @@ SSAnne_B1F_Room5_MapScripts:: @ 8160DD5 .byte 0 SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6 - msgbox gUnknown_81743F8, 2 + msgbox gUnknown_81743F8, MSGBOX_NPC end SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 54481438f..7171cae6d 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -38,9 +38,9 @@ EventScript_160BB5:: @ 8160BB5 end SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9 - msgbox gUnknown_81738E6, 3 + msgbox gUnknown_81738E6, MSGBOX_SIGN end SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2 - msgbox gUnknown_8173903, 3 + msgbox gUnknown_8173903, MSGBOX_SIGN end diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index 1d93ae66a..d61b65d87 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -2,23 +2,23 @@ SSAnne_Deck_MapScripts:: @ 8160A68 .byte 0 SSAnne_Deck_EventScript_160A69:: @ 8160A69 - msgbox gUnknown_817326F, 2 + msgbox gUnknown_817326F, MSGBOX_NPC end SSAnne_Deck_EventScript_160A72:: @ 8160A72 - msgbox gUnknown_81732C6, 2 + msgbox gUnknown_81732C6, MSGBOX_NPC end SSAnne_Deck_EventScript_160A7B:: @ 8160A7B - msgbox gUnknown_81732A2, 2 + msgbox gUnknown_81732A2, MSGBOX_NPC end SSAnne_Deck_EventScript_160A84:: @ 8160A84 trainerbattle_single TRAINER_SAILOR_EDMOND, Text_173308, Text_17332B - msgbox gUnknown_817333E, 6 + msgbox gUnknown_817333E, MSGBOX_AUTOCLOSE end SSAnne_Deck_EventScript_160A9B:: @ 8160A9B trainerbattle_single TRAINER_SAILOR_TREVOR, Text_173382, Text_1733A0 - msgbox gUnknown_81733B5, 6 + msgbox gUnknown_81733B5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index b5619e78e..565efd607 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -2,15 +2,15 @@ SSAnne_Kitchen_MapScripts:: @ 8160AB2 .byte 0 SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 - msgbox gUnknown_81733F8, 2 + msgbox gUnknown_81733F8, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC - msgbox gUnknown_8173429, 2 + msgbox gUnknown_8173429, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 - msgbox gUnknown_8173462, 2 + msgbox gUnknown_8173462, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE @@ -41,13 +41,13 @@ EventScript_160B15:: @ 8160B15 return SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E - msgbox gUnknown_81734A0, 2 + msgbox gUnknown_81734A0, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 - msgbox gUnknown_81734D3, 2 + msgbox gUnknown_81734D3, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 - msgbox gUnknown_817353E, 2 + msgbox gUnknown_817353E, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building1/scripts.inc b/data/maps/SafariZone_Building1/scripts.inc index 668e92250..6aaeac452 100644 --- a/data/maps/SafariZone_Building1/scripts.inc +++ b/data/maps/SafariZone_Building1/scripts.inc @@ -2,9 +2,9 @@ SafariZone_Building1_MapScripts:: @ 81623EB .byte 0 SafariZone_Building1_EventScript_1623EC:: @ 81623EC - msgbox gUnknown_8177A5A, 2 + msgbox gUnknown_8177A5A, MSGBOX_NPC end SafariZone_Building1_EventScript_1623F5:: @ 81623F5 - msgbox gUnknown_8177A82, 2 + msgbox gUnknown_8177A82, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building2/scripts.inc b/data/maps/SafariZone_Building2/scripts.inc index 717ccf36b..ff870464a 100644 --- a/data/maps/SafariZone_Building2/scripts.inc +++ b/data/maps/SafariZone_Building2/scripts.inc @@ -2,13 +2,13 @@ SafariZone_Building2_MapScripts:: @ 81623FE .byte 0 SafariZone_Building2_EventScript_1623FF:: @ 81623FF - msgbox gUnknown_8177AE2, 2 + msgbox gUnknown_8177AE2, MSGBOX_NPC end SafariZone_Building2_EventScript_162408:: @ 8162408 - msgbox gUnknown_8177AAE, 2 + msgbox gUnknown_8177AAE, MSGBOX_NPC end SafariZone_Building2_EventScript_162411:: @ 8162411 - msgbox gUnknown_8177B16, 2 + msgbox gUnknown_8177B16, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building3/scripts.inc b/data/maps/SafariZone_Building3/scripts.inc index a4dc55062..4b328da88 100644 --- a/data/maps/SafariZone_Building3/scripts.inc +++ b/data/maps/SafariZone_Building3/scripts.inc @@ -2,13 +2,13 @@ SafariZone_Building3_MapScripts:: @ 816241A .byte 0 SafariZone_Building3_EventScript_16241B:: @ 816241B - msgbox gUnknown_8177BAB, 2 + msgbox gUnknown_8177BAB, MSGBOX_NPC end SafariZone_Building3_EventScript_162424:: @ 8162424 - msgbox gUnknown_8177B38, 2 + msgbox gUnknown_8177B38, MSGBOX_NPC end SafariZone_Building3_EventScript_16242D:: @ 816242D - msgbox gUnknown_8177BEC, 2 + msgbox gUnknown_8177BEC, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building4/scripts.inc b/data/maps/SafariZone_Building4/scripts.inc index 8f589cd8f..1c3e52bd3 100644 --- a/data/maps/SafariZone_Building4/scripts.inc +++ b/data/maps/SafariZone_Building4/scripts.inc @@ -2,13 +2,13 @@ SafariZone_Building4_MapScripts:: @ 8162436 .byte 0 SafariZone_Building4_EventScript_162437:: @ 8162437 - msgbox gUnknown_8177D39, 2 + msgbox gUnknown_8177D39, MSGBOX_NPC end SafariZone_Building4_EventScript_162440:: @ 8162440 - msgbox gUnknown_8177CEB, 2 + msgbox gUnknown_8177CEB, MSGBOX_NPC end SafariZone_Building4_EventScript_162449:: @ 8162449 - msgbox gUnknown_8177D8B, 2 + msgbox gUnknown_8177D8B, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 28e8fb3e6..70599b024 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -7,13 +7,13 @@ SafariZone_Center_OnTransition:: @ 816235D end SafariZone_Center_EventScript_162361:: @ 8162361 - msgbox gUnknown_81777F2, 3 + msgbox gUnknown_81777F2, MSGBOX_SIGN end SafariZone_Center_EventScript_16236A:: @ 816236A - msgbox gUnknown_81777FD, 3 + msgbox gUnknown_81777FD, MSGBOX_SIGN end SafariZone_Center_EventScript_162373:: @ 8162373 - msgbox gUnknown_817782F, 3 + msgbox gUnknown_817782F, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_East/scripts.inc b/data/maps/SafariZone_East/scripts.inc index b38039b36..e37be0d00 100644 --- a/data/maps/SafariZone_East/scripts.inc +++ b/data/maps/SafariZone_East/scripts.inc @@ -2,13 +2,13 @@ SafariZone_East_MapScripts:: @ 816237C .byte 0 SafariZone_East_EventScript_16237D:: @ 816237D - msgbox gUnknown_817783B, 3 + msgbox gUnknown_817783B, MSGBOX_SIGN end SafariZone_East_EventScript_162386:: @ 8162386 - msgbox gUnknown_8177846, 3 + msgbox gUnknown_8177846, MSGBOX_SIGN end SafariZone_East_EventScript_16238F:: @ 816238F - msgbox gUnknown_8177884, 3 + msgbox gUnknown_8177884, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index f45988629..65a8ad4dd 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -2,21 +2,21 @@ SafariZone_North_MapScripts:: @ 8162398 .byte 0 SafariZone_North_EventScript_162399:: @ 8162399 - msgbox gUnknown_817789D, 3 + msgbox gUnknown_817789D, MSGBOX_SIGN end SafariZone_North_EventScript_1623A2:: @ 81623A2 - msgbox gUnknown_81778A8, 3 + msgbox gUnknown_81778A8, MSGBOX_SIGN end SafariZone_North_EventScript_1623AB:: @ 81623AB - msgbox gUnknown_81778D6, 3 + msgbox gUnknown_81778D6, MSGBOX_SIGN end SafariZone_North_EventScript_1623B4:: @ 81623B4 - msgbox gUnknown_81778DD, 3 + msgbox gUnknown_81778DD, MSGBOX_SIGN end SafariZone_North_EventScript_1623BD:: @ 81623BD - msgbox gUnknown_8177935, 3 + msgbox gUnknown_8177935, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_West/scripts.inc b/data/maps/SafariZone_West/scripts.inc index 2b8357334..3d6e0bbf7 100644 --- a/data/maps/SafariZone_West/scripts.inc +++ b/data/maps/SafariZone_West/scripts.inc @@ -2,17 +2,17 @@ SafariZone_West_MapScripts:: @ 81623C6 .byte 0 SafariZone_West_EventScript_1623C7:: @ 81623C7 - msgbox gUnknown_817796E, 3 + msgbox gUnknown_817796E, MSGBOX_SIGN end SafariZone_West_EventScript_1623D0:: @ 81623D0 - msgbox gUnknown_8177979, 3 + msgbox gUnknown_8177979, MSGBOX_SIGN end SafariZone_West_EventScript_1623D9:: @ 81623D9 - msgbox gUnknown_81779F8, 3 + msgbox gUnknown_81779F8, MSGBOX_SIGN end SafariZone_West_EventScript_1623E2:: @ 81623E2 - msgbox gUnknown_8177A41, 3 + msgbox gUnknown_8177A41, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 3973d5e6b..53d697ff0 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -12,31 +12,31 @@ EventScript_167372:: @ 8167372 return SaffronCity_EventScript_16737A:: @ 816737A - msgbox gUnknown_8181003, 2 + msgbox gUnknown_8181003, MSGBOX_NPC end SaffronCity_EventScript_167383:: @ 8167383 - msgbox gUnknown_818101F, 2 + msgbox gUnknown_818101F, MSGBOX_NPC end SaffronCity_EventScript_16738C:: @ 816738C - msgbox gUnknown_818105A, 2 + msgbox gUnknown_818105A, MSGBOX_NPC end SaffronCity_EventScript_167395:: @ 8167395 - msgbox gUnknown_8181087, 2 + msgbox gUnknown_8181087, MSGBOX_NPC end SaffronCity_EventScript_16739E:: @ 816739E - msgbox gUnknown_81810A7, 2 + msgbox gUnknown_81810A7, MSGBOX_NPC end SaffronCity_EventScript_1673A7:: @ 81673A7 - msgbox gUnknown_81810D5, 2 + msgbox gUnknown_81810D5, MSGBOX_NPC end SaffronCity_EventScript_1673B0:: @ 81673B0 - msgbox gUnknown_81810F5, 2 + msgbox gUnknown_81810F5, MSGBOX_NPC end SaffronCity_EventScript_1673B9:: @ 81673B9 @@ -55,19 +55,19 @@ EventScript_1673D7:: @ 81673D7 end SaffronCity_EventScript_1673E3:: @ 81673E3 - msgbox gUnknown_8181159, 2 + msgbox gUnknown_8181159, MSGBOX_NPC end SaffronCity_EventScript_1673EC:: @ 81673EC - msgbox gUnknown_8181189, 2 + msgbox gUnknown_8181189, MSGBOX_NPC end SaffronCity_EventScript_1673F5:: @ 81673F5 - msgbox gUnknown_81811BF, 2 + msgbox gUnknown_81811BF, MSGBOX_NPC end SaffronCity_EventScript_1673FE:: @ 81673FE - msgbox gUnknown_8181225, 2 + msgbox gUnknown_8181225, MSGBOX_NPC end SaffronCity_EventScript_167407:: @ 8167407 @@ -81,15 +81,15 @@ SaffronCity_EventScript_167407:: @ 8167407 end SaffronCity_EventScript_16741A:: @ 816741A - msgbox gUnknown_8181299, 2 + msgbox gUnknown_8181299, MSGBOX_NPC end SaffronCity_EventScript_167423:: @ 8167423 - msgbox gUnknown_8181326, 3 + msgbox gUnknown_8181326, MSGBOX_SIGN end SaffronCity_EventScript_16742C:: @ 816742C - msgbox gUnknown_8181354, 3 + msgbox gUnknown_8181354, MSGBOX_SIGN end SaffronCity_EventScript_167435:: @ 8167435 @@ -100,25 +100,25 @@ SaffronCity_EventScript_167435:: @ 8167435 end SaffronCity_EventScript_16744D:: @ 816744D - msgbox gUnknown_81813AA, 3 + msgbox gUnknown_81813AA, MSGBOX_SIGN end SaffronCity_EventScript_167456:: @ 8167456 - msgbox gUnknown_8181452, 3 + msgbox gUnknown_8181452, MSGBOX_SIGN end SaffronCity_EventScript_16745F:: @ 816745F - msgbox gUnknown_81814B9, 3 + msgbox gUnknown_81814B9, MSGBOX_SIGN end SaffronCity_EventScript_167468:: @ 8167468 - msgbox gUnknown_81814D3, 3 + msgbox gUnknown_81814D3, MSGBOX_SIGN end SaffronCity_EventScript_167471:: @ 8167471 - msgbox gUnknown_81814E7, 3 + msgbox gUnknown_81814E7, MSGBOX_SIGN end SaffronCity_EventScript_16747A:: @ 816747A - msgbox gUnknown_8181519, 3 + msgbox gUnknown_8181519, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index c03e62262..2994fabdd 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -28,7 +28,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 textcolor 0 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16EC82 erasemonpic release @@ -50,7 +50,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 textcolor 0 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16EC82 erasemonpic release @@ -77,7 +77,7 @@ EventScript_16ECB5:: @ 816ECB5 waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB @@ -93,7 +93,7 @@ EventScript_16ECEC:: @ 816ECEC waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E @@ -109,41 +109,41 @@ EventScript_16ED29:: @ 816ED29 end SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B - msgbox gUnknown_819B52E, 3 + msgbox gUnknown_819B52E, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 - msgbox gUnknown_819B4F8, 3 + msgbox gUnknown_819B4F8, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D - msgbox gUnknown_819B50F, 3 + msgbox gUnknown_819B50F, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F - msgbox gUnknown_819B41F, 6 + msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD - msgbox gUnknown_819B30F, 6 + msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396 - msgbox gUnknown_819B3AC, 6 + msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292 - msgbox gUnknown_819B29D, 6 + msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0 goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6 - msgbox gUnknown_819B1A7, 6 + msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE end EventScript_16EDC6:: @ 816EDC6 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index b51cb49b6..43ad8a354 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -37,38 +37,38 @@ EventScript_16EE7E:: @ 816EE7E SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957 - msgbox gUnknown_819B96D, 6 + msgbox gUnknown_819B96D, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E famechecker FAMECHECKER_SABRINA, 5 - msgbox gUnknown_819BAB4, 6 + msgbox gUnknown_819BAB4, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1 - msgbox gUnknown_819BBB3, 6 + msgbox gUnknown_819BBB3, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC - msgbox gUnknown_819BCC4, 6 + msgbox gUnknown_819BCC4, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8 - msgbox gUnknown_819B8B9, 6 + msgbox gUnknown_819B8B9, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC - msgbox gUnknown_819B9F7, 6 + msgbox gUnknown_819B9F7, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D - msgbox gUnknown_819BB1F, 6 + msgbox gUnknown_819BB1F, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc index eb0bcd429..2f4e435fa 100644 --- a/data/maps/SaffronCity_House1_1F/scripts.inc +++ b/data/maps/SaffronCity_House1_1F/scripts.inc @@ -2,11 +2,11 @@ SaffronCity_House1_1F_MapScripts:: @ 816EB36 .byte 0 SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 - msgbox gUnknown_819AB9B, 2 + msgbox gUnknown_819AB9B, MSGBOX_NPC end SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 - msgbox gUnknown_819ABD7, 2 + msgbox gUnknown_819ABD7, MSGBOX_NPC end SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index e29fbea9d..478bddb84 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -44,9 +44,9 @@ EventScript_16EBC0:: @ 816EBC0 return SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 - msgbox gUnknown_819B0D0, 3 + msgbox gUnknown_819B0D0, MSGBOX_SIGN end SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 - msgbox gUnknown_819B0A0, 3 + msgbox gUnknown_819B0A0, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc index 9cc63072c..03afb1a4c 100644 --- a/data/maps/SaffronCity_House2/scripts.inc +++ b/data/maps/SaffronCity_House2/scripts.inc @@ -2,11 +2,11 @@ SaffronCity_House2_MapScripts:: @ 816EF73 .byte 0 SaffronCity_House2_EventScript_16EF74:: @ 816EF74 - msgbox gUnknown_819BE74, 2 + msgbox gUnknown_819BE74, MSGBOX_NPC end SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D - msgbox gUnknown_819BED5, 2 + msgbox gUnknown_819BED5, MSGBOX_NPC end SaffronCity_House2_EventScript_16EF86:: @ 816EF86 @@ -20,5 +20,5 @@ SaffronCity_House2_EventScript_16EF86:: @ 816EF86 end SaffronCity_House2_EventScript_16EF99:: @ 816EF99 - msgbox gUnknown_819BF07, 3 + msgbox gUnknown_819BF07, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 3779bb5e2..815ee773b 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -2,11 +2,11 @@ SaffronCity_Mart_MapScripts:: @ 816EFA2 .byte 0 SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 - msgbox gUnknown_819BFF1, 2 + msgbox gUnknown_819BFF1, MSGBOX_NPC end SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC - msgbox gUnknown_819BF8F, 2 + msgbox gUnknown_819BF8F, MSGBOX_NPC end SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 6b7099b5d..fe28e6c75 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -15,11 +15,11 @@ SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB end SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004 - msgbox gUnknown_819C058, 2 + msgbox gUnknown_819C058, MSGBOX_NPC end SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D - msgbox gUnknown_819C023, 2 + msgbox gUnknown_819C023, MSGBOX_NPC end SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 58596c2e6..ed878b0a5 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -198,9 +198,9 @@ EventScript_163222:: @ 8163222 end SeafoamIslands_B4F_EventScript_163223:: @ 8163223 - msgbox gUnknown_8179B36, 3 + msgbox gUnknown_8179B36, MSGBOX_SIGN end SeafoamIslands_B4F_EventScript_16322C:: @ 816322C - msgbox gUnknown_8179B65, 3 + msgbox gUnknown_8179B65, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 2f9606459..f7debbf02 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -7,13 +7,13 @@ SevenIsland_OnTransition:: @ 8167EB9 end SevenIsland_EventScript_167EBD:: @ 8167EBD - msgbox gUnknown_8183046, 3 + msgbox gUnknown_8183046, MSGBOX_SIGN end SevenIsland_EventScript_167EC6:: @ 8167EC6 - msgbox gUnknown_818306C, 2 + msgbox gUnknown_818306C, MSGBOX_NPC end SevenIsland_EventScript_167ECF:: @ 8167ECF - msgbox gUnknown_8183143, 2 + msgbox gUnknown_8183143, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 8a44e194c..0818db154 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -92,13 +92,13 @@ EventScript_170987:: @ 8170987 special SavePlayerParty special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_170A11 call EventScript_170A1E compare VAR_RESULT, 0 goto_if_eq EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF @@ -179,5 +179,5 @@ Movement_170A72:: @ 8170A72 step_end SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 - msgbox gUnknown_81A0567, 3 + msgbox gUnknown_81A0567, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index b5b10b288..d2a42ac38 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -30,13 +30,13 @@ Items_170B58:: @ 8170B58 end SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E - msgbox gUnknown_81A0A4F, 2 + msgbox gUnknown_81A0A4F, MSGBOX_NPC end SevenIsland_Mart_EventScript_170B77:: @ 8170B77 - msgbox gUnknown_81A0ACC, 2 + msgbox gUnknown_81A0ACC, MSGBOX_NPC end SevenIsland_Mart_EventScript_170B80:: @ 8170B80 - msgbox gUnknown_81A0B09, 2 + msgbox gUnknown_81A0B09, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 53155e776..3992ac871 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 end SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1 - msgbox gUnknown_81A0B98, 2 + msgbox gUnknown_81A0B98, MSGBOX_NPC end SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA - msgbox gUnknown_81A0C1F, 2 + msgbox gUnknown_81A0C1F, MSGBOX_NPC end SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3 - msgbox gUnknown_81A0CA5, 2 + msgbox gUnknown_81A0CA5, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc index f0122ffbf..8c906d3f2 100644 --- a/data/maps/SevenIsland_SevaultCanyon/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc @@ -2,5 +2,5 @@ SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD .byte 0 SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE - msgbox gUnknown_818CF2B, 3 + msgbox gUnknown_818CF2B, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc index 7fcda3492..617055d66 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc @@ -2,5 +2,5 @@ SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3 .byte 0 SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4 - msgbox gUnknown_818C82D, 3 + msgbox gUnknown_818C82D, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index c5471b1ea..3e495c6cd 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -14,7 +14,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 msgbox gUnknown_81A4D72 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_172225 msgbox gUnknown_81A4DD8 closemessage diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index 9e3139dd3..56716493a 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -7,9 +7,9 @@ SevenIsland_TrainerTower_OnTransition:: @ 8168BDB end SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 - msgbox gUnknown_818C338, 3 + msgbox gUnknown_818C338, MSGBOX_SIGN end SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA - msgbox gUnknown_818C370, 3 + msgbox gUnknown_818C370, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 979ae6446..04ce5880d 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -229,9 +229,9 @@ SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 end SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 - msgbox gUnknown_817CE38, 2 + msgbox gUnknown_817CE38, MSGBOX_NPC end SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF - msgbox gUnknown_817CE9F, 2 + msgbox gUnknown_817CE9F, MSGBOX_NPC end diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index ef6bc4382..a0ab7219b 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -21,15 +21,15 @@ EventScript_161DAD:: @ 8161DAD end SilphCo_10F_EventScript_161DB7:: @ 8161DB7 - msgbox gUnknown_8176DF8, 3 + msgbox gUnknown_8176DF8, MSGBOX_SIGN end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73 - msgbox gUnknown_8176D86, 6 + msgbox gUnknown_8176D86, MSGBOX_AUTOCLOSE end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18 - msgbox gUnknown_8176D25, 6 + msgbox gUnknown_8176D25, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index c824a3f0b..65d67dc2d 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -43,7 +43,7 @@ EventScript_161E75:: @ 8161E75 end SilphCo_11F_EventScript_161E7F:: @ 8161E7F - msgbox gUnknown_81770A9, 2 + msgbox gUnknown_81770A9, MSGBOX_NPC end SilphCo_11F_EventScript_161E88:: @ 8161E88 @@ -123,19 +123,19 @@ Movement_161F27:: @ 8161F27 step_end EventScript_161F2E:: @ 8161F2E - msgbox gUnknown_817732B, 3 + msgbox gUnknown_817732B, MSGBOX_SIGN end SilphCo_11F_EventScript_161F37:: @ 8161F37 - msgbox gUnknown_817734A, 3 + msgbox gUnknown_817734A, MSGBOX_SIGN end SilphCo_11F_EventScript_161F40:: @ 8161F40 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, Text_1772B8, Text_1772E7 - msgbox gUnknown_81772F9, 6 + msgbox gUnknown_81772F9, MSGBOX_AUTOCLOSE end SilphCo_11F_EventScript_161F57:: @ 8161F57 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, Text_17726A, Text_17728C - msgbox gUnknown_817729B, 6 + msgbox gUnknown_817729B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index a6ef4a1c3..f10c4d8b3 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -7,9 +7,9 @@ SilphCo_1F_OnTransition:: @ 816162B end SilphCo_1F_EventScript_16162F:: @ 816162F - msgbox gUnknown_81754F7, 2 + msgbox gUnknown_81754F7, MSGBOX_NPC end SilphCo_1F_EventScript_161638:: @ 8161638 - msgbox gUnknown_8175549, 3 + msgbox gUnknown_8175549, MSGBOX_SIGN end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 53e9c8129..6488ce3e5 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -14,25 +14,25 @@ EventScript_16165F:: @ 816165F end SilphCo_2F_EventScript_161660:: @ 8161660 - msgbox gUnknown_8175894, 3 + msgbox gUnknown_8175894, MSGBOX_SIGN end SilphCo_2F_EventScript_161669:: @ 8161669 trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E - msgbox gUnknown_817559F, 6 + msgbox gUnknown_817559F, MSGBOX_AUTOCLOSE end SilphCo_2F_EventScript_161680:: @ 8161680 trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5 - msgbox gUnknown_81755F2, 6 + msgbox gUnknown_81755F2, MSGBOX_AUTOCLOSE end SilphCo_2F_EventScript_161697:: @ 8161697 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A - msgbox gUnknown_8175651, 6 + msgbox gUnknown_8175651, MSGBOX_AUTOCLOSE end SilphCo_2F_EventScript_1616AE:: @ 81616AE trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8 - msgbox gUnknown_81756E2, 6 + msgbox gUnknown_81756E2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 2b321225a..a5e62b667 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -22,15 +22,15 @@ EventScript_1616F5:: @ 81616F5 end SilphCo_3F_EventScript_1616FF:: @ 81616FF - msgbox gUnknown_81759DC, 3 + msgbox gUnknown_81759DC, MSGBOX_SIGN end SilphCo_3F_EventScript_161708:: @ 8161708 trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D - msgbox gUnknown_8175990, 6 + msgbox gUnknown_8175990, MSGBOX_AUTOCLOSE end SilphCo_3F_EventScript_16171F:: @ 816171F trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911 - msgbox gUnknown_817591C, 6 + msgbox gUnknown_817591C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 595f42ab6..406e394f1 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -22,20 +22,20 @@ EventScript_161766:: @ 8161766 end SilphCo_4F_EventScript_161770:: @ 8161770 - msgbox gUnknown_8175B57, 3 + msgbox gUnknown_8175B57, MSGBOX_SIGN end SilphCo_4F_EventScript_161779:: @ 8161779 trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0 - msgbox gUnknown_8175AC8, 6 + msgbox gUnknown_8175AC8, MSGBOX_AUTOCLOSE end SilphCo_4F_EventScript_161790:: @ 8161790 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B - msgbox gUnknown_8175A62, 6 + msgbox gUnknown_8175A62, MSGBOX_AUTOCLOSE end SilphCo_4F_EventScript_1617A7:: @ 81617A7 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B - msgbox gUnknown_8175B38, 6 + msgbox gUnknown_8175B38, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index e702b2876..1a17e3b44 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -23,37 +23,37 @@ EventScript_1617F7:: @ 81617F7 end SilphCo_5F_EventScript_161801:: @ 8161801 - msgbox gUnknown_8175D89, 3 + msgbox gUnknown_8175D89, MSGBOX_SIGN end SilphCo_5F_EventScript_16180A:: @ 816180A - msgbox gUnknown_8175DE0, 3 + msgbox gUnknown_8175DE0, MSGBOX_SIGN end SilphCo_5F_EventScript_161813:: @ 8161813 - msgbox gUnknown_8175E28, 3 + msgbox gUnknown_8175E28, MSGBOX_SIGN end SilphCo_5F_EventScript_16181C:: @ 816181C - msgbox gUnknown_8175E80, 3 + msgbox gUnknown_8175E80, MSGBOX_SIGN end SilphCo_5F_EventScript_161825:: @ 8161825 trainerbattle_single TRAINER_SCIENTIST_BEAU, Text_175C40, Text_175C6D - msgbox gUnknown_8175C7D, 6 + msgbox gUnknown_8175C7D, MSGBOX_AUTOCLOSE end SilphCo_5F_EventScript_16183C:: @ 816183C trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, Text_175BE5, Text_175C09 - msgbox gUnknown_8175C0F, 6 + msgbox gUnknown_8175C0F, MSGBOX_AUTOCLOSE end SilphCo_5F_EventScript_161853:: @ 8161853 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, Text_175D28, Text_175D4B - msgbox gUnknown_8175D59, 6 + msgbox gUnknown_8175D59, MSGBOX_AUTOCLOSE end SilphCo_5F_EventScript_16186A:: @ 816186A trainerbattle_single TRAINER_JUGGLER_DALTON, Text_175CBD, Text_175CEB - msgbox gUnknown_8175CF9, 6 + msgbox gUnknown_8175CF9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 53fb04ac4..6bc5cd545 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -77,20 +77,20 @@ EventScript_16192C:: @ 816192C end SilphCo_6F_EventScript_161936:: @ 8161936 - msgbox gUnknown_817624D, 3 + msgbox gUnknown_817624D, MSGBOX_SIGN end SilphCo_6F_EventScript_16193F:: @ 816193F trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD - msgbox gUnknown_81761C4, 6 + msgbox gUnknown_81761C4, MSGBOX_AUTOCLOSE end SilphCo_6F_EventScript_161956:: @ 8161956 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104 - msgbox gUnknown_817610F, 6 + msgbox gUnknown_817610F, MSGBOX_AUTOCLOSE end SilphCo_6F_EventScript_16196D:: @ 816196D trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E - msgbox gUnknown_817621B, 6 + msgbox gUnknown_817621B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 1fa3d3862..5e7a0ea89 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -148,7 +148,7 @@ EventScript_161B12:: @ 8161B12 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB @@ -165,7 +165,7 @@ EventScript_161B45:: @ 8161B45 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 @@ -235,25 +235,25 @@ EventScript_161BF0:: @ 8161BF0 end SilphCo_7F_EventScript_161BFA:: @ 8161BFA - msgbox gUnknown_8176954, 3 + msgbox gUnknown_8176954, MSGBOX_SIGN end SilphCo_7F_EventScript_161C03:: @ 8161C03 trainerbattle_single TRAINER_SCIENTIST_JOSHUA, Text_1765E2, Text_17660C - msgbox gUnknown_8176616, 6 + msgbox gUnknown_8176616, MSGBOX_AUTOCLOSE end SilphCo_7F_EventScript_161C1A:: @ 8161C1A trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, Text_176643, Text_176669 - msgbox gUnknown_8176681, 6 + msgbox gUnknown_8176681, MSGBOX_AUTOCLOSE end SilphCo_7F_EventScript_161C31:: @ 8161C31 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, Text_1766B3, Text_1766D7 - msgbox gUnknown_81766E5, 6 + msgbox gUnknown_81766E5, MSGBOX_AUTOCLOSE end SilphCo_7F_EventScript_161C48:: @ 8161C48 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, Text_176586, Text_1765A5 - msgbox gUnknown_81765B1, 6 + msgbox gUnknown_81765B1, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 84993bf67..f96188c3f 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -21,20 +21,20 @@ EventScript_161C86:: @ 8161C86 end SilphCo_8F_EventScript_161C90:: @ 8161C90 - msgbox gUnknown_8176AB2, 3 + msgbox gUnknown_8176AB2, MSGBOX_SIGN end SilphCo_8F_EventScript_161C99:: @ 8161C99 trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19 - msgbox gUnknown_8176A26, 6 + msgbox gUnknown_8176A26, MSGBOX_AUTOCLOSE end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE - msgbox gUnknown_81769CF, 6 + msgbox gUnknown_81769CF, MSGBOX_AUTOCLOSE end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C - msgbox gUnknown_8176A90, 6 + msgbox gUnknown_8176A90, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 737cf5f71..87df12d97 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -27,20 +27,20 @@ EventScript_161D2E:: @ 8161D2E end SilphCo_9F_EventScript_161D38:: @ 8161D38 - msgbox gUnknown_8176CD4, 3 + msgbox gUnknown_8176CD4, MSGBOX_SIGN end SilphCo_9F_EventScript_161D41:: @ 8161D41 trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B - msgbox gUnknown_8176C3C, 6 + msgbox gUnknown_8176C3C, MSGBOX_AUTOCLOSE end SilphCo_9F_EventScript_161D58:: @ 8161D58 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8 - msgbox gUnknown_8176BD0, 6 + msgbox gUnknown_8176BD0, MSGBOX_AUTOCLOSE end SilphCo_9F_EventScript_161D6F:: @ 8161D6F trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0 - msgbox gUnknown_8176CB8, 6 + msgbox gUnknown_8176CB8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index 868eefbaa..01d373654 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -7,13 +7,13 @@ SixIsland_OnTransition:: @ 8167EDE end SixIsland_EventScript_167EE2:: @ 8167EE2 - msgbox gUnknown_81831EF, 2 + msgbox gUnknown_81831EF, MSGBOX_NPC end SixIsland_EventScript_167EEB:: @ 8167EEB - msgbox gUnknown_8183255, 2 + msgbox gUnknown_8183255, MSGBOX_NPC end SixIsland_EventScript_167EF4:: @ 8167EF4 - msgbox gUnknown_81831C6, 3 + msgbox gUnknown_81831C6, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_GreenPath/scripts.inc b/data/maps/SixIsland_GreenPath/scripts.inc index c2822ccca..acc4336d2 100644 --- a/data/maps/SixIsland_GreenPath/scripts.inc +++ b/data/maps/SixIsland_GreenPath/scripts.inc @@ -2,9 +2,9 @@ SixIsland_GreenPath_MapScripts:: @ 8168B2D .byte 0 SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E - msgbox gUnknown_818B84D, 3 + msgbox gUnknown_818B84D, MSGBOX_SIGN end SixIsland_GreenPath_EventScript_168B37:: @ 8168B37 - msgbox gUnknown_818B86B, 3 + msgbox gUnknown_818B86B, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_House/scripts.inc b/data/maps/SixIsland_House/scripts.inc index bc6753abb..1ad94906f 100644 --- a/data/maps/SixIsland_House/scripts.inc +++ b/data/maps/SixIsland_House/scripts.inc @@ -2,5 +2,5 @@ SixIsland_House_MapScripts:: @ 8171E5B .byte 0 SixIsland_House_EventScript_171E5C:: @ 8171E5C - msgbox gUnknown_81A412E, 2 + msgbox gUnknown_81A412E, MSGBOX_NPC end diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 1da8aa3dc..af865be28 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -29,5 +29,5 @@ Items_171E8C:: @ 8171E8C end SixIsland_Mart_EventScript_171EA0:: @ 8171EA0 - msgbox gUnknown_81A4271, 2 + msgbox gUnknown_81A4271, MSGBOX_NPC end diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index 1a754362f..fb4ec0217 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -3,5 +3,5 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, Text_18B35A, Text_18B3C2 - msgbox gUnknown_818B3C8, 6 + msgbox gUnknown_818B3C8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 4d6f63b07..97a8a0a30 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -21,60 +21,60 @@ EventScript_164587:: @ 8164587 SixIsland_PatternBush_EventScript_164590:: @ 8164590 trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, Text_17BF3A, Text_17BF66 - msgbox gUnknown_817BF97, 6 + msgbox gUnknown_817BF97, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, Text_17BFEB, Text_17C028 - msgbox gUnknown_817C056, 6 + msgbox gUnknown_817C056, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE trainerbattle_single TRAINER_BUG_CATCHER_GARRET, Text_17C0BE, Text_17C0F2 - msgbox gUnknown_817C113, 6 + msgbox gUnknown_817C113, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 trainerbattle_single TRAINER_BUG_CATCHER_JONAH, Text_17C155, Text_17C196 - msgbox gUnknown_817C1D0, 6 + msgbox gUnknown_817C1D0, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC trainerbattle_single TRAINER_BUG_CATCHER_VANCE, Text_17C246, Text_17C275 - msgbox gUnknown_817C2A4, 6 + msgbox gUnknown_817C2A4, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164603:: @ 8164603 trainerbattle_single TRAINER_YOUNGSTER_NASH, Text_17C2D9, Text_17C30D - msgbox gUnknown_817C31C, 6 + msgbox gUnknown_817C31C, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_16461A:: @ 816461A trainerbattle_single TRAINER_YOUNGSTER_CORDELL, Text_17C373, Text_17C3A5 - msgbox gUnknown_817C3CE, 6 + msgbox gUnknown_817C3CE, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164631:: @ 8164631 trainerbattle_single TRAINER_LASS_DALIA, Text_17C42B, Text_17C458 - msgbox gUnknown_817C490, 6 + msgbox gUnknown_817C490, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164648:: @ 8164648 trainerbattle_single TRAINER_LASS_JOANA, Text_17C4FE, Text_17C552 - msgbox gUnknown_817C590, 6 + msgbox gUnknown_817C590, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_16465F:: @ 816465F trainerbattle_single TRAINER_CAMPER_RILEY, Text_17C5DB, Text_17C609 - msgbox gUnknown_817C615, 6 + msgbox gUnknown_817C615, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164676:: @ 8164676 trainerbattle_single TRAINER_PICNICKER_MARCY, Text_17C63E, Text_17C660 - msgbox gUnknown_817C68E, 6 + msgbox gUnknown_817C68E, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_16468D:: @ 816468D trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, Text_17C6C9, Text_17C6FB - msgbox gUnknown_817C728, 6 + msgbox gUnknown_817C728, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 570d65b4b..3316ec0b5 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -71,9 +71,9 @@ SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 end SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E - msgbox gUnknown_81A3E02, 2 + msgbox gUnknown_81A3E02, MSGBOX_NPC end SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17 - msgbox gUnknown_81A3E87, 2 + msgbox gUnknown_81A3E87, MSGBOX_NPC end diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 3246909ae..582503ed8 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -25,7 +25,7 @@ SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc index 2b410f112..27f49d4aa 100644 --- a/data/maps/SixIsland_WaterPath/scripts.inc +++ b/data/maps/SixIsland_WaterPath/scripts.inc @@ -2,9 +2,9 @@ SixIsland_WaterPath_MapScripts:: @ 8168B40 .byte 0 SixIsland_WaterPath_EventScript_168B41:: @ 8168B41 - msgbox gUnknown_818BD0C, 3 + msgbox gUnknown_818BD0C, MSGBOX_SIGN end SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A - msgbox gUnknown_818BD27, 3 + msgbox gUnknown_818BD27, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_WaterPath_House2/scripts.inc b/data/maps/SixIsland_WaterPath_House2/scripts.inc index ed5e24c7f..4cb8e9827 100644 --- a/data/maps/SixIsland_WaterPath_House2/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House2/scripts.inc @@ -2,5 +2,5 @@ SixIsland_WaterPath_House2_MapScripts:: @ 8172178 .byte 0 SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179 - msgbox gUnknown_81A4D0D, 2 + msgbox gUnknown_81A4D0D, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 9f546cbf2..82d922cb1 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -221,7 +221,7 @@ EventScript_167A59:: @ 8167A59 waitmovement 0 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 @@ -382,11 +382,11 @@ Movement_167C71:: @ 8167C71 step_end ThreeIsland_EventScript_167C77:: @ 8167C77 - msgbox gUnknown_81828EB, 2 + msgbox gUnknown_81828EB, MSGBOX_NPC end ThreeIsland_EventScript_167C80:: @ 8167C80 - msgbox gUnknown_818298A, 2 + msgbox gUnknown_818298A, MSGBOX_NPC end ThreeIsland_EventScript_167C89:: @ 8167C89 @@ -400,9 +400,9 @@ ThreeIsland_EventScript_167C89:: @ 8167C89 end ThreeIsland_EventScript_167C9C:: @ 8167C9C - msgbox gUnknown_8182061, 3 + msgbox gUnknown_8182061, MSGBOX_SIGN end ThreeIsland_EventScript_167CA5:: @ 8167CA5 - msgbox gUnknown_818208B, 2 + msgbox gUnknown_818208B, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 8aeb7ac30..9ac90a4c4 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -57,9 +57,9 @@ Movement_163D22:: @ 8163D22 step_end ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 - msgbox gUnknown_817AFD6, 3 + msgbox gUnknown_817AFD6, MSGBOX_SIGN end ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 - msgbox gUnknown_817B029, 3 + msgbox gUnknown_817B029, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc index 008e748d7..f36889d04 100644 --- a/data/maps/ThreeIsland_BondBridge/scripts.inc +++ b/data/maps/ThreeIsland_BondBridge/scripts.inc @@ -2,9 +2,9 @@ ThreeIsland_BondBridge_MapScripts:: @ 8168776 .byte 0 ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 - msgbox gUnknown_818A210, 3 + msgbox gUnknown_818A210, MSGBOX_SIGN end ThreeIsland_BondBridge_EventScript_168780:: @ 8168780 - msgbox gUnknown_818A223, 3 + msgbox gUnknown_818A223, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index 7738d2e5c..007f7d4be 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -10,5 +10,5 @@ ThreeIsland_House1_EventScript_17181A:: @ 817181A end ThreeIsland_House1_EventScript_171829:: @ 8171829 - msgbox gUnknown_81A2F92, 3 + msgbox gUnknown_81A2F92, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc index 6c45d3f2f..a9fd52298 100644 --- a/data/maps/ThreeIsland_House2/scripts.inc +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -10,5 +10,5 @@ ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 end ThreeIsland_House2_EventScript_1718F9:: @ 81718F9 - msgbox gUnknown_81A3245, 2 + msgbox gUnknown_81A3245, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc index 7ad4b0da0..b1c336d79 100644 --- a/data/maps/ThreeIsland_House3/scripts.inc +++ b/data/maps/ThreeIsland_House3/scripts.inc @@ -2,5 +2,5 @@ ThreeIsland_House3_MapScripts:: @ 8171902 .byte 0 ThreeIsland_House3_EventScript_171903:: @ 8171903 - msgbox gUnknown_81A3379, 2 + msgbox gUnknown_81A3379, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc index 6bb77d0bc..d0facf443 100644 --- a/data/maps/ThreeIsland_House4/scripts.inc +++ b/data/maps/ThreeIsland_House4/scripts.inc @@ -2,9 +2,9 @@ ThreeIsland_House4_MapScripts:: @ 817190C .byte 0 ThreeIsland_House4_EventScript_17190D:: @ 817190D - msgbox gUnknown_81A33DB, 2 + msgbox gUnknown_81A33DB, MSGBOX_NPC end ThreeIsland_House4_EventScript_171916:: @ 8171916 - msgbox gUnknown_81A342F, 2 + msgbox gUnknown_81A342F, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index b6e488c03..3ac12bf36 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -27,13 +27,13 @@ Items_1718B4:: @ 81718B4 end ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4 - msgbox gUnknown_81A3114, 2 + msgbox gUnknown_81A3114, MSGBOX_NPC end ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD - msgbox gUnknown_81A315C, 2 + msgbox gUnknown_81A315C, MSGBOX_NPC end ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 - msgbox gUnknown_81A31F0, 2 + msgbox gUnknown_81A31F0, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 96cfb8b74..e3cb1e23b 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 end ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A - msgbox gUnknown_81A303B, 2 + msgbox gUnknown_81A303B, MSGBOX_NPC end ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 - msgbox gUnknown_81A30A3, 2 + msgbox gUnknown_81A30A3, MSGBOX_NPC end ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C - msgbox gUnknown_81A2FB5, 2 + msgbox gUnknown_81A2FB5, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 1764efd7b..f7aa40e76 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -29,7 +29,7 @@ EventScript_1687C2:: @ 81687C2 end ThreeIsland_Port_EventScript_1687CC:: @ 81687CC - msgbox gUnknown_818A261, 2 + msgbox gUnknown_818A261, MSGBOX_NPC end ThreeIsland_Port_EventScript_1687D5:: @ 81687D5 diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 3bc899bef..b785d2fd9 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -185,11 +185,11 @@ Items_167738:: @ 8167738 end TwoIsland_EventScript_16774C:: @ 816774C - msgbox gUnknown_8181D2F, 2 + msgbox gUnknown_8181D2F, MSGBOX_NPC end TwoIsland_EventScript_167755:: @ 8167755 - msgbox gUnknown_8181DCA, 2 + msgbox gUnknown_8181DCA, MSGBOX_NPC end TwoIsland_EventScript_16775E:: @ 816775E @@ -201,25 +201,25 @@ TwoIsland_EventScript_16775E:: @ 816775E end TwoIsland_EventScript_167777:: @ 8167777 - msgbox gUnknown_8181F28, 2 + msgbox gUnknown_8181F28, MSGBOX_NPC end TwoIsland_EventScript_167780:: @ 8167780 - msgbox gUnknown_8181F5D, 2 + msgbox gUnknown_8181F5D, MSGBOX_NPC end TwoIsland_EventScript_167789:: @ 8167789 - msgbox gUnknown_8181FCE, 2 + msgbox gUnknown_8181FCE, MSGBOX_NPC end TwoIsland_EventScript_167792:: @ 8167792 - msgbox gUnknown_8181A88, 3 + msgbox gUnknown_8181A88, MSGBOX_SIGN end TwoIsland_EventScript_16779B:: @ 816779B - msgbox gUnknown_8181AA7, 3 + msgbox gUnknown_8181AA7, MSGBOX_SIGN end TwoIsland_EventScript_1677A4:: @ 81677A4 - msgbox gUnknown_8181AC8, 3 + msgbox gUnknown_8181AC8, MSGBOX_SIGN end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 68dc50ae8..7e6c06d8b 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -41,7 +41,7 @@ EventScript_171696:: @ 8171696 EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_17179E goto EventScript_1716BE end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index fb1ccc7b4..c5da2e223 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -15,9 +15,9 @@ TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 end TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC - msgbox gUnknown_81A2E59, 2 + msgbox gUnknown_81A2E59, MSGBOX_NPC end TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5 - msgbox gUnknown_81A2EBE, 2 + msgbox gUnknown_81A2EBE, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_EastEntrance/scripts.inc b/data/maps/UndergroundPath_EastEntrance/scripts.inc index 31ee9f7af..28a211c6f 100644 --- a/data/maps/UndergroundPath_EastEntrance/scripts.inc +++ b/data/maps/UndergroundPath_EastEntrance/scripts.inc @@ -2,5 +2,5 @@ UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD .byte 0 UndergroundPath_EastEntrance_EventScript_160EDE:: @ 8160EDE - msgbox gUnknown_81745D9, 2 + msgbox gUnknown_81745D9, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 55a810d64..2a1e4ed4f 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -8,7 +8,7 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 call EventScript_1A8CAD goto_if_set FLAG_DID_MS_NIDO_TRADE, EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_160E93 call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/UndergroundPath_SouthEntrance/scripts.inc b/data/maps/UndergroundPath_SouthEntrance/scripts.inc index 1e3d2e6e3..1623d16d7 100644 --- a/data/maps/UndergroundPath_SouthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_SouthEntrance/scripts.inc @@ -2,5 +2,5 @@ UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF .byte 0 UndergroundPath_SouthEntrance_EventScript_160EC0:: @ 8160EC0 - msgbox gUnknown_8174559, 2 + msgbox gUnknown_8174559, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_WestEntrance/scripts.inc b/data/maps/UndergroundPath_WestEntrance/scripts.inc index f56217bce..6b1c60710 100644 --- a/data/maps/UndergroundPath_WestEntrance/scripts.inc +++ b/data/maps/UndergroundPath_WestEntrance/scripts.inc @@ -2,5 +2,5 @@ UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9 .byte 0 UndergroundPath_WestEntrance_EventScript_160ECA:: @ 8160ECA - msgbox gUnknown_817459B, 2 + msgbox gUnknown_817459B, MSGBOX_NPC end diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 8de5d1e26..cb287134a 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -30,7 +30,7 @@ EventScript_166913:: @ 8166913 return VermilionCity_EventScript_166917:: @ 8166917 - msgbox gUnknown_817F723, 2 + msgbox gUnknown_817F723, MSGBOX_NPC end VermilionCity_EventScript_166920:: @ 8166920 @@ -229,7 +229,7 @@ EventScript_166BED:: @ 8166BED end VermilionCity_EventScript_166C17:: @ 8166C17 - msgbox gUnknown_817F8AC, 2 + msgbox gUnknown_817F8AC, MSGBOX_NPC end VermilionCity_EventScript_166C20:: @ 8166C20 @@ -241,7 +241,7 @@ VermilionCity_EventScript_166C20:: @ 8166C20 end VermilionCity_EventScript_166C2F:: @ 8166C2F - msgbox gUnknown_817F7FD, 2 + msgbox gUnknown_817F7FD, MSGBOX_NPC end VermilionCity_EventScript_166C38:: @ 8166C38 @@ -256,15 +256,15 @@ VermilionCity_EventScript_166C38:: @ 8166C38 end VermilionCity_EventScript_166C53:: @ 8166C53 - msgbox gUnknown_817F8FB, 3 + msgbox gUnknown_817F8FB, MSGBOX_SIGN end VermilionCity_EventScript_166C5C:: @ 8166C5C - msgbox gUnknown_817F928, 3 + msgbox gUnknown_817F928, MSGBOX_SIGN end VermilionCity_EventScript_166C65:: @ 8166C65 - msgbox gUnknown_817F9A1, 3 + msgbox gUnknown_817F9A1, MSGBOX_SIGN end VermilionCity_EventScript_166C6E:: @ 8166C6E @@ -275,5 +275,5 @@ VermilionCity_EventScript_166C6E:: @ 8166C6E end VermilionCity_EventScript_166C86:: @ 8166C86 - msgbox gUnknown_817FA11, 3 + msgbox gUnknown_817FA11, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index aaa029052..a3be8b958 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -243,18 +243,18 @@ EventScript_16B9F0:: @ 816B9F0 VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA trainerbattle_single TRAINER_SAILOR_DWAYNE, Text_194FBD, Text_194FF1 famechecker FAMECHECKER_LTSURGE, 4 - msgbox gUnknown_8195004, 6 + msgbox gUnknown_8195004, MSGBOX_AUTOCLOSE end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E trainerbattle_single TRAINER_ENGINEER_BAILY, Text_194F1F, Text_194F6F - msgbox gUnknown_8194F76, 6 + msgbox gUnknown_8194F76, MSGBOX_AUTOCLOSE end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 trainerbattle_single TRAINER_GENTLEMAN_TUCKER, Text_194E57, Text_194EA5, EventScript_16BA5D famechecker FAMECHECKER_LTSURGE, 3 - msgbox gUnknown_8194EBD, 6 + msgbox gUnknown_8194EBD, MSGBOX_AUTOCLOSE end EventScript_16BA5D:: @ 816BA5D diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index f0b5f75e8..cdf4aea91 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -6,7 +6,7 @@ VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 faceplayer goto_if_set FLAG_GOT_OLD_ROD, EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16B3D9 msgbox gUnknown_8194028 release diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index ca192abf4..6b647952e 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -8,7 +8,7 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 call EventScript_1A8CAD goto_if_set FLAG_DID_CH_DING_TRADE, EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16B631 call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc index 1344aac52..8f9de55e0 100644 --- a/data/maps/VermilionCity_House3/scripts.inc +++ b/data/maps/VermilionCity_House3/scripts.inc @@ -2,11 +2,11 @@ VermilionCity_House3_MapScripts:: @ 816BAA9 .byte 0 VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA - msgbox gUnknown_81953AF, 2 + msgbox gUnknown_81953AF, MSGBOX_NPC end VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3 - msgbox gUnknown_8195471, 2 + msgbox gUnknown_8195471, MSGBOX_NPC end VermilionCity_House3_EventScript_16BABC:: @ 816BABC @@ -20,5 +20,5 @@ VermilionCity_House3_EventScript_16BABC:: @ 816BABC end VermilionCity_House3_EventScript_16BACF:: @ 816BACF - msgbox gUnknown_8195400, 3 + msgbox gUnknown_8195400, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 1c342fc1c..56ff2d7c0 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -2,11 +2,11 @@ VermilionCity_Mart_MapScripts:: @ 816B653 .byte 0 VermilionCity_Mart_EventScript_16B654:: @ 816B654 - msgbox gUnknown_8194B65, 2 + msgbox gUnknown_8194B65, MSGBOX_NPC end VermilionCity_Mart_EventScript_16B65D:: @ 816B65D - msgbox gUnknown_8194A77, 2 + msgbox gUnknown_8194A77, MSGBOX_NPC end VermilionCity_Mart_EventScript_16B666:: @ 816B666 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index 9e2b4f752..40ead09e0 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 end VermilionCity_PokemonCenter_1F_EventScript_16B43C:: @ 816B43C - msgbox gUnknown_8194145, 2 + msgbox gUnknown_8194145, MSGBOX_NPC end VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445 - msgbox gUnknown_81940AF, 2 + msgbox gUnknown_81940AF, MSGBOX_NPC end VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E - msgbox gUnknown_8194180, 2 + msgbox gUnknown_8194180, MSGBOX_NPC end diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 42d810120..f2df7d231 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -6,7 +6,7 @@ VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F faceplayer goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16B4B1 msgbox gUnknown_8194860 release @@ -110,9 +110,9 @@ VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1 end VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 - msgbox gUnknown_8194910, 3 + msgbox gUnknown_8194910, MSGBOX_SIGN end VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD - msgbox gUnknown_819493D, 3 + msgbox gUnknown_819493D, MSGBOX_SIGN end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 255c5e240..79d01278f 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -37,10 +37,10 @@ EventScript_160F62:: @ 8160F62 VictoryRoad_1F_EventScript_160F64:: @ 8160F64 trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738 - msgbox gUnknown_8174744, 6 + msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8 - msgbox gUnknown_81747C8, 6 + msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 1e08d2265..49d21b7de 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -57,25 +57,25 @@ EventScript_161035:: @ 8161035 VictoryRoad_2F_EventScript_161037:: @ 8161037 trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C - msgbox gUnknown_817483E, 6 + msgbox gUnknown_817483E, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_16104E:: @ 816104E trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4 - msgbox gUnknown_81748BB, 6 + msgbox gUnknown_81748BB, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_161065:: @ 8161065 trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B - msgbox gUnknown_8174927, 6 + msgbox gUnknown_8174927, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_16107C:: @ 816107C trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0 - msgbox gUnknown_81749BB, 6 + msgbox gUnknown_81749BB, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_161093:: @ 8161093 trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A - msgbox gUnknown_8174969, 6 + msgbox gUnknown_8174969, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 8e12ddf79..4cd011f92 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -33,30 +33,30 @@ EventScript_161101:: @ 8161101 VictoryRoad_3F_EventScript_161103:: @ 8161103 trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83 - msgbox gUnknown_8174B99, 6 + msgbox gUnknown_8174B99, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_16111A:: @ 816111A trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9 - msgbox gUnknown_8174CBD, 6 + msgbox gUnknown_8174CBD, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_161131:: @ 8161131 trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A - msgbox gUnknown_8174C67, 6 + msgbox gUnknown_8174C67, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_161148:: @ 8161148 trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4 - msgbox gUnknown_8174C03, 6 + msgbox gUnknown_8174C03, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_16115F:: @ 816115F trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96 - msgbox gUnknown_8174D64, 6 + msgbox gUnknown_8174D64, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_16117A:: @ 816117A trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D - msgbox gUnknown_8174E48, 6 + msgbox gUnknown_8174E48, MSGBOX_AUTOCLOSE end diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index f87c5ac12..c99ff83ec 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -58,27 +58,27 @@ Movement_165992:: @ 8165992 step_end ViridianCity_EventScript_165994:: @ 8165994 - msgbox gUnknown_817E1BB, 3 + msgbox gUnknown_817E1BB, MSGBOX_SIGN end ViridianCity_EventScript_16599D:: @ 816599D - msgbox gUnknown_817E1E7, 3 + msgbox gUnknown_817E1E7, MSGBOX_SIGN end ViridianCity_EventScript_1659A6:: @ 81659A6 - msgbox gUnknown_817E24D, 3 + msgbox gUnknown_817E24D, MSGBOX_SIGN end ViridianCity_EventScript_1659AF:: @ 81659AF - msgbox gUnknown_817E2DB, 3 + msgbox gUnknown_817E2DB, MSGBOX_SIGN end ViridianCity_EventScript_1659B8:: @ 81659B8 - msgbox gUnknown_817E2F5, 3 + msgbox gUnknown_817E2F5, MSGBOX_SIGN end ViridianCity_EventScript_1659C1:: @ 81659C1 - msgbox gUnknown_817DABB, 2 + msgbox gUnknown_817DABB, MSGBOX_NPC end ViridianCity_EventScript_1659CA:: @ 81659CA @@ -112,7 +112,7 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_165A40 msgbox gUnknown_817E0EA release @@ -159,9 +159,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F lock faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_165AB0 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_165ABA end diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index f119d51d1..92b9b8e5d 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -41,42 +41,42 @@ EventScript_169F70:: @ 8169F70 ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A trainerbattle_single TRAINER_TAMER_JASON, Text_18F7F3, Text_18F824 - msgbox gUnknown_818F840, 6 + msgbox gUnknown_818F840, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169F91:: @ 8169F91 trainerbattle_single TRAINER_TAMER_COLE, Text_18F98A, Text_18F9BB - msgbox gUnknown_818F9CC, 6 + msgbox gUnknown_818F9CC, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, Text_18F7AD, Text_18F7D6 - msgbox gUnknown_818F7DD, 6 + msgbox gUnknown_818F7DD, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF trainerbattle_single TRAINER_BLACK_BELT_KIYO, Text_18F86C, Text_18F899 - msgbox gUnknown_818F8A0, 6 + msgbox gUnknown_818F8A0, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, Text_18F92C, Text_18F95A - msgbox gUnknown_818F960, 6 + msgbox gUnknown_818F960, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FED:: @ 8169FED trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, Text_18F9E7, Text_18FA2D - msgbox gUnknown_818FA3B, 6 + msgbox gUnknown_818FA3B, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_16A004:: @ 816A004 trainerbattle_single TRAINER_COOLTRAINER_YUJI, Text_18F73B, Text_18F769 - msgbox gUnknown_818F77B, 6 + msgbox gUnknown_818F77B, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_16A01B:: @ 816A01B trainerbattle_single TRAINER_COOLTRAINER_WARREN, Text_18F8CB, Text_18F8EE - msgbox gUnknown_818F8FE, 6 + msgbox gUnknown_818F8FE, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_16A032:: @ 816A032 diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc index b82b0ed2f..446035efe 100644 --- a/data/maps/ViridianCity_House1/scripts.inc +++ b/data/maps/ViridianCity_House1/scripts.inc @@ -2,11 +2,11 @@ ViridianCity_House1_MapScripts:: @ 8169E9A .byte 0 ViridianCity_House1_EventScript_169E9B:: @ 8169E9B - msgbox gUnknown_818F292, 2 + msgbox gUnknown_818F292, MSGBOX_NPC end ViridianCity_House1_EventScript_169EA4:: @ 8169EA4 - msgbox gUnknown_818F30F, 2 + msgbox gUnknown_818F30F, MSGBOX_NPC end ViridianCity_House1_EventScript_169EAD:: @ 8169EAD @@ -20,5 +20,5 @@ ViridianCity_House1_EventScript_169EAD:: @ 8169EAD end ViridianCity_House1_EventScript_169EC0:: @ 8169EC0 - msgbox gUnknown_818F33D, 3 + msgbox gUnknown_818F33D, MSGBOX_SIGN end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index a897b3f1f..6a0845622 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -25,15 +25,15 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB lockall msgbox gUnknown_818FC65 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_WalkInPlaceFastestUp diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 3ecce3880..5dc1f3a67 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -80,9 +80,9 @@ EventScript_16A2A4:: @ 816A2A4 end ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE - msgbox gUnknown_81902F5, 2 + msgbox gUnknown_81902F5, MSGBOX_NPC end ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7 - msgbox gUnknown_819032C, 2 + msgbox gUnknown_819032C, MSGBOX_NPC end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 6c24a177b..4a09cff1e 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF end ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8 - msgbox gUnknown_81903E5, 2 + msgbox gUnknown_81903E5, MSGBOX_NPC end ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1 - msgbox gUnknown_8190384, 2 + msgbox gUnknown_8190384, MSGBOX_NPC end ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA - msgbox gUnknown_8190450, 2 + msgbox gUnknown_8190450, MSGBOX_NPC end diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index 95b1f0fb5..6fb97d075 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -7,58 +7,58 @@ ViridianForest_OnTransition:: @ 8160525 end ViridianForest_EventScript_160529:: @ 8160529 - msgbox gUnknown_8172255, 2 + msgbox gUnknown_8172255, MSGBOX_NPC end ViridianForest_EventScript_160532:: @ 8160532 - msgbox gUnknown_8172559, 2 + msgbox gUnknown_8172559, MSGBOX_NPC end ViridianForest_EventScript_16053B:: @ 816053B - msgbox gUnknown_81725C7, 3 + msgbox gUnknown_81725C7, MSGBOX_SIGN end ViridianForest_EventScript_160544:: @ 8160544 - msgbox gUnknown_8172629, 3 + msgbox gUnknown_8172629, MSGBOX_SIGN end ViridianForest_EventScript_16054D:: @ 816054D - msgbox gUnknown_817265C, 3 + msgbox gUnknown_817265C, MSGBOX_SIGN end ViridianForest_EventScript_160556:: @ 8160556 - msgbox gUnknown_81726A3, 3 + msgbox gUnknown_81726A3, MSGBOX_SIGN end ViridianForest_EventScript_16055F:: @ 816055F - msgbox gUnknown_817271D, 3 + msgbox gUnknown_817271D, MSGBOX_SIGN end ViridianForest_EventScript_160568:: @ 8160568 - msgbox gUnknown_8172773, 3 + msgbox gUnknown_8172773, MSGBOX_SIGN end ViridianForest_EventScript_160571:: @ 8160571 trainerbattle_single TRAINER_BUG_CATCHER_RICK, Text_1722C7, Text_1722F9 - msgbox gUnknown_8172315, 6 + msgbox gUnknown_8172315, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_160588:: @ 8160588 trainerbattle_single TRAINER_BUG_CATCHER_DOUG, Text_17234A, Text_17237D - msgbox gUnknown_8172398, 6 + msgbox gUnknown_8172398, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_16059F:: @ 816059F trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, Text_1723D4, Text_172402 - msgbox gUnknown_817241F, 6 + msgbox gUnknown_817241F, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_1605B6:: @ 81605B6 trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, Text_172482, Text_1724BF - msgbox gUnknown_81724DC, 6 + msgbox gUnknown_81724DC, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_1605CD:: @ 81605CD trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, Text_1724F9, Text_17251B - msgbox gUnknown_8172527, 6 + msgbox gUnknown_8172527, MSGBOX_AUTOCLOSE end diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index bac14d221..c089472cb 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -8,8 +8,8 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 specialvar VAR_RESULT, IsThereMonInRoute5Daycare compare VAR_RESULT, 1 goto_if_eq EventScript_1BF46E - msgbox Text_19DD66, 5 - compare VAR_RESULT, 1 + msgbox Text_19DD66, MSGBOX_YESNO + compare VAR_RESULT, YES goto_if_eq EventScript_1BF3DD msgbox Text_19DDB2 goto EventScript_1BF541 @@ -64,8 +64,8 @@ EventScript_1BF46E:: @ 81BF46E compare VAR_RESULT, 0 call_if_eq EventScript_1BF4B3 special GetCostToWithdrawRoute5DaycareMon - msgbox Text_19DE80, 5 - compare VAR_RESULT, 1 + msgbox Text_19DE80, MSGBOX_YESNO + compare VAR_RESULT, YES goto_if_eq EventScript_1BF4BC goto EventScript_1BF444 end diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index 3d808fa86..e1e0beebb 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -10,8 +10,8 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_CUT - msgbox gUnknown_81BDF94, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BDF94, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BDF91 msgbox gUnknown_81BDFD7 closemessage @@ -39,7 +39,7 @@ Movement_1BDF85:: @ 81BDF85 step_end EventScript_1BDF87:: @ 81BDF87 - msgbox gUnknown_81BDFE3, 3 + msgbox gUnknown_81BDFE3, MSGBOX_SIGN releaseall end @@ -72,8 +72,8 @@ EventScript_InteractWithRockSmashRockObject:: @ 81BE00C setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_ROCK_SMASH - msgbox Text_1BE09D, 5 - compare VAR_RESULT, 0 + msgbox Text_1BE09D, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE09A msgbox gUnknown_81BDFD7 closemessage @@ -109,7 +109,7 @@ Movement_1BE08F:: @ 81BE08F step_end EventScript_1BE091:: @ 81BE091 - msgbox gUnknown_81BE0E2, 3 + msgbox gUnknown_81BE0E2, MSGBOX_SIGN end EventScript_1BE09A:: @ 81BE09A @@ -136,8 +136,8 @@ EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_1BE185 setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE19A, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE19A, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE197 closemessage dofieldeffect FLDEFF_USE_STRENGTH @@ -154,15 +154,15 @@ EventScript_FldEffStrength:: @ 81BE16E EventScript_1BE179:: @ 81BE179 setflag FLAG_SYS_STRENGTH_ACTIVE - msgbox gUnknown_81BE1FA, 3 + msgbox gUnknown_81BE1FA, MSGBOX_SIGN end EventScript_1BE185:: @ 81BE185 - msgbox gUnknown_81BE244, 3 + msgbox gUnknown_81BE244, MSGBOX_SIGN end EventScript_1BE18E:: @ 81BE18E - msgbox gUnknown_81BE284, 3 + msgbox gUnknown_81BE284, MSGBOX_SIGN end EventScript_1BE197:: @ 81BE197 @@ -198,8 +198,8 @@ gUnknown_81BE2B7:: @ 81BE2B7 goto_if_eq EventScript_1BE300 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE33F, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE33F, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE308 msgbox gUnknown_81BE378 dofieldeffect FLDEFF_USE_WATERFALL @@ -233,8 +233,8 @@ EventScript_1BE38B:: @ 81BE38B getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 - msgbox gUnknown_81BE469, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE469, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE3D2 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -256,8 +256,8 @@ EventScript_1BE3D4:: @ 81BE3D4 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 - msgbox gUnknown_81BE4EF, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE4EF, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE429 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -299,7 +299,7 @@ gUnknown_81BE52F:: @ 81BE52F .string "DIVE can't be used here.$" EventScript_FailSweetScent:: @ 81BE564 - msgbox Text_1BE56D, 3 + msgbox Text_1BE56D, MSGBOX_SIGN end Text_1BE56D:: @ 81BE56D diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index 782c71a92..edc11e317 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -8,8 +8,8 @@ EventScript_UseSurf:: @ 81A6AC8 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT lockall - msgbox Text_1A556E, 5 - compare VAR_RESULT, 0 + msgbox Text_1A556E, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_UseSurfRelease msgbox Text_1A55A5 dofieldeffect FLDEFF_USE_SURF From 9fafa122851dc4eecdefde2b36b88be6572656f0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 03:19:11 -0500 Subject: [PATCH 13/20] More basic script constants --- asm/macros/event.inc | 20 ++++++++++ constants/misc_constants.inc | 9 ----- data/event_scripts.s | 23 ++++++------ .../scripts.inc | 12 +++--- data/maps/CeladonCity_GameCorner/scripts.inc | 4 +- .../scripts.inc | 2 +- data/maps/CeladonCity_Gym/scripts.inc | 2 +- data/maps/CeladonCity_Restaurant/scripts.inc | 2 +- data/maps/CeruleanCity/scripts.inc | 9 ++--- data/maps/CeruleanCity_Gym/scripts.inc | 2 +- data/maps/CinnabarIsland_Gym/scripts.inc | 20 ++++------ .../FiveIsland_LostCave_Room10/scripts.inc | 3 +- .../FiveIsland_MemorialPillar/scripts.inc | 2 +- .../FiveIsland_RocketWarehouse/scripts.inc | 7 ++-- .../FourIsland_PokemonDayCare/scripts.inc | 2 +- data/maps/FuchsiaCity_Building1/scripts.inc | 4 +- data/maps/FuchsiaCity_Gym/scripts.inc | 2 +- data/maps/FuchsiaCity_House2/scripts.inc | 2 +- data/maps/FuchsiaCity_House3/scripts.inc | 4 +- .../scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 2 +- data/maps/MtEmber_Exterior/scripts.inc | 16 +++----- data/maps/MtMoon_B2F/scripts.inc | 3 +- .../OneIsland_KindleRoad_EmberSpa/scripts.inc | 4 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/PalletTown_GarysHouse/scripts.inc | 6 +-- .../PalletTown_PlayersHouse_1F/scripts.inc | 8 ++-- .../PalletTown_ProfessorOaksLab/scripts.inc | 2 +- data/maps/PewterCity_Gym/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/scripts.inc | 4 +- .../PokemonLeague_ChampionsRoom/scripts.inc | 18 +++------ .../maps/PokemonLeague_HallOfFame/scripts.inc | 2 +- data/maps/PokemonTower_1F/scripts.inc | 2 +- data/maps/PokemonTower_5F/scripts.inc | 4 +- data/maps/RocketHideout_B1F/scripts.inc | 3 +- data/maps/RocketHideout_B4F/scripts.inc | 22 ++++------- data/maps/Route1/scripts.inc | 2 +- .../maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 2 +- data/maps/Route12_FishingHouse/scripts.inc | 2 +- .../maps/Route12_NorthEntrance_2F/scripts.inc | 6 +-- data/maps/Route15_WestEntrance_2F/scripts.inc | 2 +- data/maps/Route16_House/scripts.inc | 2 +- .../maps/Route16_NorthEntrance_2F/scripts.inc | 2 +- data/maps/Route24/scripts.inc | 2 +- data/maps/Route25_SeaCottage/scripts.inc | 14 +++---- data/maps/Route2_EastBuilding/scripts.inc | 2 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 10 ++--- data/maps/SSAnne_1F_Room4/scripts.inc | 2 +- data/maps/SSAnne_1F_Room6/scripts.inc | 2 +- data/maps/SafariZone_SecretHouse/scripts.inc | 2 +- data/maps/SaffronCity_Gym/scripts.inc | 2 +- data/maps/SaffronCity_House1_2F/scripts.inc | 6 +-- data/maps/SaffronCity_House3/scripts.inc | 2 +- data/maps/SevenIsland_House_Room1/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/SilphCo_11F/scripts.inc | 10 ++--- data/maps/ThreeIsland/scripts.inc | 6 +-- .../ThreeIsland_DunsparceTunnel/scripts.inc | 6 +-- data/maps/TwoIsland_House/scripts.inc | 4 +- .../TwoIsland_JoyfulGameCorner/scripts.inc | 2 +- data/maps/VermilionCity/scripts.inc | 4 +- data/maps/VermilionCity_Gym/scripts.inc | 2 +- data/maps/VermilionCity_House1/scripts.inc | 2 +- .../VermilionCity_PokemonFanClub/scripts.inc | 2 +- data/maps/ViridianCity_Gym/scripts.inc | 6 +-- data/mystery_event_msg.s | 37 ++++++++++--------- data/scripts/cable_club.inc | 24 ++++++------ data/scripts/day_care.inc | 2 +- data/scripts/move_tutors.inc | 8 ++-- data/scripts/seagallop.inc | 2 +- data/scripts/static_pokemon.inc | 8 ++-- include/constants/field_weather.h | 24 ++++++++++++ 74 files changed, 232 insertions(+), 222 deletions(-) create mode 100644 include/constants/field_weather.h diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 53a9285e9..1169905b5 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1534,6 +1534,26 @@ vgoto_if FALSE, \dest .endm + .macro goto_if_defeated trainer:req, dest:req + checktrainerflag \trainer + goto_if TRUE, \dest + .endm + + .macro goto_if_undefeated trainer:req, dest:req + checktrainerflag \trainer + goto_if FALSE, \dest + .endm + + .macro call_if_defeated trainer:req, dest:req + checktrainerflag \trainer + call_if TRUE, \dest + .endm + + .macro call_if_undefeated trainer:req, dest:req + checktrainerflag \trainer + call_if FALSE, \dest + .endm + .macro switch var:req copyvar VAR_0x8000, \var .endm diff --git a/constants/misc_constants.inc b/constants/misc_constants.inc index 5f4330928..959465a5a 100644 --- a/constants/misc_constants.inc +++ b/constants/misc_constants.inc @@ -3,7 +3,6 @@ .set NULL, 0 - .set POKEMON_NAME_LENGTH, 11 .set MOVE_NAME_LENGTH, 13 .set SPRITE_SIZE_8x8, (OAM_SIZE_0 >> 28) | (OAM_SQUARE >> 14) @@ -24,14 +23,6 @@ .set OBJ_IMAGE_ANIM_H_FLIP, 1 << 6 .set OBJ_IMAGE_ANIM_V_FLIP, 1 << 7 - .equiv DIR_SOUTH, 1 - .equiv DIR_NORTH, 2 - .equiv DIR_WEST, 3 - .equiv DIR_EAST, 4 - - .equiv MALE, 0 - .equiv FEMALE, 1 - .ifdef ENGLISH .equiv GAME_LANGUAGE, 2 .else diff --git a/data/event_scripts.s b/data/event_scripts.s index 5aa68edf4..ebc32f1ab 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -22,6 +22,7 @@ #include "constants/battle_setup.h" #include "constants/map_scripts.h" #include "constants/cable_club.h" +#include "constants/field_weather.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -1213,9 +1214,9 @@ EventScript_1A6551:: @ 81A6551 .include "data/scripts/pc.inc" EventScript_1A6AC0:: @ 81A6AC0 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80FEE44 - fadescreen 0 + fadescreen FADE_FROM_BLACK return .include "data/scripts/surf.inc" @@ -1246,11 +1247,11 @@ EventScript_1A6C21:: @ 81A6C21 return EventScript_FadeOut_Heal_FadeIn:: @ 81A6C26 - fadescreen 1 + fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare special sp000_heal_pokemon - fadescreen 0 + fadescreen FADE_FROM_BLACK return gUnknown_81A6C32:: @ 81A6C32 @@ -1259,7 +1260,7 @@ gUnknown_81A6C32:: @ 81A6C32 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 - fadescreen 1 + fadescreen FADE_TO_BLACK special Special_TownMap waitstate releaseall @@ -1305,7 +1306,7 @@ EventScript_1A74D1:: @ 81A74D1 return EventScript_1A74EB:: @ 81A74EB - fadescreen 1 + fadescreen FADE_TO_BLACK special ChangePokemonNickname waitstate return @@ -1841,7 +1842,7 @@ EventScript_1A8C27:: @ 81A8C27 return EventScript_1A8C33:: @ 81A8C33 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChangeBoxPokemonNickname waitstate lock @@ -2078,9 +2079,9 @@ EventScript_PoisonWhiteOut:: @ 81A8DFD EventScript_1A8E11:: @ 81A8E11 checkmoney 1, 0 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1A8E2E - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A8E3C end @@ -2098,7 +2099,7 @@ EventScript_1A8E3C:: @ 81A8E3C EventScript_1A8E4D:: @ 81A8E4D special sub_807F0B0 waitstate - fadescreen 1 + fadescreen FADE_TO_BLACK special sp0C8_whiteout_maybe waitstate end @@ -2181,7 +2182,7 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 compare VAR_RESULT, NO goto_if_eq EventScript_1B2926 checkmoney 50, 0 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1B292B playse SE_SHOP takemoney 50, 0 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index a39810d94..1b3a35399 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -17,13 +17,13 @@ CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD EventScript_16BCF6:: @ 816BCF6 setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE call_if_eq EventScript_16BD2C checkitem ITEM_SODA_POP, 1 - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE call_if_eq EventScript_16BD32 checkitem ITEM_LEMONADE, 1 - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE call_if_eq EventScript_16BD38 return @@ -147,7 +147,7 @@ EventScript_16BF7C:: @ 816BF7C getitemname 1, VAR_0x8009 removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16C002 additem VAR_0x8009 textcolor 3 @@ -258,10 +258,10 @@ EventScript_16C0C4:: @ 816C0C4 return EventScript_16C0CB:: @ 816C0CB - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16C131 checkitemspace VAR_TEMP_0, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16C13F compare VAR_TEMP_1, 0 call_if_eq EventScript_16C0B6 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 3e4f49fe5..bcd05a1b9 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -50,7 +50,7 @@ EventScript_16C706:: @ 816C706 compare VAR_TEMP_1, 9500 goto_if_ge EventScript_16C79E checkmoney 10000, 0 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16C7AC givecoins 500 takemoney 10000, 0 @@ -62,7 +62,7 @@ EventScript_16C734:: @ 816C734 compare VAR_TEMP_1, 9950 goto_if_ge EventScript_16C79E checkmoney 1000, 0 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16C7AC givecoins 50 takemoney 1000, 0 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 663a3a4f1..20427a77a 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -328,7 +328,7 @@ EventScript_16CF3F:: @ 816CF3F compare VAR_RESULT, VAR_TEMP_2 goto_if_lt EventScript_16CDA5 checkitemspace VAR_TEMP_1, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16CF79 takecoins VAR_TEMP_2 updatecoinsbox 0, 5 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index e280f1a51..60a945e21 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -22,7 +22,7 @@ EventScript_16D0A0:: @ 816D0A0 EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16D107 giveitem_msg gUnknown_81973BA, ITEM_TM19 setflag FLAG_GOT_TM19_FROM_ERIKA diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 760624c64..c8ab9469a 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16D241 giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_GOT_COIN_CASE diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index a266a6c93..2e75b82b4 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -170,8 +170,7 @@ Movement_1665FB:: @ 81665FB CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5 - goto_if_eq EventScript_16662E + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, EventScript_16662E message Text_17EE0E waitmessage playbgm MUS_ROCKET, 0 @@ -184,14 +183,14 @@ CeruleanCity_EventScript_166603:: @ 8166603 EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_166677 giveitem_msg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 - fadescreen 0 + fadescreen FADE_FROM_BLACK setflag FLAG_GOT_TM28_FROM_ROCKET release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 1d2c46416..a172dc5b3 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -21,7 +21,7 @@ EventScript_16AAD3:: @ 816AAD3 EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16AB3A giveitem_msg gUnknown_81923F1, ITEM_TM03 setflag FLAG_GOT_TM03_FROM_MISTY diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index c475e3c2a..15496a023 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -67,7 +67,7 @@ EventScript_16DA06:: @ 816DA06 EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16DA75 giveitem_msg gUnknown_81996FF, ITEM_TM38 setflag FLAG_GOT_TM38_FROM_BLAINE @@ -251,8 +251,7 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 - checktrainerflag TRAINER_BURGLAR_QUINN - goto_if_lt EventScript_16DC7A + goto_if_undefeated TRAINER_BURGLAR_QUINN, EventScript_16DC7A releaseall end @@ -328,8 +327,7 @@ EventScript_16DD31:: @ 816DD31 EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 - checktrainerflag TRAINER_SUPER_NERD_AVERY - goto_if_lt EventScript_16DD51 + goto_if_undefeated TRAINER_SUPER_NERD_AVERY, EventScript_16DD51 releaseall end @@ -414,8 +412,7 @@ EventScript_16DE0F:: @ 816DE0F EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 - checktrainerflag TRAINER_BURGLAR_RAMON - goto_if_lt EventScript_16DE2F + goto_if_undefeated TRAINER_BURGLAR_RAMON, EventScript_16DE2F releaseall end @@ -491,8 +488,7 @@ EventScript_16DEE6:: @ 816DEE6 EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 - checktrainerflag TRAINER_SUPER_NERD_DEREK - goto_if_lt EventScript_16DF06 + goto_if_undefeated TRAINER_SUPER_NERD_DEREK, EventScript_16DF06 releaseall end @@ -568,8 +564,7 @@ EventScript_16DFBD:: @ 816DFBD EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 - checktrainerflag TRAINER_BURGLAR_DUSTY - goto_if_lt EventScript_16DFDD + goto_if_undefeated TRAINER_BURGLAR_DUSTY, EventScript_16DFDD releaseall end @@ -645,8 +640,7 @@ EventScript_16E094:: @ 816E094 EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 - checktrainerflag TRAINER_SUPER_NERD_ZAC - goto_if_lt EventScript_16E0B4 + goto_if_undefeated TRAINER_SUPER_NERD_ZAC, EventScript_16E0B4 releaseall end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index c4ddc2423..3b3dffc4d 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -4,8 +4,7 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D .byte 0 FiveIsland_LostCave_Room10_OnResume:: @ 8164C38 - checktrainerflag TRAINER_LADY_SELPHY - call_if_eq EventScript_164C42 + call_if_defeated TRAINER_LADY_SELPHY, EventScript_164C42 end EventScript_164C42:: @ 8164C42 diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 00dab6998..b193e830e 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -41,7 +41,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_168A86 releaseall end diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 1ad6a2991..aa54456f0 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -8,8 +8,7 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 end FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D - checktrainerflag TRAINER_TEAM_ROCKET_ADMIN - call_if_eq EventScript_163F47 + call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, EventScript_163F47 end EventScript_163F47:: @ 8163F47 @@ -80,13 +79,13 @@ EventScript_16402F:: @ 816402F call_if_le EventScript_164065 msgbox gUnknown_817BA64 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 1 removeobject 2 removeobject 4 removeobject 3 setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS - fadescreen 0 + fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 setflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE release diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index d7034d740..f3b695231 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -26,7 +26,7 @@ EventScript_171993:: @ 8171993 compare VAR_RESULT, 1 goto_if_eq EventScript_171A1A msgbox gUnknown_81BF839 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseSendDaycareMon waitstate compare VAR_0x8004, 6 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index 72dbb8e8e..0011190dc 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -23,9 +23,9 @@ EventScript_16D780:: @ 816D780 msgbox gUnknown_8198EAA call EventScript_1A6675 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_16D7D6 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_16D7DF giveitem_msg gUnknown_8199068, ITEM_HM04 setflag FLAG_GOT_HM04 diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 2e299a867..d20eeb409 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -21,7 +21,7 @@ EventScript_16D580:: @ 816D580 EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16D5E7 giveitem_msg gUnknown_819858F, ITEM_TM06 setflag FLAG_GOT_TM06_FROM_KOGA diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 78fb5ffb8..95e481963 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -20,7 +20,7 @@ EventScript_16D83F:: @ 816D83F EventScript_16D849:: @ 816D849 msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16D88A giveitem_msg gUnknown_819925E, ITEM_GOOD_ROD msgbox gUnknown_8199296 diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index ab6f4e658..6558a43ee 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -23,9 +23,9 @@ EventScript_16D8B0:: @ 816D8B0 compare VAR_RESULT, 1 goto_if_eq EventScript_16D92A msgbox gUnknown_8199445 - fadescreen 1 + fadescreen FADE_TO_BLACK special SelectMove - fadescreen 0 + fadescreen FADE_FROM_BLACK compare VAR_0x8005, 4 goto_if_eq EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index b2085a32f..044f821a0 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -111,7 +111,7 @@ EventScript_16D391:: @ 816D391 EventScript_16D3CA:: @ 816D3CA call EventScript_16D462 checkmoney 500, 0 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 5eb676e9d..16eb449ae 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE call_if_eq EventScript_16EA79 end @@ -19,7 +19,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A lock faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 release diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 612993321..feda220fd 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -7,7 +7,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A goto_if_set FLAG_GOT_POKE_FLUTE, EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16B1A0 setflag FLAG_GOT_POKE_FLUTE giveitem_msg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 75e6813e8..67b563e72 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -25,8 +25,7 @@ EventScript_163975:: @ 8163975 MtEmber_Exterior_EventScript_16397F:: @ 816397F lock - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if_eq EventScript_16399E + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_16399E compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if_eq EventScript_1639A8 msgbox gUnknown_817A82A @@ -45,26 +44,24 @@ EventScript_1639A8:: @ 81639A8 msgbox gUnknown_817AA06 trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, Text_17AA34 msgbox gUnknown_817AA3F - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if_eq EventScript_1639DB + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_1639DB release end EventScript_1639DB:: @ 81639DB msgbox gUnknown_817AAD7 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 3 - fadescreen 0 + fadescreen FADE_FROM_BLACK release end MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if_eq EventScript_163A1B + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_163A1B compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if_eq EventScript_163A25 msgbox gUnknown_817A88C @@ -84,8 +81,7 @@ EventScript_163A25:: @ 8163A25 msgbox gUnknown_817AA56 trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, Text_17AA8A msgbox gUnknown_817AA99 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if_eq EventScript_1639DB + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_1639DB release end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 0ebee79d6..71c458c12 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -23,8 +23,7 @@ MtMoon_B2F_EventScript_1606C2:: @ 81606C2 lock faceplayer goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707 - checktrainerflag TRAINER_SUPER_NERD_MIGUEL - goto_if_eq EventScript_160711 + goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, EventScript_160711 call EventScript_1606DD release end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 74027ec35..9f59c9c5c 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -43,9 +43,9 @@ EventScript_1653C5:: @ 81653C5 OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF lockall - fadescreen 3 + fadescreen FADE_TO_WHITE special sp000_heal_pokemon - fadescreen 2 + fadescreen FADE_FROM_WHITE msgbox gUnknown_817D450 setvar VAR_TEMP_1, 1 releaseall diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index b3cc2117f..6c7c3e762 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -213,7 +213,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if_eq EventScript_1710F2 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1710FC compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 goto_if_eq EventScript_171134 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index b8d786c41..80cb0a484 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -65,11 +65,11 @@ EventScript_168DB9:: @ 8168DB9 goto_if_eq EventScript_168E32 msgbox gUnknown_818D8CC closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare special Special_DaisyMassageServices - fadescreen 0 + fadescreen FADE_FROM_BLACK special TV_CopyNicknameToStringVar1AndEnsureTerminated msgbox gUnknown_818D8FE release @@ -142,7 +142,7 @@ EventScript_168EF6:: @ 8168EF6 msgbox gUnknown_818D60A closemessage checkitemspace ITEM_TOWN_MAP, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_168F4F applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 29c4ff710..9ac19e6ff 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -6,9 +6,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 faceplayer goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_168C38 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_168C41 closemessage applymovement 1, Movement_FaceOriginalDirection @@ -42,9 +42,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 EventScript_168C78:: @ 8168C78 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_168C91 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_168C9A releaseall end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 825b86e7f..0e3577c3b 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -985,7 +985,7 @@ EventScript_1699FB:: @ 81699FB goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78 checkitem ITEM_POKE_BALL, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_169A34 goto EventScript_169A6E end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 92bafee06..9774003b2 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -23,7 +23,7 @@ EventScript_16A5C5:: @ 816A5C5 EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16A634 giveitem_msg gUnknown_8190FDB, ITEM_TM39 setflag FLAG_GOT_TM39_FROM_BROCK diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index f4a0345c5..4622ee8a7 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -76,7 +76,7 @@ EventScript_16A3D1:: @ 816A3D1 EventScript_16A402:: @ 816A402 checkmoney 50, 0 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16A476 closemessage compare VAR_TEMP_1, 0 @@ -155,7 +155,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE goto_if_set FLAG_GOT_OLD_AMBER, EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16A4F5 setflag FLAG_GOT_OLD_AMBER removeobject 4 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 010dd4402..a0f5b8379 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -16,24 +16,18 @@ PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 end EventScript_162B1E:: @ 8162B1E - checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE - goto_if_eq EventScript_162B57 - checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE - goto_if_eq EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, EventScript_162B57 return EventScript_162B31:: @ 8162B31 - checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR - goto_if_eq EventScript_162B57 - checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR - goto_if_eq EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, EventScript_162B57 return EventScript_162B44:: @ 8162B44 - checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER - goto_if_eq EventScript_162B57 - checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER - goto_if_eq EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, EventScript_162B57 return EventScript_162B57:: @ 8162B57 diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index b28a75449..080e65ece 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -36,7 +36,7 @@ EventScript_162D70:: @ 8162D70 setvar VAR_TEMP_1, 1 call EventScript_1A651A setrespawn SPAWN_PALLET_TOWN - fadescreenspeed 1, 24 + fadescreenspeed FADE_TO_BLACK, 24 special Special_HallOfFame waitstate releaseall diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index 961468138..84509e616 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -22,7 +22,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A lock faceplayer checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq EventScript_163272 msgbox gUnknown_8179BFC release diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index c96354826..7c45a6947 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -7,9 +7,9 @@ PokemonTower_5F_EventScript_163433:: @ 8163433 PokemonTower_5F_EventScript_16343C:: @ 816343C lockall - fadescreen 3 + fadescreen FADE_TO_WHITE special sp000_heal_pokemon - fadescreen 2 + fadescreen FADE_FROM_WHITE msgbox gUnknown_817A1FA setvar VAR_TEMP_1, 1 releaseall diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index e9f52ceef..874e0b8e9 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -4,8 +4,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195 .byte 0 RocketHideout_B1F_OnLoad:: @ 81611A0 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 - call_if_lt EventScript_161233 + call_if_undefeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233 end RocketHideout_B1F_OnTransition:: @ 81611AA diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index ab1fb6865..d5fb798c5 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -4,10 +4,8 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 RocketHideout_B4F_OnLoad:: @ 81612EE setvar VAR_TEMP_1, 0 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if_eq EventScript_161311 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if_eq EventScript_161311 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 compare VAR_TEMP_1, 2 call_if_ne EventScript_16146A end @@ -26,14 +24,14 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 waitbuttonpress trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318 msgbox gUnknown_817532D - fadescreen 1 + fadescreen FADE_TO_BLACK closemessage removeobject 1 addobject 2 clearflag FLAG_HIDE_SILPH_SCOPE setflag FLAG_HIDE_CELADON_ROCKETS famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - fadescreen 0 + fadescreen FADE_FROM_BLACK release end @@ -78,10 +76,8 @@ RocketHideout_B4F_EventScript_1613CE:: @ 81613CE EventScript_1613E9:: @ 81613E9 setvar VAR_TEMP_1, 0 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if_eq EventScript_161311 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if_eq EventScript_161311 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 compare VAR_TEMP_1, 2 call_if_eq EventScript_1614A1 compare VAR_TEMP_1, 2 @@ -96,10 +92,8 @@ RocketHideout_B4F_EventScript_161418:: @ 8161418 EventScript_161433:: @ 8161433 setvar VAR_TEMP_1, 0 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if_eq EventScript_161311 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if_eq EventScript_161311 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 compare VAR_TEMP_1, 2 call_if_eq EventScript_1614A1 compare VAR_TEMP_1, 2 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index e4f5feb16..6f163cc22 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -8,7 +8,7 @@ Route1_EventScript_167EFE:: @ 8167EFE msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1A6BF9 getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index e902a3896..7d165279d 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -43,7 +43,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 goto_if_lt EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1A7AC7 giveitem_msg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index ec61893ec..854a3d5f8 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -70,7 +70,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 goto_if_lt EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1A7AC7 giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_GOT_ITEMFINDER diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 8421e5ffa..792f9c883 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -14,7 +14,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16FF75 additem ITEM_SUPER_ROD msgbox gUnknown_819F05B diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index e56f096f6..b9fee6dda 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -14,12 +14,12 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A faceplayer goto_if_set FLAG_GOT_TM27, EventScript_16FF01 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_16FEE5 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_16FEEE checkitemspace ITEM_TM27, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16FEF7 giveitem_msg gUnknown_819EE9F, ITEM_TM27 msgbox gUnknown_819EEC6 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 8bd966692..c4cc4b6fd 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -33,7 +33,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 goto_if_lt EventScript_1A7ABD msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1A7AC7 giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index dc1271a44..94ed9b932 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -7,7 +7,7 @@ Route16_House_EventScript_17014F:: @ 817014F goto_if_set FLAG_GOT_HM02, EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_17019B giveitem_msg gUnknown_819F8C0, ITEM_HM02 msgbox gUnknown_819F8E0 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 18c15c1e2..2dfd8f1b0 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -33,7 +33,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 goto_if_lt EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1A7AC7 giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index f3239d8dc..e30913e52 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -8,7 +8,7 @@ Route24_EventScript_168620:: @ 8168620 goto_if_eq EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16864C call EventScript_1686B9 release diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 725728930..ed5aca2c8 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -23,9 +23,9 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B goto_if_set FLAG_GOT_SS_TICKET, EventScript_170640 goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17064A checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq EventScript_170580 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq EventScript_17058E end @@ -67,9 +67,9 @@ EventScript_17059C:: @ 817059C EventScript_170600:: @ 8170600 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_170618 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_170621 return @@ -99,12 +99,12 @@ EventScript_170640:: @ 8170640 EventScript_17064A:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_1706AC - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1706BE giveitem_msg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_GOT_SS_TICKET_DUP diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 7b9f92e44..cba95dc0b 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -17,7 +17,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F goto_if_lt EventScript_1A7ABD msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1A7AC7 giveitem_msg gUnknown_819D7A1, ITEM_HM05 setflag FLAG_GOT_HM05 diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 7e236951a..fcb681783 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -24,9 +24,9 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F goto_if_set FLAG_BOUGHT_MAGIKARP, EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq EventScript_16F786 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq EventScript_16F794 end @@ -44,7 +44,7 @@ EventScript_16F7A2:: @ 816F7A2 compare VAR_RESULT, NO goto_if_eq EventScript_16F888 checkmoney 500, 0 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16F895 textcolor 3 setvar VAR_TEMP_1, 129 @@ -63,7 +63,7 @@ EventScript_16F7F6:: @ 816F7F6 compare VAR_RESULT, NO goto_if_eq EventScript_16F861 call EventScript_1A8C27 - fadescreen 1 + fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangePokemonNickname waitstate @@ -75,7 +75,7 @@ EventScript_16F822:: @ 816F822 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16F84B - fadescreen 1 + fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangeBoxPokemonNickname waitstate diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index 4ebebdc0a..9e6f3fdc2 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -5,7 +5,7 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 lock faceplayer checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq EventScript_160C5C msgbox gUnknown_8173BA4 release diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 356e61152..f356fa305 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -15,7 +15,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 EventScript_160E18:: @ 8160E18 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq EventScript_160E2E msgbox gUnknown_8174515 release diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 0d8e81924..a61a99525 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -7,7 +7,7 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453 goto_if_set FLAG_GOT_HM03, EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16249F giveitem_msg gUnknown_8177E92, ITEM_HM03 msgbox gUnknown_8177EB7 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 43ad8a354..afe863e89 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -22,7 +22,7 @@ EventScript_16EE0A:: @ 816EE0A EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16EE7E giveitem_msg gUnknown_819B7D3, ITEM_TM04 setflag FLAG_GOT_TM04_FROM_SABRINA diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 478bddb84..30931a998 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -25,12 +25,12 @@ SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B lock faceplayer checkitem ITEM_POKE_DOLL, 1 - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1C4CF6 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_16EBB7 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_16EBC0 release end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index a6b1ce51b..9e177cccb 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -7,7 +7,7 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16F0AB giveitem_msg gUnknown_819C16C, ITEM_TM29 msgbox gUnknown_819C18F diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 0818db154..eb6900223 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -127,7 +127,7 @@ EventScript_170A11:: @ 8170A11 EventScript_170A1E:: @ 8170A1E msgbox gUnknown_81A06AB - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80A0334 waitstate return diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 04ce5880d..92c4f9576 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -221,7 +221,7 @@ Movement_164AD6:: @ 8164AD6 SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8004, 1 special Special_BattleRecords waitstate diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 65d67dc2d..05f52646e 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -11,12 +11,12 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE faceplayer goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_161E59 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_161E6B giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 msgbox gUnknown_8176FEB @@ -77,11 +77,11 @@ EventScript_161EA0:: @ 8161EA0 trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB msgbox gUnknown_81771C2 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 3 removeobject 4 removeobject 6 - fadescreen 0 + fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_SILPH_CO_11F, 1 setflag FLAG_HIDE_SAFFRON_ROCKETS clearflag FLAG_HIDE_SAFFRON_CIVILIANS diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 82d922cb1..a92ad452a 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -47,7 +47,7 @@ EventScript_16781A:: @ 816781A waitmovement 0 msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_167865 msgreceiveditem gUnknown_81827BE, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE @@ -270,7 +270,7 @@ EventScript_167A59:: @ 8167A59 trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, Text_1826B7 msgbox gUnknown_818271D closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 3 removeobject 5 removeobject 7 @@ -278,7 +278,7 @@ EventScript_167A59:: @ 8167A59 removeobject 6 removeobject 8 removeobject 14 - fadescreen 0 + fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_THREE_ISLAND, 4 releaseall end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index db49c4dcd..46e8e15f8 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -6,9 +6,9 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT - compare VAR_0x8008, 1 + compare VAR_0x8008, TRUE call_if_eq EventScript_164D50 - compare VAR_0x8008, 0 + compare VAR_0x8008, FALSE call_if_eq EventScript_164D54 end @@ -26,7 +26,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 faceplayer goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_164D90 msgbox gUnknown_817D13B closemessage diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 7e6c06d8b..d8c530847 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -19,10 +19,10 @@ TwoIsland_House_EventScript_171619:: @ 8171619 EventScript_17164F:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE call_if_eq EventScript_1717A8 checkitem ITEM_TINY_MUSHROOM, 2 - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE call_if_eq EventScript_1717AC goto_if_set FLAG_TEMP_2, EventScript_171687 goto_if_set FLAG_TEMP_3, EventScript_171696 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index fff1e10c5..ce2f7c9ba 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -165,7 +165,7 @@ EventScript_17158A:: @ 817158A EventScript_1715C4:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1715FF additem ITEM_MOON_STONE setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index cb287134a..9ddc33439 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -59,7 +59,7 @@ VermilionCity_EventScript_166941:: @ 8166941 EventScript_166958:: @ 8166958 goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1A77B0 goto EventScript_1A77AA end @@ -67,7 +67,7 @@ EventScript_166958:: @ 8166958 EventScript_166977:: @ 8166977 goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1A77B0 goto EventScript_1A77AA end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index a3be8b958..222f8b05b 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -227,7 +227,7 @@ EventScript_16B9AB:: @ 816B9AB EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16B9F0 giveitem_msg gUnknown_8194D87, ITEM_TM34 setflag FLAG_GOT_TM34_FROM_SURGE diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index cdf4aea91..3fb54afee 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -19,7 +19,7 @@ EventScript_16B3CF:: @ 816B3CF EventScript_16B3D9:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16B41A additem ITEM_OLD_ROD msgbox gUnknown_8193F2A diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index f2df7d231..23b24b9a2 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -20,7 +20,7 @@ EventScript_16B4A7:: @ 816B4A7 EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_16B4F2 setflag FLAG_GOT_BIKE_VOUCHER giveitem_msg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 92b9b8e5d..0579e9e32 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -7,9 +7,9 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, EventScript_169F2F msgbox gUnknown_818F4A2 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 8 - fadescreen 0 + fadescreen FADE_FROM_BLACK release end @@ -26,7 +26,7 @@ EventScript_169F04:: @ 8169F04 EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_169F70 giveitem_msg gUnknown_818F675, ITEM_TM26 setflag FLAG_GOT_TM26_FROM_GIOVANNI diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index ee4585203..2eab73984 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -1,5 +1,6 @@ @ These are event scripts. They should not be moved to C. +#include "constants/global.h" #include "constants/flags.h" #include "constants/moves.h" #include "constants/songs.h" @@ -42,8 +43,8 @@ MysteryEventScript_SurfPichu:: @ 8488EB5 SurfPichu_GiveIfPossible: @ 8488EC4 specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare VAR_EVENT_PICHU_SLOT, 6 - vgoto_if TRUE, SurfPichu_FullParty + compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE + vgoto_if_eq SurfPichu_FullParty setflag FLAG_MYSTERY_EVENT_DONE vcall SurfPichu_GiveEgg lock @@ -70,15 +71,15 @@ SurfPichu_GiveEgg: @ 8488EF6 setmonobedient VAR_EVENT_PICHU_SLOT setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff compare VAR_EVENT_PICHU_SLOT, 1 - vgoto_if TRUE, SurfPichu_Slot1 + vgoto_if_eq SurfPichu_Slot1 compare VAR_EVENT_PICHU_SLOT, 2 - vgoto_if TRUE, SurfPichu_Slot2 + vgoto_if_eq SurfPichu_Slot2 compare VAR_EVENT_PICHU_SLOT, 3 - vgoto_if TRUE, SurfPichu_Slot3 + vgoto_if_eq SurfPichu_Slot3 compare VAR_EVENT_PICHU_SLOT, 4 - vgoto_if TRUE, SurfPichu_Slot4 + vgoto_if_eq SurfPichu_Slot4 compare VAR_EVENT_PICHU_SLOT, 5 - vgoto_if TRUE, SurfPichu_Slot5 + vgoto_if_eq SurfPichu_Slot5 return SurfPichu_Slot1: @ 8488F38 @@ -118,7 +119,7 @@ MysteryEventScript_VisitingTrainer:: @ 848903A setvaddress MysteryEventScript_VisitingTrainer special ValidateEReaderTrainer compare VAR_RESULT, 0 - vgoto_if TRUE, MysteryEventScript_VisitingTrainerArrived + vgoto_if_eq MysteryEventScript_VisitingTrainerArrived lock faceplayer vmessage sText_MysteryGiftVisitingTrainer @@ -170,7 +171,7 @@ MysteryEventScript_BattleCard:: @ 84892B9 setorcopyvar VAR_RESULT, 2 specialvar VAR_0x8008, Special_BattleCardAction compare VAR_0x8008, 3 - vgoto_if FALSE, MysteryEventScript_BattleCardInfo + vgoto_if_ne MysteryEventScript_BattleCardInfo lock faceplayer vmessage sText_MysteryGiftBattleCountCard_2 @@ -218,14 +219,14 @@ MysteryEventScript_AuroraTicket:: @ 84894B9 vgoto_if_set FLAG_GOT_AURORA_TICKET, AuroraTicket_Obtained vgoto_if_set FLAG_FOUGHT_DEOXYS, AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 - compare VAR_RESULT, 1 - vgoto_if TRUE, AuroraTicket_Obtained + compare VAR_RESULT, TRUE + vgoto_if_eq AuroraTicket_Obtained vmessage sText_AuroraTicket1 waitmessage waitbuttonpress checkitemspace ITEM_AURORA_TICKET, 1 - compare VAR_RESULT, 0 - vgoto_if TRUE, AuroraTicket_NoBagSpace + compare VAR_RESULT, FALSE + vgoto_if_eq AuroraTicket_NoBagSpace giveitem ITEM_AURORA_TICKET setflag FLAG_SYS_GOT_AURORA_TICKET setflag FLAG_GOT_AURORA_TICKET @@ -279,14 +280,14 @@ MysteryEventScript_MysticTicket:: @ 8489689 vgoto_if_set FLAG_FOUGHT_LUGIA, MysticTicket_Obtained vgoto_if_set FLAG_FOUGHT_HO_OH, MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 - compare VAR_RESULT, 1 - vgoto_if TRUE, MysticTicket_Obtained + compare VAR_RESULT, TRUE + vgoto_if_eq MysticTicket_Obtained vmessage sText_MysticTicket2 waitmessage waitbuttonpress checkitemspace ITEM_MYSTIC_TICKET, 1 - compare VAR_RESULT, 0 - vgoto_if TRUE, MysticTicket_NoBagSpace + compare VAR_RESULT, FALSE + vgoto_if_eq MysticTicket_NoBagSpace giveitem ITEM_MYSTIC_TICKET setflag FLAG_SYS_GOT_MYSTIC_TICKET setflag FLAG_GOT_MYSTIC_TICKET @@ -336,7 +337,7 @@ MysteryEventScript_AlteringCave:: @ 8489862 setvaddress MysteryEventScript_AlteringCave addvar VAR_ALTERING_CAVE_WILD_SET, 1 compare VAR_ALTERING_CAVE_WILD_SET, 10 - vgoto_if FALSE, MysteryEventScript_AlteringCave_ + vgoto_if_ne MysteryEventScript_AlteringCave_ setvar VAR_ALTERING_CAVE_WILD_SET, 0 MysteryEventScript_AlteringCave_: @ 848987C lock diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index ea1bbfdcf..db0982a29 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -608,7 +608,7 @@ gUnknown_81BB8A7:: @ 81BB8A7 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8004, 0 special Special_BattleRecords waitstate @@ -633,7 +633,7 @@ UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF gUnknown_81BB8DB:: @ 81BB8DB UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80A0334 waitstate compare VAR_RESULT, 0 @@ -646,7 +646,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB gUnknown_81BB8F8:: @ 81BB8F8 UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80A0334 waitstate compare VAR_RESULT, 0 @@ -659,7 +659,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 gUnknown_81BB915:: @ 81BB915 UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80A0334 waitstate compare VAR_RESULT, 0 @@ -672,7 +672,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 gUnknown_81BB932:: @ 81BB932 UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80A0334 waitstate compare VAR_RESULT, 0 @@ -723,7 +723,7 @@ UnknownMap_00_02_EventScript_1BB980:: @ 81BB980 gUnknown_81BB981:: @ 81BB981 textcolor 3 msgbox Text_LookedAtPlayersTrainerCard - fadescreen 1 + fadescreen FADE_TO_BLACK special sp02A_crash_sound waitstate end @@ -731,7 +731,7 @@ gUnknown_81BB981:: @ 81BB981 gUnknown_81BB992:: @ 81BB992 textcolor 3 msgbox Text_LookedAtPlayersTrainerCardColored - fadescreen 1 + fadescreen FADE_TO_BLACK special sp02A_crash_sound waitstate end @@ -796,7 +796,7 @@ EventScript_1BBA04:: @ 81BBA04 goto_if_eq EventScript_1BB867 copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1BBB60 message Text_1BD65B waitmessage @@ -915,7 +915,7 @@ EventScript_1BBB9C:: @ 81BBB9C compare VAR_RESULT, 1 goto_if_eq EventScript_1BB867 specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1BB44A message Text_1BD28D waitmessage @@ -1191,10 +1191,10 @@ gUnknown_81BBFD8:: @ 81BBFD8 lockall goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB881 specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1BC016 special HelpSystem_Disable - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_814F1D4 waitstate msgbox gUnknown_81BCA43 @@ -1295,7 +1295,7 @@ EventScript_1BC0CE:: @ 81BC0CE message Text_1BCF69 waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1BC29C delay 60 special HelpSystem_Disable diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index c089472cb..e96f52e20 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -20,7 +20,7 @@ EventScript_1BF3DD:: @ 81BF3DD compare VAR_RESULT, 1 goto_if_eq EventScript_1BF452 msgbox Text_19DDBE - fadescreen 1 + fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChooseSendDaycareMon waitstate diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 0552b6bb3..9b3c86d8f 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -402,9 +402,9 @@ EventScript_1C4D4F:: @ 81C4D4F EventScript_1C4D59:: @ 81C4D59 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_1C4D72 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_1C4D7B release end @@ -477,11 +477,11 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC goto_if_eq EventScript_1C4F1C msgbox Text_1A4814 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK goto EventScript_1C4EDA EventScript_1C4E8F:: @ 81C4E8F - fadescreen 0 + fadescreen FADE_FROM_BLACK goto EventScript_1C4EAB end diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index 8aac0bcb4..75f0e4707 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -113,7 +113,7 @@ EventScript_1A90DA:: @ 81A90DA compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 - fadescreen 1 + fadescreen FADE_TO_BLACK special ScrSpecial_SeagallopFerry waitstate end diff --git a/data/scripts/static_pokemon.inc b/data/scripts/static_pokemon.inc index ef57cf36d..9b738ea19 100644 --- a/data/scripts/static_pokemon.inc +++ b/data/scripts/static_pokemon.inc @@ -1,14 +1,14 @@ EventScript_1A922D:: @ 81A922D - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject VAR_LAST_TALKED - fadescreen 0 + fadescreen FADE_FROM_BLACK release end EventScript_1A9236:: @ 81A9236 - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject VAR_LAST_TALKED - fadescreen 0 + fadescreen FADE_FROM_BLACK getspeciesname 0, VAR_0x8004 msgbox Text_1A63C4 release diff --git a/include/constants/field_weather.h b/include/constants/field_weather.h new file mode 100644 index 000000000..e84dbc48c --- /dev/null +++ b/include/constants/field_weather.h @@ -0,0 +1,24 @@ +#ifndef GUARD_CONSTANTS_FIELD_WEATHER_H +#define GUARD_CONSTANTS_FIELD_WEATHER_H + +#define MAX_RAIN_SPRITES 24 +#define NUM_CLOUD_SPRITES 3 +#define NUM_FOG_HORIZONTAL_SPRITES 20 +#define NUM_ASH_SPRITES 20 +#define NUM_FOG_DIAGONAL_SPRITES 20 +#define NUM_SANDSTORM_SPRITES 20 +#define NUM_SWIRL_SANDSTORM_SPRITES 5 + +// Controls how the weather should be changing the screen palettes. +#define WEATHER_PAL_STATE_CHANGING_WEATHER 0 +#define WEATHER_PAL_STATE_SCREEN_FADING_IN 1 +#define WEATHER_PAL_STATE_SCREEN_FADING_OUT 2 +#define WEATHER_PAL_STATE_IDLE 3 + +// Modes for FadeScreen +#define FADE_FROM_BLACK 0 +#define FADE_TO_BLACK 1 +#define FADE_FROM_WHITE 2 +#define FADE_TO_WHITE 3 + +#endif // GUARD_CONSTANTS_FIELD_WEATHER_H From 91bf7665c623011fb63a7045689ba600b4b1eda7 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 05:01:48 -0500 Subject: [PATCH 14/20] Sync split scripts, more misc splits/doc --- asm/field_control_avatar.s | 8 +- asm/fldeff_cut.s | 4 +- asm/fldeff_flash.s | 4 +- data/event_scripts.s | 247 +------- data/maps/BirthIsland_Exterior/scripts.inc | 4 +- data/maps/CeladonCity/map.json | 2 +- data/maps/CeladonCity/scripts.inc | 4 +- data/maps/CeladonCity/text.inc | 8 +- .../scripts.inc | 4 +- .../CeladonCity_DepartmentStore_3F/map.json | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 2 +- .../CeladonCity_DepartmentStore_4F/text.inc | 8 +- .../scripts.inc | 4 +- .../scripts.inc | 2 +- data/maps/CeruleanCave_B1F/scripts.inc | 4 +- data/maps/CeruleanCity_Mart/scripts.inc | 2 +- data/maps/CinnabarIsland_Mart/scripts.inc | 2 +- .../text.inc | 8 +- .../map.json | 2 +- .../scripts.inc | 4 +- data/maps/FourIsland_House1/map.json | 2 +- data/maps/FourIsland_Mart/scripts.inc | 2 +- .../maps/FourIsland_PokemonCenter_1F/text.inc | 8 +- data/maps/FuchsiaCity/map.json | 2 +- data/maps/FuchsiaCity/text.inc | 8 +- data/maps/FuchsiaCity_Mart/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/LavenderTown_Mart/scripts.inc | 2 +- data/maps/MtEmber_Exterior/map.json | 2 +- data/maps/MtEmber_Exterior/text.inc | 8 +- data/maps/MtEmber_Summit/scripts.inc | 4 +- data/maps/NavelRock_Base/scripts.inc | 4 +- data/maps/NavelRock_Summit/scripts.inc | 4 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 4 +- data/maps/PewterCity/text.inc | 8 +- data/maps/PewterCity_Mart/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/map.json | 2 +- data/maps/PewterCity_Museum_2F/text.inc | 8 +- .../maps/PewterCity_PokemonCenter_1F/map.json | 2 +- data/maps/PowerPlant/scripts.inc | 8 +- data/maps/RockTunnel_B1F/map.json | 2 +- data/maps/RocketHideout_Elevator/scripts.inc | 2 +- data/maps/Route12/scripts.inc | 2 +- data/maps/Route12/text.inc | 4 +- data/maps/Route16/scripts.inc | 2 +- data/maps/Route4/map.json | 4 +- data/maps/Route5/text.inc | 16 +- data/maps/SaffronCity_House1_2F/scripts.inc | 2 +- data/maps/SaffronCity_House1_2F/text.inc | 10 +- data/maps/SaffronCity_Mart/scripts.inc | 2 +- data/maps/SeafoamIslands_B4F/scripts.inc | 4 +- data/maps/SeafoamIslands_B4F/text.inc | 8 +- data/maps/SevenIsland/map.json | 2 +- data/maps/SevenIsland/text.inc | 8 +- data/maps/SevenIsland_House_Room1/scripts.inc | 2 +- data/maps/SevenIsland_Mart/scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/SilphCo_2F/map.json | 2 +- data/maps/SilphCo_2F/scripts.inc | 4 +- data/maps/SilphCo_2F/text.inc | 8 +- data/maps/SilphCo_Elevator/scripts.inc | 2 +- data/maps/SixIsland_Mart/scripts.inc | 2 +- data/maps/SixIsland_WaterPath_House1/text.inc | 18 +- data/maps/ThreeIsland_Mart/scripts.inc | 2 +- data/maps/TwoIsland/scripts.inc | 8 +- data/maps/TwoIsland_CapeBrink_House/map.json | 2 +- data/maps/VermilionCity_Mart/scripts.inc | 2 +- data/maps/VictoryRoad_2F/map.json | 2 +- data/maps/VictoryRoad_3F/text.inc | 8 +- data/maps/ViridianCity/map.json | 2 +- data/maps/ViridianCity/scripts.inc | 4 +- data/maps/ViridianCity_Mart/scripts.inc | 2 +- data/scripts/cable_club.inc | 14 +- data/scripts/field_moves.inc | 190 +++--- data/scripts/flash.inc | 2 +- data/scripts/hole.inc | 19 +- data/scripts/move_tutors.inc | 597 +++++++++--------- data/scripts/mystery_event_club.inc | 134 ++-- data/scripts/pc.inc | 24 +- data/scripts/pkmn_center_nurse.inc | 6 +- data/scripts/pokedex_rating.inc | 76 +-- data/scripts/pokemon_mansion.inc | 207 ++++++ data/scripts/repel.inc | 4 +- data/scripts/static_pokemon.inc | 12 +- data/scripts/std_msgbox.inc | 14 +- data/scripts/surf.inc | 6 +- data/text/poke_mart.inc | 8 +- data/text/pokedex_rating.inc | 12 +- data/text/save.inc | 2 +- data/text/surf.inc | 4 +- include/constants/flags.h | 2 +- include/constants/vars.h | 4 +- src/event_data.c | 2 +- src/field_tasks.c | 2 +- 96 files changed, 955 insertions(+), 943 deletions(-) create mode 100644 data/scripts/pokemon_mansion.inc diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index a2f09c15a..4dd8854d7 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1620,10 +1620,10 @@ sub_806D548: @ 806D548 lsrs r0, 24 cmp r0, 0x1 bne _0806D570 - ldr r0, _0806D56C @ =gUnknown_81A6B0D + ldr r0, _0806D56C @ =EventScript_CurrentTooFast b _0806D5E2 .align 2, 0 -_0806D56C: .4byte gUnknown_81A6B0D +_0806D56C: .4byte EventScript_CurrentTooFast _0806D570: ldr r0, _0806D59C @ =0x00000824 bl FlagGet @@ -1664,11 +1664,11 @@ _0806D5A4: lsrs r0, 24 cmp r0, 0x1 bne _0806D5D8 - ldr r0, _0806D5D4 @ =gUnknown_81BE2B7 + ldr r0, _0806D5D4 @ =EventScript_InteractWithWaterfall b _0806D5E2 .align 2, 0 _0806D5D0: .4byte 0x00000826 -_0806D5D4: .4byte gUnknown_81BE2B7 +_0806D5D4: .4byte EventScript_InteractWithWaterfall _0806D5D8: ldr r0, _0806D5DC @ =EventScript_81BE2FF b _0806D5E2 diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index d56ccd500..c0266194e 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -189,13 +189,13 @@ sub_80979D0: @ 80979D0 lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, _080979EC @ =gUnknown_81BDF6B + ldr r0, _080979EC @ =EventScript_FldEffCut bl ScriptContext1_SetupScript pop {r0} bx r0 .align 2, 0 _080979E8: .4byte gFieldEffectArguments -_080979EC: .4byte gUnknown_81BDF6B +_080979EC: .4byte EventScript_FldEffCut thumb_func_end sub_80979D0 thumb_func_start sub_80979F0 diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 23f86d6b7..f550d2291 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -76,13 +76,13 @@ sub_80C9BB0: @ 80C9BB0 bl PlaySE ldr r0, _080C9BC8 @ =0x00000806 bl FlagSet - ldr r0, _080C9BCC @ =EventScript_81BFB5F + ldr r0, _080C9BCC @ =EventScript_FldEffFlash bl ScriptContext1_SetupScript pop {r0} bx r0 .align 2, 0 _080C9BC8: .4byte 0x00000806 -_080C9BCC: .4byte EventScript_81BFB5F +_080C9BCC: .4byte EventScript_FldEffFlash thumb_func_end sub_80C9BB0 thumb_func_start sub_80C9BD0 diff --git a/data/event_scripts.s b/data/event_scripts.s index ebc32f1ab..4bf0b0598 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -825,14 +825,16 @@ Text_1A5160:: @ 81A5160 .string "Welcome to the POKéMON CABLE CLUB\n" .string "TIME CAPSULE.$" -gUnknown_81A5190:: @ 81A5190 +Text_PleaseComeAgain:: @ 81A5190 .string "Please come again!$" -Text_1A51A3:: @ 81A51A3 +@ Unused +Text_HavingDiscountSaleToday:: @ 81A51A3 .string "Welcome!\p" .string "We're having a discount sale today!$" -Text_1A51D0:: @ 81A51D0 +@ Unused +Text_PlayerWhatCanIDoForYou:: @ 81A51D0 .string "{PLAYER}{KUN}, welcome!\p" .string "What can I do for you?$" @@ -841,10 +843,10 @@ Text_1A51D0:: @ 81A51D0 Text_1A5351:: @ 81A5351 .string "じゅんびちゅうです！$" -Text_1A535C:: @ 81A535C +Text_WantWhichFloor:: @ 81A535C .string "Which floor do you want?$" -Text_1A5375:: @ 81A5375 +Text_BagItemCanBeRegistered:: @ 81A5375 .string "An item in the BAG can be\n" .string "registered to SELECT for easy use.$" @@ -1091,7 +1093,7 @@ Text_1A61E5:: @ 81A61E5 .include "data/text/poke_mart.inc" -Text_1A63C4:: @ 81A63C4 +Text_MonFlewAway:: @ 81A63C4 .string "The {STR_VAR_1} flew away!$" Text_1A63D6:: @ 81A63D6 @@ -1113,7 +1115,7 @@ Text_1A641B:: @ 81A641B Text_1A6448:: @ 81A6448 .string "Gyaoo!$" -Text_1A644F:: @ 81A644F +Text_MoveCanOnlyBeLearnedOnce:: @ 81A644F .string "This move can be learned only\n" .string "once. Is that okay?$" @@ -1172,29 +1174,29 @@ EventScript_ResetAllMapFlags:: @ 81A6481 EventScript_1A651A:: @ 81A651A clearflag FLAG_HIDE_POSTGAME_GOSSIPERS - call EventScript_1A6551 + call EventScript_ResetEliteFour special sub_81130A8 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE call_if_eq EventScript_1A653B - call EventScript_1A6541 + call EventScript_ResetLegendaries return EventScript_1A653B:: @ 81A653B setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 2 return -EventScript_1A6541:: @ 81A6541 +EventScript_ResetLegendaries:: @ 81A6541 clearflag FLAG_LUGIA_FLEW_AWAY clearflag FLAG_HO_OH_FLEW_AWAY clearflag FLAG_DEOXYS_FLEW_AWAY return gUnknown_81A654B:: @ 81A654B - call EventScript_1A6551 + call EventScript_ResetEliteFour end -EventScript_1A6551:: @ 81A6551 +EventScript_ResetEliteFour:: @ 81A6551 clearflag FLAG_DEFEATED_LORELEI clearflag FLAG_DEFEATED_BRUNO clearflag FLAG_DEFEATED_AGATHA @@ -1213,6 +1215,7 @@ EventScript_1A6551:: @ 81A6551 .include "data/scripts/obtain_item.inc" .include "data/scripts/pc.inc" +@ DoEasyChatScreen? EventScript_1A6AC0:: @ 81A6AC0 fadescreen FADE_TO_BLACK special sub_80FEE44 @@ -1527,12 +1530,12 @@ EventScript_1A774D:: @ 81A774D waitmovement 0 applymovement VAR_0x8008, Movement_Delay48 waitmovement 0 - msgbox Text_1A62D3 + msgbox Text_YouKnowThoseWords setflag FLAG_SYS_MYSTERY_GIFT_ENABLED textcolor 3 special sub_80699BC signmsg - msgbox Text_1A6359 + msgbox Text_YouCanAccessMysteryGift normalmsg releaseall end @@ -1544,12 +1547,12 @@ EventScript_1A778A:: @ 81A778A EventScript_1A778C:: @ 81A778C applymovement VAR_0x8008, Movement_FaceDown waitmovement 0 - msgbox Text_1A6265 + msgbox Text_QuestionnaireThankYou releaseall end gUnknown_81A77A0:: @ 81A77A0 - msgbox Text_1A5375, MSGBOX_SIGN + msgbox Text_BagItemCanBeRegistered, MSGBOX_SIGN end EventScript_1A77A9:: @ 81A77A9 @@ -1608,213 +1611,7 @@ EventScript_1A7AE0:: @ 81A7AE0 release end -EventScript_1A7AE2:: @ 81A7AE2 - msgbox Text_177460, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq EventScript_1A7B70 - msgbox Text_17747B - goto_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B3B - setflag FLAG_POKEMON_MANSION_SWITCH_STATE - switch VAR_0x8004 - case 0, EventScript_1A7B7A - case 1, EventScript_1A7D3E - case 2, EventScript_1A7E72 - case 3, EventScript_1A7F4C - end - -EventScript_1A7B3B:: @ 81A7B3B - clearflag FLAG_POKEMON_MANSION_SWITCH_STATE - switch VAR_0x8004 - case 0, EventScript_1A7C5C - case 1, EventScript_1A7DD8 - case 2, EventScript_1A7EDF - case 3, EventScript_1A8025 - end - -EventScript_1A7B70:: @ 81A7B70 - msgbox Text_177489 - releaseall - end - -EventScript_1A7B7A:: @ 81A7B7A - setmetatile 22, 10, 645, 0 - setmetatile 23, 10, 644, 0 - setmetatile 24, 10, 644, 0 - setmetatile 22, 11, 645, 0 - setmetatile 23, 11, 644, 0 - setmetatile 24, 11, 644, 0 - setmetatile 27, 25, 645, 0 - setmetatile 28, 25, 644, 0 - setmetatile 29, 25, 644, 0 - setmetatile 27, 26, 645, 0 - setmetatile 28, 26, 644, 0 - setmetatile 29, 26, 644, 0 - setmetatile 32, 25, 645, 0 - setmetatile 33, 25, 644, 0 - setmetatile 34, 25, 644, 0 - setmetatile 32, 26, 645, 0 - setmetatile 33, 26, 644, 0 - setmetatile 34, 26, 644, 0 - setmetatile 31, 18, 760, 1 - setmetatile 32, 18, 761, 1 - setmetatile 33, 18, 762, 1 - setmetatile 31, 19, 768, 1 - setmetatile 32, 19, 769, 1 - setmetatile 33, 19, 770, 1 - setmetatile 5, 4, 845, 0 - return - -EventScript_1A7C5C:: @ 81A7C5C - setmetatile 22, 10, 760, 1 - setmetatile 23, 10, 761, 1 - setmetatile 24, 10, 762, 1 - setmetatile 22, 11, 768, 1 - setmetatile 23, 11, 769, 1 - setmetatile 24, 11, 770, 1 - setmetatile 27, 25, 760, 1 - setmetatile 28, 25, 761, 1 - setmetatile 29, 25, 762, 1 - setmetatile 27, 26, 768, 1 - setmetatile 28, 26, 769, 1 - setmetatile 29, 26, 770, 1 - setmetatile 32, 25, 760, 1 - setmetatile 33, 25, 761, 1 - setmetatile 34, 25, 762, 1 - setmetatile 32, 26, 768, 1 - setmetatile 33, 26, 769, 1 - setmetatile 34, 26, 770, 1 - setmetatile 31, 18, 645, 0 - setmetatile 32, 18, 644, 0 - setmetatile 33, 18, 644, 0 - setmetatile 31, 19, 645, 0 - setmetatile 32, 19, 644, 0 - setmetatile 33, 19, 644, 0 - setmetatile 5, 4, 788, 0 - return - -EventScript_1A7D3E:: @ 81A7D3E - setmetatile 24, 14, 645, 0 - setmetatile 25, 14, 644, 0 - setmetatile 26, 14, 644, 0 - setmetatile 24, 15, 645, 0 - setmetatile 25, 15, 644, 0 - setmetatile 26, 15, 644, 0 - setmetatile 10, 28, 677, 1 - setmetatile 10, 29, 685, 1 - setmetatile 10, 30, 645, 0 - setmetatile 10, 31, 644, 0 - setmetatile 10, 32, 693, 0 - setmetatile 12, 4, 848, 1 - setmetatile 12, 5, 856, 1 - setmetatile 12, 6, 864, 1 - setmetatile 12, 7, 872, 1 - setmetatile 12, 8, 880, 1 - setmetatile 2, 15, 845, 0 - return - -EventScript_1A7DD8:: @ 81A7DD8 - setmetatile 24, 14, 760, 1 - setmetatile 25, 14, 761, 1 - setmetatile 26, 14, 762, 1 - setmetatile 24, 15, 768, 1 - setmetatile 25, 15, 769, 1 - setmetatile 26, 15, 770, 1 - setmetatile 10, 28, 848, 1 - setmetatile 10, 29, 856, 1 - setmetatile 10, 30, 864, 1 - setmetatile 10, 31, 872, 1 - setmetatile 10, 32, 880, 1 - setmetatile 12, 4, 677, 1 - setmetatile 12, 5, 685, 1 - setmetatile 12, 6, 645, 0 - setmetatile 12, 7, 644, 0 - setmetatile 12, 8, 693, 0 - setmetatile 2, 15, 788, 0 - return - -EventScript_1A7E72:: @ 81A7E72 - setmetatile 17, 11, 645, 0 - setmetatile 18, 11, 644, 0 - setmetatile 19, 11, 644, 0 - setmetatile 17, 12, 645, 0 - setmetatile 18, 12, 644, 0 - setmetatile 19, 12, 644, 0 - setmetatile 21, 4, 848, 1 - setmetatile 21, 5, 856, 1 - setmetatile 21, 6, 864, 1 - setmetatile 21, 7, 872, 1 - setmetatile 21, 8, 880, 1 - setmetatile 12, 4, 845, 0 - return - -EventScript_1A7EDF:: @ 81A7EDF - setmetatile 17, 11, 760, 1 - setmetatile 18, 11, 761, 1 - setmetatile 19, 11, 762, 1 - setmetatile 17, 12, 768, 1 - setmetatile 18, 12, 769, 1 - setmetatile 19, 12, 770, 1 - setmetatile 21, 4, 677, 1 - setmetatile 21, 5, 685, 1 - setmetatile 21, 6, 645, 0 - setmetatile 21, 7, 644, 0 - setmetatile 21, 8, 693, 0 - setmetatile 12, 4, 788, 0 - return - -EventScript_1A7F4C:: @ 81A7F4C - setmetatile 33, 20, 760, 1 - setmetatile 34, 20, 761, 1 - setmetatile 35, 20, 762, 1 - setmetatile 33, 21, 852, 1 - setmetatile 34, 21, 853, 1 - setmetatile 35, 21, 854, 1 - setmetatile 16, 26, 848, 1 - setmetatile 16, 27, 856, 1 - setmetatile 16, 28, 866, 1 - setmetatile 16, 29, 874, 1 - setmetatile 16, 30, 882, 1 - setmetatile 12, 8, 677, 1 - setmetatile 12, 9, 685, 1 - setmetatile 12, 10, 647, 0 - setmetatile 12, 11, 646, 0 - setmetatile 12, 12, 688, 0 - setmetatile 20, 22, 647, 0 - setmetatile 21, 22, 646, 0 - setmetatile 22, 22, 646, 0 - setmetatile 20, 23, 647, 0 - setmetatile 21, 23, 646, 0 - setmetatile 22, 23, 646, 0 - setmetatile 24, 28, 847, 0 - setmetatile 27, 4, 847, 0 - return - -EventScript_1A8025:: @ 81A8025 - setmetatile 33, 20, 647, 0 - setmetatile 34, 20, 646, 0 - setmetatile 35, 20, 646, 0 - setmetatile 33, 21, 647, 0 - setmetatile 34, 21, 646, 0 - setmetatile 35, 21, 646, 0 - setmetatile 16, 26, 677, 1 - setmetatile 16, 27, 685, 1 - setmetatile 16, 28, 647, 0 - setmetatile 16, 29, 646, 0 - setmetatile 16, 30, 688, 0 - setmetatile 12, 8, 848, 1 - setmetatile 12, 9, 856, 1 - setmetatile 12, 10, 866, 1 - setmetatile 12, 11, 874, 1 - setmetatile 12, 12, 882, 1 - setmetatile 20, 22, 760, 1 - setmetatile 21, 22, 761, 1 - setmetatile 22, 22, 762, 1 - setmetatile 20, 23, 852, 1 - setmetatile 21, 23, 853, 1 - setmetatile 22, 23, 854, 1 - setmetatile 24, 28, 790, 0 - setmetatile 27, 4, 790, 0 - return + .include "data/scripts/pokemon_mansion.inc" EventScript_1A80FE:: @ 81A80FE lockall @@ -2041,7 +1838,7 @@ EventScript_AfterWhiteOutHeal:: @ 81A8D97 call EventScript_PkmnCenterNurse_TakeAndHealPkmn call_if_unset FLAG_DEFEATED_BROCK, EventScript_1A8DC6 call_if_set FLAG_DEFEATED_BROCK, EventScript_1A8DCF - applymovement VAR_LAST_TALKED, Movement_1A666C + applymovement VAR_LAST_TALKED, Movement_Bow waitmovement 0 fadedefaultbgm releaseall diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 8d12c5458..f0843ae01 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -105,12 +105,12 @@ EventScript_1652C0:: @ 81652C0 EventScript_16533A:: @ 816533A setflag FLAG_DEOXYS_FLEW_AWAY setvar VAR_0x8004, SPECIES_DEOXYS - goto EventScript_1A9236 + goto EventScript_MonFlewAway end EventScript_165348:: @ 8165348 setvar VAR_0x8004, SPECIES_DEOXYS - goto EventScript_1A9236 + goto EventScript_MonFlewAway end Movement_165353:: @ 8165353 diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index d60b4da02..75f6760d1 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CBF", + "script": "CeladonCity_EventScript_SoftboiledTutor", "flag": "0" }, { diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index 225feeff6..b27d12178 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -24,8 +24,8 @@ CeladonCity_EventScript_166CB6:: @ 8166CB6 msgbox gUnknown_817FFC5, MSGBOX_NPC end -CeladonCity_EventScript_166CBF:: @ 8166CBF - goto EventScript_1C4A86 +CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF + goto EventScript_SoftboiledTutor end CeladonCity_EventScript_166CC5:: @ 8166CC5 diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc index f10516c9d..40f489e3c 100644 --- a/data/maps/CeladonCity/text.inc +++ b/data/maps/CeladonCity/text.inc @@ -83,7 +83,7 @@ gUnknown_8180300:: @ 8180300 .string "But it was boiling hot!\n" .string "Gotta cool it to drink it.$" -Text_180388:: @ 8180388 +Text_SoftboiledTeach:: @ 8180388 .string "Hello, there!\p" .string "I've seen you about, but I never\n" .string "had a chance to chat.\p" @@ -92,16 +92,16 @@ Text_180388:: @ 8180388 .string "I'd like to celebrate by teaching\n" .string "you the move SOFTBOILED.$" -Text_18043F:: @ 818043F +Text_SoftboiledDeclined:: @ 818043F .string "I'll always be keeping an eye out\n" .string "for you.\p" .string "I hope we can chat again.$" -Text_180484:: @ 8180484 +Text_SoftboiledWhichMon:: @ 8180484 .string "So, who's the POKéMON that gets\n" .string "the chance to learn SOFTBOILED?$" -Text_1804C4:: @ 81804C4 +Text_SoftboiledTaught:: @ 81804C4 .string "I wish you the best of luck!$" gUnknown_81804E1:: @ 81804E1 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index b9c3b056e..3289f08b3 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -22,7 +22,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 message Text_MayIHelpYou waitmessage pokemart Items_16BB38 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -50,7 +50,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E message Text_MayIHelpYou waitmessage pokemart Items_16BB74 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index c1cc95ac4..9288edf21 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB85", + "script": "CeladonCity_DepartmentStore_3F_EventScript_CounterTutor", "flag": "0" }, { diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index 46b2ebf4e..f4faca037 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -1,8 +1,8 @@ CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84 .byte 0 -CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85 - goto EventScript_1C4C26 +CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85 + goto EventScript_CounterTutor end CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 6844069bf..233bfefc9 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -22,7 +22,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A message Text_MayIHelpYou waitmessage pokemart Items_16BC30 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc index efe6c5835..426cc2c82 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc @@ -1,4 +1,4 @@ -Text_195928:: @ 8195928 +Text_CounterTeach:: @ 8195928 .string "Oh, hi!\n" .string "I finally finished POKéMON.\p" .string "Not done yet? How about I teach\n" @@ -8,15 +8,15 @@ Text_195928:: @ 8195928 .string "Not like the one I'm leaning on,\n" .string "mind you!$" -Text_1959CC:: @ 81959CC +Text_CounterDeclined:: @ 81959CC .string "You're not interested? Come see\n" .string "me if you change your mind.$" -Text_195A08:: @ 8195A08 +Text_CounterWhichMon:: @ 8195A08 .string "Which POKéMON should I teach\n" .string "COUNTER to?$" -Text_195A31:: @ 8195A31 +Text_CounterTaught:: @ 8195A31 .string "Are you using that COUNTER move\n" .string "I taught your POKéMON?$" diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 71a190c86..5163273c5 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -22,7 +22,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C message Text_MayIHelpYou waitmessage pokemart Items_16BC84 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -48,7 +48,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 message Text_MayIHelpYou waitmessage pokemart Items_16BCBC - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 8a3d77577..14198db2f 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -7,7 +7,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow - message Text_1A535C + message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 3 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index b252bf306..e896c8372 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -55,14 +55,14 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 EventScript_162558:: @ 8162558 setflag FLAG_FOUGHT_MEWTWO - goto EventScript_1A922D + goto EventScript_RemoveStaticMon EventScript_162560:: @ 8162560 end EventScript_162561:: @ 8162561 setvar VAR_0x8004, SPECIES_MEWTWO - goto EventScript_1A9236 + goto EventScript_MonFlewAway EventScript_16256B:: @ 816256B end diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index 4008c5dd2..d6d132e79 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -18,7 +18,7 @@ CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 message Text_MayIHelpYou waitmessage pokemart Items_16ACD8 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index 7893e41bc..5d512a32b 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -18,7 +18,7 @@ CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 message Text_MayIHelpYou waitmessage pokemart Items_16EA48 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc index dda99e8ea..6b36fd1a3 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc @@ -1,4 +1,4 @@ -Text_19A137:: @ 819A137 +Text_MetronomeTeach:: @ 819A137 .string "Tch-tch-tch!\n" .string "I'll teach you a nifty move.\p" .string "Teach it to a POKéMON, and watch\n" @@ -6,14 +6,14 @@ Text_19A137:: @ 819A137 .string "It's a move called METRONOME.\n" .string "Does it strike your fancy?$" -Text_19A1CB:: @ 819A1CB +Text_MetronomeDeclined:: @ 819A1CB .string "I tell you, it's a lot of fun!$" -Text_19A1EA:: @ 819A1EA +Text_MetronomeWhichMon:: @ 819A1EA .string "Okay!\n" .string "Which POKéMON should I teach?$" -Text_19A20E:: @ 819A20E +Text_MetronomeTaught:: @ 819A20E .string "Tch-tch-tch!\n" .string "That's the sound of a METRONOME.\p" .string "It tweaks your POKéMON's brain into\n" diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 093cf61c7..c8c7f0414 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF", + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor", "flag": "0" }, { diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc index dd38a85b5..3dcd07733 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc @@ -1,8 +1,8 @@ CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE .byte 0 -CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF - goto EventScript_1C4C8E +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: @ 816E3DF + goto EventScript_MetronomeTutor end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5 diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 0fd639d54..8320de554 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_House1_EventScript_1C4D84", + "script": "FourIsland_House1_EventScript_BodySlamTutor", "flag": "0" }, { diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 9918fb307..0d0d1c6df 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -10,7 +10,7 @@ FourIsland_Mart_EventScript_171CAE:: @ 8171CAE message Text_MayIHelpYou waitmessage pokemart Items_171CD4 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc index 59beaf443..954aabd96 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/text.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -Text_1A3505:: @ 81A3505 +Text_BodySlamTeach:: @ 81A3505 .string "Ready?\n" .string "Boing!\p" .string "We're having a BODY SLAM match\n" @@ -8,15 +8,15 @@ Text_1A3505:: @ 81A3505 .string "How about I teach BODY SLAM to\n" .string "a POKéMON of yours instead?$" -Text_1A35C7:: @ 81A35C7 +Text_BodySlamDeclined:: @ 81A35C7 .string "Come again!\n" .string "Boing!$" -Text_1A35DA:: @ 81A35DA +Text_BodySlamWhichMon:: @ 81A35DA .string "Which POKéMON wants to learn how\n" .string "to BODY SLAM?$" -Text_1A3609:: @ 81A3609 +Text_BodySlamTaught:: @ 81A3609 .string "Boioing!$" Text_1A3612:: @ 81A3612 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 6c4b76320..35a26edc6 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -221,7 +221,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1C4AEE", + "script": "FuchsiaCity_EventScript_SubstituteTutor", "flag": "0" }, { diff --git a/data/maps/FuchsiaCity/text.inc b/data/maps/FuchsiaCity/text.inc index 2916a29cf..969846706 100644 --- a/data/maps/FuchsiaCity/text.inc +++ b/data/maps/FuchsiaCity/text.inc @@ -79,7 +79,7 @@ gUnknown_81808FA:: @ 81808FA Text_180945:: @ 8180945 .string "……$" -Text_180948:: @ 8180948 +Text_SubstituteTeach:: @ 8180948 .string "Aww, I wish I was a KANGASKHAN\n" .string "baby.\p" .string "I'd love to be a substitute for the\n" @@ -91,15 +91,15 @@ Text_180948:: @ 8180948 .string "Want me to teach SUBSTITUTE to\n" .string "one of your POKéMON?$" -Text_180A32:: @ 8180A32 +Text_SubstituteDeclined:: @ 8180A32 .string "Oh, really?\n" .string "SUBSTITUTE seems so fun…$" -Text_180A57:: @ 8180A57 +Text_SubstituteWhichMon:: @ 8180A57 .string "Which POKéMON wants to learn\n" .string "SUBSTITUTE?$" -Text_180A80:: @ 8180A80 +Text_SubstituteTaught:: @ 8180A80 .string "Boy, what I'd give to crawl inside\n" .string "a KANGASKHAN belly pouch…$" diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index 67fceb572..7d2df7e8f 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -18,7 +18,7 @@ FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 message Text_MayIHelpYou waitmessage pokemart Items_16D518 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 16eb449ae..1ba5b7380 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -49,7 +49,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC message Text_MayIHelpYou waitmessage pokemart Items_16EAF4 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index a0352ca88..1007b34cf 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -22,7 +22,7 @@ LavenderTown_Mart_EventScript_16B36B:: @ 816B36B message Text_MayIHelpYou waitmessage pokemart Items_16B390 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 45fcd4703..29d5f1af8 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1C48E6", + "script": "MtEmber_Exterior_EventScript_ExplosionTutor", "flag": "0" }, { diff --git a/data/maps/MtEmber_Exterior/text.inc b/data/maps/MtEmber_Exterior/text.inc index d9a365f95..a3099147c 100644 --- a/data/maps/MtEmber_Exterior/text.inc +++ b/data/maps/MtEmber_Exterior/text.inc @@ -1,4 +1,4 @@ -Text_17A642:: @ 817A642 +Text_ExplosionTeach:: @ 817A642 .string "Can you imagine?\n" .string "If this volcano were to erupt?\p" .string "The explosion would be the end of\n" @@ -6,16 +6,16 @@ Text_17A642:: @ 817A642 .string "While we're terrified, would you\n" .string "like me to teach EXPLOSION?$" -Text_17A6ED:: @ 817A6ED +Text_ExplosionDeclined:: @ 817A6ED .string "Yeah, you're right.\n" .string "It is too terrifying.$" -Text_17A717:: @ 817A717 +Text_ExplosionWhichMon:: @ 817A717 .string "You're terribly brave!\p" .string "Which POKéMON should I teach\n" .string "EXPLOSION?$" -Text_17A756:: @ 817A756 +Text_ExplosionTaught:: @ 817A756 .string "Using EXPLOSION while on this\n" .string "volcano…\p" .string "What a terrifying thrill!$" diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 45d2f76e0..7614cfd9a 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -55,10 +55,10 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 EventScript_163B96:: @ 8163B96 setflag FLAG_FOUGHT_MOLTRES - goto EventScript_1A922D + goto EventScript_RemoveStaticMon end EventScript_163B9F:: @ 8163B9F setvar VAR_0x8004, SPECIES_MOLTRES - goto EventScript_1A9236 + goto EventScript_MonFlewAway end diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index a013d6707..c7fcd191a 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -78,10 +78,10 @@ NavelRock_Base_EventScript_165134:: @ 8165134 EventScript_1651D9:: @ 81651D9 setflag FLAG_LUGIA_FLEW_AWAY setvar VAR_0x8004, SPECIES_LUGIA - goto EventScript_1A9236 + goto EventScript_MonFlewAway end EventScript_1651E7:: @ 81651E7 setvar VAR_0x8004, SPECIES_LUGIA - goto EventScript_1A9236 + goto EventScript_MonFlewAway end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 0f6f7ec04..7cbeb764f 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -83,12 +83,12 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB EventScript_1650B4:: @ 81650B4 setflag FLAG_HO_OH_FLEW_AWAY setvar VAR_0x8004, SPECIES_HO_OH - goto EventScript_1A9236 + goto EventScript_MonFlewAway end EventScript_1650C2:: @ 81650C2 setvar VAR_0x8004, SPECIES_HO_OH - goto EventScript_1A9236 + goto EventScript_MonFlewAway end Movement_1650CD:: @ 81650CD diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 0e3577c3b..261b16c1c 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -841,7 +841,7 @@ EventScript_1698D6:: @ 81698D6 end EventScript_169903:: @ 8169903 - call EventScript_1A737B + call ProfOak_EventScript_RatePokedexInPerson goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913 release end @@ -963,7 +963,7 @@ Movement_1699C5: step_end EventScript_1699CE:: @ 81699CE - call EventScript_1A737B + call ProfOak_EventScript_RatePokedexInPerson closemessage compare VAR_0x8009, 60 goto_if_lt EventScript_1699F9 diff --git a/data/maps/PewterCity/text.inc b/data/maps/PewterCity/text.inc index de975f32d..966cbcfe4 100644 --- a/data/maps/PewterCity/text.inc +++ b/data/maps/PewterCity/text.inc @@ -1,4 +1,4 @@ -Text_17E316:: @ 817E316 +Text_DreamEaterTeach:: @ 817E316 .string "Yawn!\n" .string "I must have dozed off in the sun.\p" .string "I had this weird dream about\n" @@ -9,14 +9,14 @@ Text_17E316:: @ 817E316 .string "Let me teach it to a POKéMON so\n" .string "I can forget about it!$" -Text_17E3E9:: @ 817E3E9 +Text_DreamEaterDeclined:: @ 817E3E9 .string "…Snore…$" -Text_17E3F1:: @ 817E3F1 +Text_DreamEaterWhichMon:: @ 817E3F1 .string "Which POKéMON wants to learn\n" .string "DREAM EATER?$" -Text_17E41B:: @ 817E41B +Text_DreamEaterTaught:: @ 817E41B .string "…ZZZ…\n" .string "I…can't eat…anymore…$" diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index d4f0b37c4..e03f14deb 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -18,7 +18,7 @@ PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 message Text_MayIHelpYou waitmessage pokemart Items_16A708 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 76945d8ca..aef59195d 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_1F_EventScript_1C4BBE", + "script": "PewterCity_Museum_1F_EventScript_SeismicTossTutor", "flag": "0" } ], diff --git a/data/maps/PewterCity_Museum_2F/text.inc b/data/maps/PewterCity_Museum_2F/text.inc index b1767c681..2c1cd4d20 100644 --- a/data/maps/PewterCity_Museum_2F/text.inc +++ b/data/maps/PewterCity_Museum_2F/text.inc @@ -1,4 +1,4 @@ -Text_1909A3:: @ 81909A3 +Text_SeismicTossTeach:: @ 81909A3 .string "The secrets of space…\n" .string "The mysteries of earth…\p" .string "There are so many things about\n" @@ -9,15 +9,15 @@ Text_1909A3:: @ 81909A3 .string "Well, how about SEISMIC TOSS?\n" .string "Should I teach that to a POKéMON?$" -Text_190AA9:: @ 8190AA9 +Text_SeismicTossDeclined:: @ 8190AA9 .string "Is that so?\n" .string "I'm sure you'll be back for it.$" -Text_190AD5:: @ 8190AD5 +Text_SeismicTossWhichMon:: @ 8190AD5 .string "Which POKéMON wants to learn\n" .string "SEISMIC TOSS?$" -Text_190B00:: @ 8190B00 +Text_SeismicTossTaught:: @ 8190B00 .string "I hope you won't toss in the towel.\n" .string "Keep it up.$" diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 1a54e269b..683805b3c 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_1F_EventScript_1BEE16", + "script": "MysteryEventClub_EventScript_Man", "flag": "0" }, { diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 1af3e9e76..08a223f1b 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -66,12 +66,12 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 EventScript_16381B:: @ 816381B setflag FLAG_FOUGHT_ZAPDOS - goto EventScript_1A922D + goto EventScript_RemoveStaticMon end EventScript_163824:: @ 8163824 setvar VAR_0x8004, SPECIES_ZAPDOS - goto EventScript_1A9236 + goto EventScript_MonFlewAway end PowerPlant_EventScript_16382F:: @ 816382F @@ -102,7 +102,7 @@ PowerPlant_EventScript_16382F:: @ 816382F EventScript_163884:: @ 8163884 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 - goto EventScript_1A922D + goto EventScript_RemoveStaticMon end PowerPlant_EventScript_16388D:: @ 816388D @@ -133,5 +133,5 @@ PowerPlant_EventScript_16388D:: @ 816388D EventScript_1638E2:: @ 81638E2 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 - goto EventScript_1A922D + goto EventScript_RemoveStaticMon end diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 1dd0f419e..3c1144c42 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1C487E", + "script": "RockTunnel_B1F_EventScript_RockSlideTutor", "flag": "0" }, { diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 05e01e27a..f649e5c40 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -8,7 +8,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow - message Text_1A535C + message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 2 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index fe21ac1d2..80a037a65 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -21,7 +21,7 @@ Route12_EventScript_168014:: @ 8168014 msgbox gUnknown_81853CC, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16808D - call EventScript_1A924B + call EventScript_AwakenSnorlax setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse playmoncry SPECIES_SNORLAX, 2 diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc index bf82fcf59..bd23a00ae 100644 --- a/data/maps/Route12/text.inc +++ b/data/maps/Route12/text.inc @@ -2,7 +2,7 @@ gUnknown_8185317:: @ 8185317 .string "A POKéMON is sprawled out in\n" .string "a deep and comfortable slumber.$" -Text_185354:: @ 8185354 +Text_SnorlaxWokeUp:: @ 8185354 .string "SNORLAX woke up!\p" .string "It attacked in a grumpy rage!$" @@ -14,7 +14,7 @@ gUnknown_8185383:: @ 8185383 gUnknown_81853CC:: @ 81853CC .string "Want to use the POKé FLUTE?$" -Text_1853E8:: @ 81853E8 +Text_PlayedPokeFlute:: @ 81853E8 .string "{PLAYER} played the POKé FLUTE.$" Text_185402:: @ 8185402 diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 135858798..eb866388b 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -40,7 +40,7 @@ Route16_EventScript_168121:: @ 8168121 msgbox gUnknown_81853CC, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_168197 - call EventScript_1A924B + call EventScript_AwakenSnorlax setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse playmoncry SPECIES_SNORLAX, 2 diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index b628beefc..e7392969c 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1C494E", + "script": "Route4_EventScript_MegaPunchTutor", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1C49B6", + "script": "Route4_EventScript_MegaKickTutor", "flag": "0" }, { diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc index 066d8cfa6..0a3e80874 100644 --- a/data/maps/Route5/text.inc +++ b/data/maps/Route5/text.inc @@ -1,4 +1,4 @@ -Text_1839D5:: @ 81839D5 +Text_MegaPunchTeach:: @ 81839D5 .string "A punch of roaring ferocity!\p" .string "Packed with destructive power!\p" .string "When the chips are down,\n" @@ -7,22 +7,22 @@ Text_1839D5:: @ 81839D5 .string "Now!\n" .string "Let me teach it to your POKéMON!$" -Text_183A83:: @ 8183A83 +Text_MegaPunchDeclined:: @ 8183A83 .string "You'll be back when you understand\n" .string "the worth of MEGA PUNCH.$" -Text_183ABF:: @ 8183ABF +Text_MegaPunchWhichMon:: @ 8183ABF .string "Fine!\n" .string "Which POKéMON will learn it?$" -Text_183AE2:: @ 8183AE2 +Text_MegaPunchTaught:: @ 8183AE2 .string "Now, we are comrades in the way of\n" .string "punching!\p" .string "You should go before you're seen\n" .string "by the misguided fool who trains\l" .string "only his silly kicking over there.$" -Text_183B74:: @ 8183B74 +Text_MegaKickTeach:: @ 8183B74 .string "A kick of brutal ferocity!\p" .string "Packed with destructive power!\p" .string "When you get right down to it,\n" @@ -31,15 +31,15 @@ Text_183B74:: @ 8183B74 .string "Okay!\n" .string "I'll teach it to your POKéMON!$" -Text_183C25:: @ 8183C25 +Text_MegaKickDeclined:: @ 8183C25 .string "You'll come crawling back when you\n" .string "realize the value of MEGA KICK.$" -Text_183C68:: @ 8183C68 +Text_MegaKickWhichMon:: @ 8183C68 .string "All right!\n" .string "Which POKéMON wants to learn it?$" -Text_183C94:: @ 8183C94 +Text_MegaKickTaught:: @ 8183C94 .string "Now, we are soul mates in the way\n" .string "of kicking!\p" .string "You should run before you're seen\n" diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 30931a998..f7efeddb1 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -26,7 +26,7 @@ SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B faceplayer checkitem ITEM_POKE_DOLL, 1 compare VAR_RESULT, TRUE - goto_if_eq EventScript_1C4CF6 + goto_if_eq EventScript_MimicTutor checkplayergender compare VAR_RESULT, MALE call_if_eq EventScript_16EBB7 diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_House1_2F/text.inc index d9fc46f7c..32a666e18 100644 --- a/data/maps/SaffronCity_House1_2F/text.inc +++ b/data/maps/SaffronCity_House1_2F/text.inc @@ -18,7 +18,7 @@ gUnknown_819ACF1:: @ 819ACF1 .string "COPYCAT: Hmm? Quit mimicking?\l" .string "But that's my favorite hobby!$" -Text_19AD85:: @ 819AD85 +Text_MimicTeach:: @ 819AD85 .string "Oh wow!\n" .string "A POKé DOLL!\p" .string "For me?\n" @@ -26,14 +26,14 @@ Text_19AD85:: @ 819AD85 .string "You know what?\n" .string "I can teach the move MIMIC.$" -Text_19ADD8:: @ 819ADD8 +Text_MimicDeclined:: @ 819ADD8 .string "Don't you like MIMIC?$" -Text_19ADEE:: @ 819ADEE +Text_MimicWhichMon:: @ 819ADEE .string "I really love MIMIC!\n" .string "Who's going to learn it?$" -Text_19AE1C:: @ 819AE1C +Text_MimicTaughtMale:: @ 819AE1C .string "{PLAYER}: Hi!\n" .string "Thanks for earlier!\p" .string "{PLAYER}: Pardon?\p" @@ -42,7 +42,7 @@ Text_19AE1C:: @ 819AE1C .string "COPYCAT: You bet!\n" .string "It's a scream!$" -Text_19AE90:: @ 819AE90 +Text_MimicTaughtFemale:: @ 819AE90 .string "{PLAYER}: Hi!\n" .string "Thanks for what you did for us.\p" .string "{PLAYER}: Pardon?\p" diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 815ee773b..78452151b 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -18,7 +18,7 @@ SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 message Text_MayIHelpYou waitmessage pokemart Items_16EFDC - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index ed878b0a5..68e45d952 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -185,14 +185,14 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC EventScript_16320F:: @ 816320F setflag FLAG_FOUGHT_ARTICUNO - goto EventScript_1A922D + goto EventScript_RemoveStaticMon EventScript_163217:: @ 8163217 end EventScript_163218:: @ 8163218 setvar VAR_0x8004, SPECIES_ARTICUNO - goto EventScript_1A9236 + goto EventScript_MonFlewAway EventScript_163222:: @ 8163222 end diff --git a/data/maps/SeafoamIslands_B4F/text.inc b/data/maps/SeafoamIslands_B4F/text.inc index b2ef7d7e5..708828c74 100644 --- a/data/maps/SeafoamIslands_B4F/text.inc +++ b/data/maps/SeafoamIslands_B4F/text.inc @@ -1,4 +1,4 @@ -Text_1799E0:: @ 81799E0 +Text_RockSlideTeach:: @ 81799E0 .string "When you're up on a rocky mountain\n" .string "like this, rockslides are a threat.\p" .string "Can you imagine?\n" @@ -8,14 +8,14 @@ Text_1799E0:: @ 81799E0 .string "You don't seem to be scared.\n" .string "Want to try using ROCK SLIDE?$" -Text_179AC0:: @ 8179AC0 +Text_RockSlideDeclined:: @ 8179AC0 .string "Oh, so you are scared after all.$" -Text_179AE1:: @ 8179AE1 +Text_RockSlideWhichMon:: @ 8179AE1 .string "Which POKéMON should I teach\n" .string "ROCK SLIDE?$" -Text_179B0A:: @ 8179B0A +Text_RockSlideTaught:: @ 8179B0A .string "It might be scary to use it in this\n" .string "tunnel…$" diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index d83f81ed4..9f7d5692c 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_EventScript_1C4B56", + "script": "SevenIsland_EventScript_SwordsDanceTutor", "flag": "0" }, { diff --git a/data/maps/SevenIsland/text.inc b/data/maps/SevenIsland/text.inc index 2795443a2..995752422 100644 --- a/data/maps/SevenIsland/text.inc +++ b/data/maps/SevenIsland/text.inc @@ -1,4 +1,4 @@ -Text_182F01:: @ 8182F01 +Text_SwordsDanceTeach:: @ 8182F01 .string "Not many people come out here.\p" .string "If I train here, I'm convinced that\n" .string "I'll get stronger and stronger.\p" @@ -6,14 +6,14 @@ Text_182F01:: @ 8182F01 .string "How would you like to learn a move\n" .string "like that? It's SWORDS DANCE.$" -Text_182FC1:: @ 8182FC1 +Text_SwordsDanceDeclined:: @ 8182FC1 .string "Well, that's fine, too.$" -Text_182FD9:: @ 8182FD9 +Text_SwordsDanceWhichMon:: @ 8182FD9 .string "All right, pick which POKéMON\n" .string "I should teach it to.$" -Text_18300D:: @ 818300D +Text_SwordsDanceTaught:: @ 818300D .string "If only we could keep getting\n" .string "stronger and stronger, eh?$" diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index eb6900223..70a27185a 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -101,7 +101,7 @@ EventScript_170987:: @ 8170987 compare VAR_RESULT, NO goto_if_eq EventScript_170A11 special LoadPlayerParty - call EventScript_1A4EAF + call EventScript_AskSaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_170A11 special SavePlayerParty diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index d2a42ac38..0fc710d8a 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -10,7 +10,7 @@ SevenIsland_Mart_EventScript_170B31:: @ 8170B31 message Text_MayIHelpYou waitmessage pokemart Items_170B58 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index a146b7990..f84c67295 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -9,7 +9,7 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow - message Text_1A535C + message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 6 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 92c4f9576..fb6204f22 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -132,7 +132,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 message Text_MayIHelpYou waitmessage pokemart Items_1649B8 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index d937d283c..4529535b2 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_2F_EventScript_16165A", + "script": "SilphCo_2F_EventScript_ThunderWaveTutor", "flag": "0" } ], diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 6488ce3e5..6f800bbd0 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -7,8 +7,8 @@ SilphCo_2F_OnLoad:: @ 8161647 call_if_unset FLAG_SILPH_2F_DOOR_2, EventScript_Close2FDoor2 end -SilphCo_2F_EventScript_16165A:: @ 816165A - goto EventScript_1C4816 +SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A + goto EventScript_ThunderWaveTutor EventScript_16165F:: @ 816165F end diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc index ee3fbc0b0..3dc65664d 100644 --- a/data/maps/SilphCo_2F/text.inc +++ b/data/maps/SilphCo_2F/text.inc @@ -44,7 +44,7 @@ gUnknown_81756E2:: @ 81756E2 .string "SILPH CO. will be associated with\n" .string "TEAM ROCKET!$" -Text_175711:: @ 8175711 +Text_ThunderWaveTeach:: @ 8175711 .string "Eeek!\n" .string "No! Stop! Help!\p" .string "Oh, you're not with TEAM ROCKET.\n" @@ -52,15 +52,15 @@ Text_175711:: @ 8175711 .string "Will you forgive me if I teach\n" .string "you the THUNDER WAVE technique?$" -Text_17579D:: @ 817579D +Text_ThunderWaveDeclined:: @ 817579D .string "Oh…\n" .string "But THUNDER WAVE is convenient…$" -Text_1757C1:: @ 81757C1 +Text_ThunderWaveWhichMon:: @ 81757C1 .string "Which POKéMON should I teach\n" .string "THUNDER WAVE?$" -Text_1757EC:: @ 81757EC +Text_ThunderWaveTaught:: @ 81757EC .string "THUNDER WAVE causes paralysis in\n" .string "the target POKéMON.\p" .string "A paralyzed POKéMON may be unable\n" diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 8f11d4ef7..df0a390ee 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -7,7 +7,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow - message Text_1A535C + message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index af865be28..1edcae092 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -10,7 +10,7 @@ SixIsland_Mart_EventScript_171E66:: @ 8171E66 message Text_MayIHelpYou waitmessage pokemart Items_171E8C - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/SixIsland_WaterPath_House1/text.inc b/data/maps/SixIsland_WaterPath_House1/text.inc index 71ecedc96..4c32a80ff 100644 --- a/data/maps/SixIsland_WaterPath_House1/text.inc +++ b/data/maps/SixIsland_WaterPath_House1/text.inc @@ -1,4 +1,4 @@ -Text_1A46C6:: @ 81A46C6 +Text_UltimateMoveThatMon:: @ 81A46C6 .string "I perfected the ultimate move of\n" .string "its type…\p" .string "But will no one take it for\n" @@ -7,11 +7,11 @@ Text_1A46C6:: @ 81A46C6 .string "Y-you…\n" .string "Th-that {STR_VAR_1}…$" -Text_1A4737:: @ 81A4737 +Text_JustMistaken:: @ 81A4737 .string "…No…\n" .string "I was just mistaken.$" -Text_1A4751:: @ 81A4751 +Text_AllowMeToTeachMonUltimateMove:: @ 81A4751 .string "Oh! This is the one!\n" .string "This is the POKéMON!\p" .string "This {STR_VAR_1} is worthy of\n" @@ -20,33 +20,33 @@ Text_1A4751:: @ 81A4751 .string "Will you allow your {STR_VAR_1} to\n" .string "learn my {STR_VAR_2}?$" -Text_1A47E5:: @ 81A47E5 +Text_YouRejectIt:: @ 81A47E5 .string "Gaah! You reject it?\n" .string "No, I won't be dissuaded!$" -Text_1A4814:: @ 81A4814 +Text_LetMeConferUltimateMove:: @ 81A4814 .string "You will allow it?\p" .string "Then, let me confer my ultimate\n" .string "{STR_VAR_2} on your {STR_VAR_1}.\p" .string "Ggggrah-awooo!$" -Text_1A4865:: @ 81A4865 +Text_TaughtMove:: @ 81A4865 .string "Gasp, gasp, gasp…\p" .string "I didn't think I could teach that\n" .string "move while I still lived…$" -Text_1A48B3:: @ 81A48B3 +Text_MakeBestUseOfMove:: @ 81A48B3 .string "I implore you to make the best\n" .string "use of that move and gain power!$" -Text_1A48F3:: @ 81A48F3 +Text_PassedOnEverythingIKnow:: @ 81A48F3 .string "Gasp, gasp, gasp…\p" .string "I have no regrets now.\n" .string "I've passed on everything I know.\p" .string "Now I can live out my life knowing\n" .string "my work is done.$" -Text_1A4972:: @ 81A4972 +Text_FeelRejuvenated:: @ 81A4972 .string "After I passed on my knowledge to\n" .string "you, I felt so much relief.\p" .string "In fact, I feel rejuvenated,\n" diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 3ac12bf36..074d78cd9 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -10,7 +10,7 @@ ThreeIsland_Mart_EventScript_17188D:: @ 817188D message Text_MayIHelpYou waitmessage pokemart Items_1718B4 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index b785d2fd9..59c4ca6f9 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -118,7 +118,7 @@ EventScript_1676A6:: @ 81676A6 EventScript_1676D3:: @ 81676D3 pokemart Items_1676E4 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -132,7 +132,7 @@ Items_1676E4:: @ 81676E4 EventScript_1676EC:: @ 81676EC pokemart Items_1676FC - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -148,7 +148,7 @@ Items_1676FC:: @ 81676FC EventScript_167708:: @ 8167708 pokemart Items_167718 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -166,7 +166,7 @@ Items_167718:: @ 8167718 EventScript_167728:: @ 8167728 pokemart Items_167738 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 4aa63fd0b..9d13a0086 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_CapeBrink_House_EventScript_1C4DEC", + "script": "TwoIsland_CapeBrink_House_EventScript_StarterTutor", "flag": "0" } ], diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 56ff2d7c0..ccb50f313 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -18,7 +18,7 @@ VermilionCity_Mart_EventScript_16B666:: @ 816B666 message Text_MayIHelpYou waitmessage pokemart Items_16B68C - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 02d2c8369..f52d46e71 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1C47AE", + "script": "VictoryRoad_2F_EventScript_DoubleEdgeTutor", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc index fbda3b739..22c42342a 100644 --- a/data/maps/VictoryRoad_3F/text.inc +++ b/data/maps/VictoryRoad_3F/text.inc @@ -1,7 +1,7 @@ Text_1749F3:: @ 81749F3 .string "ギヤーオ！$" -Text_1749F9:: @ 81749F9 +Text_DoubleEdgeTeach:: @ 81749F9 .string "You should be proud of yourself,\n" .string "having battled your way through\l" .string "VICTORY ROAD so courageously.\p" @@ -10,15 +10,15 @@ Text_1749F9:: @ 81749F9 .string "Would you like me to teach that\n" .string "technique?$" -Text_174ABC:: @ 8174ABC +Text_DoubleEdgeDeclined:: @ 8174ABC .string "I'll teach you the technique\n" .string "anytime.$" -Text_174AE2:: @ 8174AE2 +Text_DoubleEdgeWhichMon:: @ 8174AE2 .string "Which POKéMON should I teach\n" .string "DOUBLE-EDGE?$" -Text_174B0C:: @ 8174B0C +Text_DoubleEdgeTaught:: @ 8174B0C .string "Keep that drive going for the\n" .string "POKéMON LEAGUE!\p" .string "Take a run at them and knock 'em\n" diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 4e1b2cd0e..4f5b1e9f5 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -39,7 +39,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_165AF0", + "script": "ViridianCity_EventScript_DreamEaterTutor", "flag": "0" }, { diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index c99ff83ec..4c9c09af8 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -192,8 +192,8 @@ EventScript_165ADB:: @ 8165ADB release end -ViridianCity_EventScript_165AF0:: @ 8165AF0 - goto EventScript_1C4A1E +ViridianCity_EventScript_DreamEaterTutor:: @ 8165AF0 + goto EventScript_DreamEaterTutor end ViridianCity_EventScript_165AF6:: @ 8165AF6 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 5dc1f3a67..fb77b7924 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -60,7 +60,7 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 message Text_MayIHelpYou waitmessage pokemart Items_16A298 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index db0982a29..deb4c66bf 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -22,7 +22,7 @@ CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 @ Unused EventScript_1BB1E4:: @ 81BB1E4 - msgbox Text_1A6393, MSGBOX_NPC + msgbox Text_ThankYouForAccessingMysteryGift, MSGBOX_NPC end CableClub_OnWarp:: @ 81BB1ED @@ -283,7 +283,7 @@ EventScript_1BB541:: @ 81BB541 end EventScript_1BB54C:: @ 81BB54C - call EventScript_1A4EAF + call EventScript_AskSaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_1BB82F message gUnknown_81BC4AC @@ -397,7 +397,7 @@ EventScript_1BB6AB:: @ 81BB6AB call EventScript_1BB79C compare VAR_RESULT, 0 goto_if_eq EventScript_1BB82F - call EventScript_1A4EAF + call EventScript_AskSaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_1BB82F message gUnknown_81BC4AC @@ -826,7 +826,7 @@ EventScript_1BBA94:: @ 81BBA94 call EventScript_1BBB1E compare VAR_RESULT, 0 goto_if_eq EventScript_1BB82F - call EventScript_1A4EAF + call EventScript_AskSaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_1BB82F msgbox gUnknown_81BD86A @@ -1030,7 +1030,7 @@ EventScript_1BBD6E:: @ 81BBD6E end EventScript_1BBD6F:: @ 81BBD6F - call EventScript_1A4EAF + call EventScript_AskSaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_1BB82F switch VAR_0x8004 @@ -1320,7 +1320,7 @@ EventScript_1BC13A:: @ 81BC13A waitstate compare VAR_0x8004, 6 goto_if_ge EventScript_1BB83F - call EventScript_1A4EAF + call EventScript_AskSaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_1BB83F setvar VAR_0x8004, 4 @@ -1340,7 +1340,7 @@ EventScript_1BC184:: @ 81BC184 waitstate compare VAR_0x8004, 6 goto_if_ge EventScript_1BB83F - call EventScript_1A4EAF + call EventScript_AskSaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_1BB83F setvar VAR_0x8004, 6 diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index e1e0beebb..b5efb263a 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -3,60 +3,60 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - goto_if_unset FLAG_BADGE02_GET, EventScript_1BDF87 + goto_if_unset FLAG_BADGE02_GET, EventScript_CantCutTree checkpartymove MOVE_CUT compare VAR_RESULT, PARTY_SIZE - goto_if_eq EventScript_1BDF87 + goto_if_eq EventScript_CantCutTree setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_CUT - msgbox gUnknown_81BDF94, MSGBOX_YESNO + msgbox Text_CutTreeDown, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BDF91 - msgbox gUnknown_81BDFD7 + goto_if_eq EventScript_DontCutTree + msgbox Text_MonUsedMove closemessage dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto EventScript_1BDF76 + goto EventScript_CutTree end -gUnknown_81BDF6B:: @ 81BDF6B +EventScript_FldEffCut:: @ 81BDF6B lockall dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto EventScript_1BDF76 + goto EventScript_CutTree end -EventScript_1BDF76:: @ 81BDF76 - applymovement VAR_LAST_TALKED, Movement_1BDF85 +EventScript_CutTree:: @ 81BDF76 + applymovement VAR_LAST_TALKED, Movement_CutTree waitmovement 0 removeobject VAR_LAST_TALKED releaseall end -Movement_1BDF85:: @ 81BDF85 +Movement_CutTree:: @ 81BDF85 cut_tree step_end -EventScript_1BDF87:: @ 81BDF87 - msgbox gUnknown_81BDFE3, MSGBOX_SIGN +EventScript_CantCutTree:: @ 81BDF87 + msgbox Text_TreeCanBeCutDown, MSGBOX_SIGN releaseall end -EventScript_1BDF91:: @ 81BDF91 +EventScript_DontCutTree:: @ 81BDF91 closemessage releaseall end -gUnknown_81BDF94:: @ 81BDF94 +Text_CutTreeDown:: @ 81BDF94 .string "This tree looks like it can be CUT\n" .string "down!\p" .string "Would you like to CUT it?$" -gUnknown_81BDFD7:: @ 81BDFD7 +Text_MonUsedMove:: @ 81BDFD7 .string "{STR_VAR_1} used {STR_VAR_2}!$" -gUnknown_81BDFE3:: @ 81BDFE3 +Text_TreeCanBeCutDown:: @ 81BDFE3 .string "This tree looks like it can be CUT\n" .string "down!$" @@ -65,63 +65,63 @@ EventScript_InteractWithRockSmashRockObject:: @ 81BE00C compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - goto_if_unset FLAG_BADGE06_GET, EventScript_1BE091 + goto_if_unset FLAG_BADGE06_GET, EventScript_CantSmashRock checkpartymove MOVE_ROCK_SMASH compare VAR_RESULT, PARTY_SIZE - goto_if_eq EventScript_1BE091 + goto_if_eq EventScript_CantSmashRock setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_ROCK_SMASH - msgbox Text_1BE09D, MSGBOX_YESNO + msgbox Text_UseRockSmash, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BE09A - msgbox gUnknown_81BDFD7 + goto_if_eq EventScript_DontSmashRock + msgbox Text_MonUsedMove closemessage dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate - goto EventScript_1BE06F + goto EventScript_UseRockSmash end EventScript_FldEffRockSmash:: @ 81BE064 lockall dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate - goto EventScript_1BE06F + goto EventScript_UseRockSmash end -EventScript_1BE06F:: @ 81BE06F - applymovement VAR_LAST_TALKED, Movement_1BE08F +EventScript_UseRockSmash:: @ 81BE06F + applymovement VAR_LAST_TALKED, Movement_BreakRock waitmovement 0 removeobject VAR_LAST_TALKED special ScrSpecial_RockSmashWildEncounter - compare VAR_RESULT, 0 - goto_if_eq EventScript_1BE08D + compare VAR_RESULT, FALSE + goto_if_eq EventScript_RockSmashNoEncounter waitstate releaseall end -EventScript_1BE08D:: @ 81BE08D +EventScript_RockSmashNoEncounter:: @ 81BE08D releaseall end -Movement_1BE08F:: @ 81BE08F +Movement_BreakRock:: @ 81BE08F rock_smash_break step_end -EventScript_1BE091:: @ 81BE091 - msgbox gUnknown_81BE0E2, MSGBOX_SIGN +EventScript_CantSmashRock:: @ 81BE091 + msgbox Text_MonMaySmashRock, MSGBOX_SIGN end -EventScript_1BE09A:: @ 81BE09A +EventScript_DontSmashRock:: @ 81BE09A closemessage releaseall end -Text_1BE09D:: @ 81BE09D +Text_UseRockSmash:: @ 81BE09D .string "This rock appears to be breakable.\n" .string "Would you like to use ROCK SMASH?$" -gUnknown_81BE0E2:: @ 81BE0E2 +Text_MonMaySmashRock:: @ 81BE0E2 .string "It's a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" @@ -130,177 +130,177 @@ EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - goto_if_unset FLAG_BADGE04_GET, EventScript_1BE185 - goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_1BE18E + goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder + goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength checkpartymove MOVE_STRENGTH compare VAR_RESULT, PARTY_SIZE - goto_if_eq EventScript_1BE185 + goto_if_eq EventScript_CantMoveBoulder setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE19A, MSGBOX_YESNO + msgbox Text_UseStrength, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BE197 + goto_if_eq EventScript_DontUseStrength closemessage dofieldeffect FLDEFF_USE_STRENGTH waitstate - goto EventScript_1BE179 + goto EventScript_UseStrength end EventScript_FldEffStrength:: @ 81BE16E lockall dofieldeffect FLDEFF_USE_STRENGTH waitstate - goto EventScript_1BE179 + goto EventScript_UseStrength end -EventScript_1BE179:: @ 81BE179 +EventScript_UseStrength:: @ 81BE179 setflag FLAG_SYS_STRENGTH_ACTIVE - msgbox gUnknown_81BE1FA, MSGBOX_SIGN + msgbox Text_MonUsedStrengthCanMoveBoulders, MSGBOX_SIGN end -EventScript_1BE185:: @ 81BE185 - msgbox gUnknown_81BE244, MSGBOX_SIGN +EventScript_CantMoveBoulder:: @ 81BE185 + msgbox Text_MonMayPushBoulder, MSGBOX_SIGN end -EventScript_1BE18E:: @ 81BE18E - msgbox gUnknown_81BE284, MSGBOX_SIGN +EventScript_AlreadyUsedStrength:: @ 81BE18E + msgbox Text_StrengthMadeMovingBouldersPossible, MSGBOX_SIGN end -EventScript_1BE197:: @ 81BE197 +EventScript_DontUseStrength:: @ 81BE197 closemessage releaseall end -gUnknown_81BE19A:: @ 81BE19A +Text_UseStrength:: @ 81BE19A .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.\p" .string "Would you like to use STRENGTH?$" -gUnknown_81BE1FA:: @ 81BE1FA +Text_MonUsedStrengthCanMoveBoulders:: @ 81BE1FA .string "{STR_VAR_1} used STRENGTH!\p" .string "{STR_VAR_1}'s STRENGTH made it\n" .string "possible to move boulders around!$" -gUnknown_81BE244:: @ 81BE244 +Text_MonMayPushBoulder:: @ 81BE244 .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.$" -gUnknown_81BE284:: @ 81BE284 +Text_StrengthMadeMovingBouldersPossible:: @ 81BE284 .string "STRENGTH made it possible to move\n" .string "boulders around.$" -gUnknown_81BE2B7:: @ 81BE2B7 +EventScript_InteractWithWaterfall:: @ 81BE2B7 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall checkpartymove MOVE_WATERFALL compare VAR_RESULT, PARTY_SIZE - goto_if_eq EventScript_1BE300 + goto_if_eq EventScript_WaterCrashingDown getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE33F, MSGBOX_YESNO + msgbox Text_UseWaterfall, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BE308 - msgbox gUnknown_81BE378 + goto_if_eq EventScript_EndWaterfall + msgbox Text_MonUsedWaterfall dofieldeffect FLDEFF_USE_WATERFALL - goto EventScript_1BE308 + goto EventScript_EndWaterfall EventScript_81BE2FF:: @ 81BE2FF lockall -EventScript_1BE300: - msgbox gUnknown_81BE30A -EventScript_1BE308: +EventScript_WaterCrashingDown: + msgbox Text_WallOfWaterCrashingDown +EventScript_EndWaterfall: releaseall end -gUnknown_81BE30A:: @ 81BE30A +Text_WallOfWaterCrashingDown:: @ 81BE30A .string "A wall of water is crashing down\n" .string "with a mighty roar.$" -gUnknown_81BE33F:: @ 81BE33F +Text_UseWaterfall:: @ 81BE33F .string "It's a large waterfall.\n" .string "Would you like to use WATERFALL?$" -gUnknown_81BE378:: @ 81BE378 +Text_MonUsedWaterfall:: @ 81BE378 .string "{STR_VAR_1} used WATERFALL.$" @ Unused leftover from R/S -EventScript_1BE38B:: @ 81BE38B +EventScript_InteractWithDeepWater:: @ 81BE38B lockall checkpartymove MOVE_DIVE compare VAR_RESULT, PARTY_SIZE - goto_if_eq EventScript_1BE3CA + goto_if_eq EventScript_MayGoUnderwater getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 - msgbox gUnknown_81BE469, MSGBOX_YESNO + msgbox Text_SeaIsDeepUseDive, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BE3D2 - msgbox gUnknown_81BE49B + goto_if_eq EventScript_EndDive + msgbox Text_MonUsedDive dofieldeffect FLDEFF_USE_DIVE - goto EventScript_1BE3D2 + goto EventScript_EndDive -EventScript_1BE3C9:: @ 81BE3C9 +EventScript_CantDive:: @ 81BE3C9 lockall -EventScript_1BE3CA: - msgbox Text_1BE42B -EventScript_1BE3D2: +EventScript_MayGoUnderwater: + msgbox Text_MonMayGoUnderwater +EventScript_EndDive: releaseall end -EventScript_1BE3D4:: @ 81BE3D4 +EventScript_TrySurface:: @ 81BE3D4 lockall checkpartymove MOVE_DIVE compare VAR_RESULT, PARTY_SIZE - goto_if_eq EventScript_1BE412 + goto_if_eq EventScript_CantSurface getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 - msgbox gUnknown_81BE4EF, MSGBOX_YESNO + msgbox Text_LightFilteringUseDive, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BE429 - msgbox gUnknown_81BE49B + goto_if_eq EventScript_EndSurface + msgbox Text_MonUsedDive dofieldeffect FLDEFF_USE_DIVE - goto EventScript_1BE429 + goto EventScript_EndSurface -EventScript_1BE412:: @ 81BE412 +EventScript_CantSurface:: @ 81BE412 lockall - msgbox gUnknown_81BE4A9 - goto EventScript_1BE429 + msgbox Text_MonMaySurface + goto EventScript_EndSurface -EventScript_1BE420:: @ 81BE420 +EventScript_ObstacleCantSurface:: @ 81BE420 lockall - msgbox gUnknown_81BE52F -EventScript_1BE429: + msgbox Text_DiveCantBeUsedHere +EventScript_EndSurface: releaseall end -Text_1BE42B:: @ 81BE42B +Text_MonMayGoUnderwater:: @ 81BE42B .string "The sea is deep here. A POKéMON\n" .string "may be able to go underwater.$" -gUnknown_81BE469:: @ 81BE469 +Text_SeaIsDeepUseDive:: @ 81BE469 .string "The sea is deep here.\n" .string "Would you like to use DIVE?$" -gUnknown_81BE49B:: @ 81BE49B +Text_MonUsedDive:: @ 81BE49B .string "{STR_VAR_1} used DIVE.$" -gUnknown_81BE4A9:: @ 81BE4A9 +Text_MonMaySurface:: @ 81BE4A9 .string "Light is filtering down from above.\n" .string "A POKéMON may be able to surface.$" -gUnknown_81BE4EF:: @ 81BE4EF +Text_LightFilteringUseDive:: @ 81BE4EF .string "Light is filtering down from above.\n" .string "Would you like to use DIVE?$" -gUnknown_81BE52F:: @ 81BE52F +Text_DiveCantBeUsedHere:: @ 81BE52F .string "There is an obstacle above.\n" .string "DIVE can't be used here.$" EventScript_FailSweetScent:: @ 81BE564 - msgbox Text_1BE56D, MSGBOX_SIGN + msgbox Text_LooksLikeNothingHere, MSGBOX_SIGN end -Text_1BE56D:: @ 81BE56D +Text_LooksLikeNothingHere:: @ 81BE56D .string "Looks like there's nothing here…$" diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc index c05b7fcdd..1e9eeedac 100644 --- a/data/scripts/flash.inc +++ b/data/scripts/flash.inc @@ -1,4 +1,4 @@ -EventScript_81BFB5F:: @ 81BFB5F +EventScript_FldEffFlash:: @ 81BFB5F animateflash 0 setflashradius 0 end diff --git a/data/scripts/hole.inc b/data/scripts/hole.inc index 5637ccbde..98900f04a 100644 --- a/data/scripts/hole.inc +++ b/data/scripts/hole.inc @@ -1,13 +1,17 @@ -EventScript_1C1338:: @ 81C1338 - map_script_2 VAR_0x4030, 0, EventScript_1C1348 +@ Unused +EventScript_CheckFallDownHole:: @ 81C1338 + map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole .2byte 0 - copyvar VAR_0x4030, 1 + +@ Unused +EventScript_FixCrackedGround:: + copyvar VAR_ICE_STEP_COUNT, 1 end -EventScript_1C1348:: @ 81C1348 +EventScript_FallDownHole:: @ 81C1348 lockall delay 20 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1C137A + applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -15,10 +19,11 @@ EventScript_1C1348:: @ 81C1348 waitstate end +@ TODO: EventScript_FallDownHoleMtPyre in pokeemerald, needs generic name EventScript_1C1361:: @ 81C1361 lockall delay 20 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1C137A + applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -26,6 +31,6 @@ EventScript_1C1361:: @ 81C1361 waitstate end -Movement_1C137A:: @ 81C137A +Movement_SetInvisible: @ 81C137A set_invisible step_end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 9b3c86d8f..702889e5d 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -1,581 +1,582 @@ -VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE +VictoryRoad_2F_EventScript_DoubleEdgeTutor:: @ 81C47AE lock faceplayer - goto_if_set FLAG_TUTOR_DOUBLE_EDGE, EventScript_1C480C - msgbox Text_1749F9, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_DOUBLE_EDGE, EventScript_DoubleEdgeTaught + msgbox Text_DoubleEdgeTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4802 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4802 - msgbox Text_174AE2 + goto_if_eq EventScript_DoubleEdgeDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_DoubleEdgeDeclined + msgbox Text_DoubleEdgeWhichMon setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4802 + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_DoubleEdgeDeclined setflag FLAG_TUTOR_DOUBLE_EDGE - goto EventScript_1C480C + goto EventScript_DoubleEdgeTaught end -EventScript_1C4802:: @ 81C4802 - msgbox Text_174ABC +EventScript_DoubleEdgeDeclined:: @ 81C4802 + msgbox Text_DoubleEdgeDeclined release end -EventScript_1C480C:: @ 81C480C - msgbox Text_174B0C +EventScript_DoubleEdgeTaught:: @ 81C480C + msgbox Text_DoubleEdgeTaught release end -EventScript_1C4816:: @ 81C4816 +EventScript_ThunderWaveTutor:: @ 81C4816 lock faceplayer - goto_if_set FLAG_TUTOR_THUNDER_WAVE, EventScript_1C4874 - msgbox Text_175711, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_THUNDER_WAVE, EventScript_ThunderWaveTaught + msgbox Text_ThunderWaveTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C486A - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C486A - msgbox Text_1757C1 + goto_if_eq EventScript_ThunderWaveDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_ThunderWaveDeclined + msgbox Text_ThunderWaveWhichMon setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C486A + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_ThunderWaveDeclined setflag FLAG_TUTOR_THUNDER_WAVE - goto EventScript_1C4874 + goto EventScript_ThunderWaveTaught end -EventScript_1C486A:: @ 81C486A - msgbox Text_17579D +EventScript_ThunderWaveDeclined:: @ 81C486A + msgbox Text_ThunderWaveDeclined release end -EventScript_1C4874:: @ 81C4874 - msgbox Text_1757EC +EventScript_ThunderWaveTaught:: @ 81C4874 + msgbox Text_ThunderWaveTaught release end -RockTunnel_B1F_EventScript_1C487E:: @ 81C487E +RockTunnel_B1F_EventScript_RockSlideTutor:: @ 81C487E lock faceplayer - goto_if_set FLAG_TUTOR_ROCK_SLIDE, EventScript_1C48DC - msgbox Text_1799E0, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_ROCK_SLIDE, EventScript_RockSlideTaught + msgbox Text_RockSlideTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C48D2 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C48D2 - msgbox Text_179AE1 + goto_if_eq EventScript_RockSlideDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_RockSlideDeclined + msgbox Text_RockSlideWhichMon setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C48D2 + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_RockSlideDeclined setflag FLAG_TUTOR_ROCK_SLIDE - goto EventScript_1C48DC + goto EventScript_RockSlideTaught end -EventScript_1C48D2:: @ 81C48D2 - msgbox Text_179AC0 +EventScript_RockSlideDeclined:: @ 81C48D2 + msgbox Text_RockSlideDeclined release end -EventScript_1C48DC:: @ 81C48DC - msgbox Text_179B0A +EventScript_RockSlideTaught:: @ 81C48DC + msgbox Text_RockSlideTaught release end -MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 +MtEmber_Exterior_EventScript_ExplosionTutor:: @ 81C48E6 lock faceplayer - goto_if_set FLAG_TUTOR_EXPLOSION, EventScript_1C4944 - msgbox Text_17A642, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_EXPLOSION, EventScript_ExplosionTaught + msgbox Text_ExplosionTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C493A - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C493A - msgbox Text_17A717 + goto_if_eq EventScript_ExplosionDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_ExplosionDeclined + msgbox Text_ExplosionWhichMon setvar VAR_0x8005, MOVETUTOR_EXPLOSION - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C493A + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_ExplosionDeclined setflag FLAG_TUTOR_EXPLOSION - goto EventScript_1C4944 + goto EventScript_ExplosionTaught end -EventScript_1C493A:: @ 81C493A - msgbox Text_17A6ED +EventScript_ExplosionDeclined:: @ 81C493A + msgbox Text_ExplosionDeclined release end -EventScript_1C4944:: @ 81C4944 - msgbox Text_17A756 +EventScript_ExplosionTaught:: @ 81C4944 + msgbox Text_ExplosionTaught release end -Route4_EventScript_1C494E:: @ 81C494E +Route4_EventScript_MegaPunchTutor:: @ 81C494E lock faceplayer - goto_if_set FLAG_TUTOR_META_PUNCH, EventScript_1C49AC - msgbox Text_1839D5, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_MEGA_PUNCH, EventScript_MegaPunchTaught + msgbox Text_MegaPunchTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C49A2 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C49A2 - msgbox Text_183ABF + goto_if_eq EventScript_MegaPunchDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_MegaPunchDeclined + msgbox Text_MegaPunchWhichMon setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C49A2 - setflag FLAG_TUTOR_META_PUNCH - goto EventScript_1C49AC + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_MegaPunchDeclined + setflag FLAG_TUTOR_MEGA_PUNCH + goto EventScript_MegaPunchTaught end -EventScript_1C49A2:: @ 81C49A2 - msgbox Text_183A83 +EventScript_MegaPunchDeclined:: @ 81C49A2 + msgbox Text_MegaPunchDeclined release end -EventScript_1C49AC:: @ 81C49AC - msgbox Text_183AE2 +EventScript_MegaPunchTaught:: @ 81C49AC + msgbox Text_MegaPunchTaught release end -Route4_EventScript_1C49B6:: @ 81C49B6 +Route4_EventScript_MegaKickTutor:: @ 81C49B6 lock faceplayer - goto_if_set FLAG_TUTOR_MEGA_KICK, EventScript_1C4A14 - msgbox Text_183B74, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_MEGA_KICK, EventScript_MegaKickTaught + msgbox Text_MegaKickTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4A0A - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4A0A - msgbox Text_183C68 + goto_if_eq EventScript_MegaKickDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_MegaKickDeclined + msgbox Text_MegaKickWhichMon setvar VAR_0x8005, MOVETUTOR_MEGA_KICK - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4A0A + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_MegaKickDeclined setflag FLAG_TUTOR_MEGA_KICK - goto EventScript_1C4A14 + goto EventScript_MegaKickTaught end -EventScript_1C4A0A:: @ 81C4A0A - msgbox Text_183C25 +EventScript_MegaKickDeclined:: @ 81C4A0A + msgbox Text_MegaKickDeclined release end -EventScript_1C4A14:: @ 81C4A14 - msgbox Text_183C94 +EventScript_MegaKickTaught:: @ 81C4A14 + msgbox Text_MegaKickTaught release end -EventScript_1C4A1E:: @ 81C4A1E +EventScript_DreamEaterTutor:: @ 81C4A1E lock faceplayer - goto_if_set FLAG_TUTOR_DREAM_EATER, EventScript_1C4A7C - msgbox Text_17E316, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_DREAM_EATER, EventScript_DreamEaterTaught + msgbox Text_DreamEaterTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4A72 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4A72 - msgbox Text_17E3F1 + goto_if_eq EventScript_DreamEaterDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_DreamEaterDeclined + msgbox Text_DreamEaterWhichMon setvar VAR_0x8005, MOVETUTOR_DREAM_EATER - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4A72 + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_DreamEaterDeclined setflag FLAG_TUTOR_DREAM_EATER - goto EventScript_1C4A7C + goto EventScript_DreamEaterTaught end -EventScript_1C4A72:: @ 81C4A72 - msgbox Text_17E3E9 +EventScript_DreamEaterDeclined:: @ 81C4A72 + msgbox Text_DreamEaterDeclined release end -EventScript_1C4A7C:: @ 81C4A7C - msgbox Text_17E41B +EventScript_DreamEaterTaught:: @ 81C4A7C + msgbox Text_DreamEaterTaught release end -EventScript_1C4A86:: @ 81C4A86 +EventScript_SoftboiledTutor:: @ 81C4A86 lock faceplayer - goto_if_set FLAG_TUTOR_SOFT_BOILED, EventScript_1C4AE4 - msgbox Text_180388, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_SOFT_BOILED, EventScript_SoftboiledTaught + msgbox Text_SoftboiledTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4ADA - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4ADA - msgbox Text_180484 + goto_if_eq EventScript_SoftboiledDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_SoftboiledDeclined + msgbox Text_SoftboiledWhichMon setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4ADA + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_SoftboiledDeclined setflag FLAG_TUTOR_SOFT_BOILED - goto EventScript_1C4AE4 + goto EventScript_SoftboiledTaught end -EventScript_1C4ADA:: @ 81C4ADA - msgbox Text_18043F +EventScript_SoftboiledDeclined:: @ 81C4ADA + msgbox Text_SoftboiledDeclined release end -EventScript_1C4AE4:: @ 81C4AE4 - msgbox Text_1804C4 +EventScript_SoftboiledTaught:: @ 81C4AE4 + msgbox Text_SoftboiledTaught release end -FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE +FuchsiaCity_EventScript_SubstituteTutor:: @ 81C4AEE lock faceplayer - goto_if_set FLAG_TUTOR_SUBSTITUTE, EventScript_1C4B4C - msgbox Text_180948, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_SUBSTITUTE, EventScript_SubstituteTaught + msgbox Text_SubstituteTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4B42 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4B42 - msgbox Text_180A57 + goto_if_eq EventScript_SubstituteDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_SubstituteDeclined + msgbox Text_SubstituteWhichMon setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4B42 + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_SubstituteDeclined setflag FLAG_TUTOR_SUBSTITUTE - goto EventScript_1C4B4C + goto EventScript_SubstituteTaught end -EventScript_1C4B42:: @ 81C4B42 - msgbox Text_180A32 +EventScript_SubstituteDeclined:: @ 81C4B42 + msgbox Text_SubstituteDeclined release end -EventScript_1C4B4C:: @ 81C4B4C - msgbox Text_180A80 +EventScript_SubstituteTaught:: @ 81C4B4C + msgbox Text_SubstituteTaught release end -SevenIsland_EventScript_1C4B56:: @ 81C4B56 +SevenIsland_EventScript_SwordsDanceTutor:: @ 81C4B56 lock faceplayer - goto_if_set FLAG_TUTOR_SWORDS_DANCE, EventScript_1C4BB4 - msgbox Text_182F01, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_SWORDS_DANCE, EventScript_SwordsDanceTaught + msgbox Text_SwordsDanceTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4BAA - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4BAA - msgbox Text_182FD9 + goto_if_eq EventScript_SwordsDanceDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_SwordsDanceDeclined + msgbox Text_SwordsDanceWhichMon setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4BAA + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_SwordsDanceDeclined setflag FLAG_TUTOR_SWORDS_DANCE - goto EventScript_1C4BB4 + goto EventScript_SwordsDanceTaught end -EventScript_1C4BAA:: @ 81C4BAA - msgbox Text_182FC1 +EventScript_SwordsDanceDeclined:: @ 81C4BAA + msgbox Text_SwordsDanceDeclined release end -EventScript_1C4BB4:: @ 81C4BB4 - msgbox Text_18300D +EventScript_SwordsDanceTaught:: @ 81C4BB4 + msgbox Text_SwordsDanceTaught release end -PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE +PewterCity_Museum_1F_EventScript_SeismicTossTutor:: @ 81C4BBE lock faceplayer - goto_if_set FLAG_TUTOR_SEISMIC_TOSS, EventScript_1C4C1C - msgbox Text_1909A3, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_SEISMIC_TOSS, EventScript_SeismicTossTaught + msgbox Text_SeismicTossTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4C12 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4C12 - msgbox Text_190AD5 + goto_if_eq EventScript_SeismicTossDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_SeismicTossDeclined + msgbox Text_SeismicTossWhichMon setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4C12 + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_SeismicTossDeclined setflag FLAG_TUTOR_SEISMIC_TOSS - goto EventScript_1C4C1C + goto EventScript_SeismicTossTaught end -EventScript_1C4C12:: @ 81C4C12 - msgbox Text_190AA9 +EventScript_SeismicTossDeclined:: @ 81C4C12 + msgbox Text_SeismicTossDeclined release end -EventScript_1C4C1C:: @ 81C4C1C - msgbox Text_190B00 +EventScript_SeismicTossTaught:: @ 81C4C1C + msgbox Text_SeismicTossTaught release end -EventScript_1C4C26:: @ 81C4C26 +EventScript_CounterTutor:: @ 81C4C26 lock faceplayer - goto_if_set FLAG_TUTOR_COUNTER, EventScript_1C4C84 - msgbox Text_195928, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_COUNTER, EventScript_CounterTaught + msgbox Text_CounterTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4C7A - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4C7A - msgbox Text_195A08 + goto_if_eq EventScript_CounterDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_CounterDeclined + msgbox Text_CounterWhichMon setvar VAR_0x8005, MOVETUTOR_COUNTER - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4C7A + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_CounterDeclined setflag FLAG_TUTOR_COUNTER - goto EventScript_1C4C84 + goto EventScript_CounterTaught end -EventScript_1C4C7A:: @ 81C4C7A - msgbox Text_1959CC +EventScript_CounterDeclined:: @ 81C4C7A + msgbox Text_CounterDeclined release end -EventScript_1C4C84:: @ 81C4C84 - msgbox Text_195A31 +EventScript_CounterTaught:: @ 81C4C84 + msgbox Text_CounterTaught release end -EventScript_1C4C8E:: @ 81C4C8E +EventScript_MetronomeTutor:: @ 81C4C8E lock faceplayer - goto_if_set FLAG_TUTOR_METRONOME, EventScript_1C4CEC - msgbox Text_19A137, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_METRONOME, EventScript_MetronomeTaught + msgbox Text_MetronomeTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4CE2 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4CE2 - msgbox Text_19A1EA + goto_if_eq EventScript_MetronomeDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_MetronomeDeclined + msgbox Text_MetronomeWhichMon setvar VAR_0x8005, MOVETUTOR_METRONOME - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4CE2 + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_MetronomeDeclined setflag FLAG_TUTOR_METRONOME - goto EventScript_1C4CEC + goto EventScript_MetronomeTaught end -EventScript_1C4CE2:: @ 81C4CE2 - msgbox Text_19A1CB +EventScript_MetronomeDeclined:: @ 81C4CE2 + msgbox Text_MetronomeDeclined release end -EventScript_1C4CEC:: @ 81C4CEC - msgbox Text_19A20E +EventScript_MetronomeTaught:: @ 81C4CEC + msgbox Text_MetronomeTaught release end -EventScript_1C4CF6:: @ 81C4CF6 - goto_if_set FLAG_TUTOR_MIMIC, EventScript_1C4D59 - msgbox Text_19AD85, MSGBOX_YESNO +EventScript_MimicTutor:: @ 81C4CF6 + goto_if_set FLAG_TUTOR_MIMIC, EventScript_MimicTaught + msgbox Text_MimicTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4D4F - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4D4F - msgbox Text_19ADEE + goto_if_eq EventScript_MimicDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_MimicDeclined + msgbox Text_MimicWhichMon setvar VAR_0x8005, MOVETUTOR_MIMIC - call EventScript_1C4F30 + call EventScript_ChooseMoveTutorMon lock faceplayer compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4D4F + goto_if_eq EventScript_MimicDeclined removeitem ITEM_POKE_DOLL, 1 setflag FLAG_TUTOR_MIMIC - goto EventScript_1C4D59 + goto EventScript_MimicTaught end -EventScript_1C4D4F:: @ 81C4D4F - msgbox Text_19ADD8 +EventScript_MimicDeclined:: @ 81C4D4F + msgbox Text_MimicDeclined release end -EventScript_1C4D59:: @ 81C4D59 +EventScript_MimicTaught:: @ 81C4D59 checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_1C4D72 + call_if_eq EventScript_MimicTaughtMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_1C4D7B + call_if_eq EventScript_MimicTaughtFemale release end -EventScript_1C4D72:: @ 81C4D72 - msgbox Text_19AE1C +EventScript_MimicTaughtMale:: @ 81C4D72 + msgbox Text_MimicTaughtMale return -EventScript_1C4D7B:: @ 81C4D7B - msgbox Text_19AE90 +EventScript_MimicTaughtFemale:: @ 81C4D7B + msgbox Text_MimicTaughtFemale return -FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 +FourIsland_House1_EventScript_BodySlamTutor:: @ 81C4D84 lock faceplayer - goto_if_set FLAG_TUTOR_BODY_SLAM, EventScript_1C4DE2 - msgbox Text_1A3505, MSGBOX_YESNO + goto_if_set FLAG_TUTOR_BODY_SLAM, EventScript_BodySlamTaught + msgbox Text_BodySlamTeach, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4DD8 - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4DD8 - msgbox Text_1A35DA + goto_if_eq EventScript_BodySlamDeclined + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq EventScript_BodySlamDeclined + msgbox Text_BodySlamWhichMon setvar VAR_0x8005, MOVETUTOR_BODY_SLAM - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4DD8 + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BodySlamDeclined setflag FLAG_TUTOR_BODY_SLAM - goto EventScript_1C4DE2 + goto EventScript_BodySlamTaught end -EventScript_1C4DD8:: @ 81C4DD8 - msgbox Text_1A35C7 +EventScript_BodySlamDeclined:: @ 81C4DD8 + msgbox Text_BodySlamDeclined release end -EventScript_1C4DE2:: @ 81C4DE2 - msgbox Text_1A3609 +EventScript_BodySlamTaught:: @ 81C4DE2 + msgbox Text_BodySlamTaught release end -TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC +TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, EventScript_1C4EA1 - goto_if_set FLAG_TEMP_2, EventScript_1C4E97 + goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves + goto_if_set FLAG_TEMP_2, CapeBrinkTutor_EventScript_MoveJustTaught getfirstpartymonname 0 - msgbox Text_1A46C6 + msgbox Text_UltimateMoveThatMon specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4F26 + compare VAR_RESULT, FALSE + goto_if_eq CapeBrinkTutor_EventScript_NoLeadStarter copyvar VAR_0x8009, VAR_0x8005 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1C4EF0 + call_if_eq CapeBrinkTutor_EventScript_JumpInPlaceDown compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1C4EFB + call_if_eq CapeBrinkTutor_EventScript_JumpInPlaceUp compare VAR_FACING, DIR_EAST - call_if_eq EventScript_1C4F06 + call_if_eq CapeBrinkTutor_EventScript_JumpInPlaceLeft compare VAR_FACING, DIR_WEST - call_if_eq EventScript_1C4F11 - msgbox Text_1A4751, MSGBOX_YESNO + call_if_eq CapeBrinkTutor_EventScript_JumpInPlaceRight + msgbox Text_AllowMeToTeachMonUltimateMove, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1C4F1C - call EventScript_1C4F37 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4F1C - msgbox Text_1A4814 + goto_if_eq CapeBrinkTutor_EventScript_DeclineMove + call EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq CapeBrinkTutor_EventScript_DeclineMove + msgbox Text_LetMeConferUltimateMove closemessage fadescreen FADE_TO_BLACK - goto EventScript_1C4EDA + goto CapeBrinkTutor_EventScript_ChooseMon -EventScript_1C4E8F:: @ 81C4E8F +@ Unused +CapeBrinkTutor_EventScript_FadeTaughtMove:: @ 81C4E8F fadescreen FADE_FROM_BLACK - goto EventScript_1C4EAB + goto CapeBrinkTutor_EventScript_TaughtMove end -EventScript_1C4E97:: @ 81C4E97 - msgbox Text_1A48B3 +CapeBrinkTutor_EventScript_MoveJustTaught:: @ 81C4E97 + msgbox Text_MakeBestUseOfMove release end -EventScript_1C4EA1:: @ 81C4EA1 - msgbox Text_1A4972 +CapeBrinkTutor_EventScript_TaughtAllMoves:: @ 81C4EA1 + msgbox Text_FeelRejuvenated release end -EventScript_1C4EAB:: @ 81C4EAB +CapeBrinkTutor_EventScript_TaughtMove:: @ 81C4EAB copyvar VAR_0x8005, VAR_0x8009 specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor - compare VAR_RESULT, 1 - goto_if_eq EventScript_1C4ECD - msgbox Text_1A4865 + compare VAR_RESULT, TRUE + goto_if_eq CapeBrinkTutor_EventScript_LearnedAllMoves + msgbox Text_TaughtMove setflag FLAG_TEMP_2 release end -EventScript_1C4ECD:: @ 81C4ECD - msgbox Text_1A48F3 +CapeBrinkTutor_EventScript_LearnedAllMoves:: @ 81C4ECD + msgbox Text_PassedOnEverythingIKnow setflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK release end -EventScript_1C4EDA:: @ 81C4EDA - call EventScript_1C4F30 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C4F1C - goto EventScript_1C4EAB +CapeBrinkTutor_EventScript_ChooseMon:: @ 81C4EDA + call EventScript_ChooseMoveTutorMon + compare VAR_RESULT, FALSE + goto_if_eq CapeBrinkTutor_EventScript_DeclineMove + goto CapeBrinkTutor_EventScript_TaughtMove end -EventScript_1C4EF0:: @ 81C4EF0 - applymovement 1, Movement_1C4F4C +CapeBrinkTutor_EventScript_JumpInPlaceDown:: @ 81C4EF0 + applymovement 1, Movement_JumpInPlaceDown waitmovement 0 return -EventScript_1C4EFB:: @ 81C4EFB - applymovement 1, Movement_1C4F4E +CapeBrinkTutor_EventScript_JumpInPlaceUp:: @ 81C4EFB + applymovement 1, Movement_JumpInPlaceUp waitmovement 0 return -EventScript_1C4F06:: @ 81C4F06 - applymovement 1, Movement_1C4F50 +CapeBrinkTutor_EventScript_JumpInPlaceLeft:: @ 81C4F06 + applymovement 1, Movement_JumpInPlaceLeft waitmovement 0 return -EventScript_1C4F11:: @ 81C4F11 - applymovement 1, Movement_1C4F52 +CapeBrinkTutor_EventScript_JumpInPlaceRight:: @ 81C4F11 + applymovement 1, Movement_JumpInPlaceRight waitmovement 0 return -EventScript_1C4F1C:: @ 81C4F1C - msgbox Text_1A47E5 +CapeBrinkTutor_EventScript_DeclineMove:: @ 81C4F1C + msgbox Text_YouRejectIt release end -EventScript_1C4F26:: @ 81C4F26 - msgbox Text_1A4737 +CapeBrinkTutor_EventScript_NoLeadStarter:: @ 81C4F26 + msgbox Text_JustMistaken release end -EventScript_1C4F30:: @ 81C4F30 +EventScript_ChooseMoveTutorMon:: @ 81C4F30 special ChooseMonForMoveTutor waitstate lock faceplayer return -EventScript_1C4F37:: @ 81C4F37 +EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37 textcolor 3 special sub_80699BC signmsg - msgbox Text_1A644F, MSGBOX_YESNO + msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO normalmsg call EventScript_1A6675 return -Movement_1C4F4C:: @ 81C4F4C +Movement_JumpInPlaceDown: @ 81C4F4C jump_in_place_down step_end -Movement_1C4F4E:: @ 81C4F4E +Movement_JumpInPlaceUp: @ 81C4F4E jump_in_place_up step_end -Movement_1C4F50:: @ 81C4F50 +Movement_JumpInPlaceLeft: @ 81C4F50 jump_in_place_left step_end -Movement_1C4F52:: @ 81C4F52 +Movement_JumpInPlaceRight: @ 81C4F52 jump_in_place_right step_end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 6a7ed3d2d..b409a8af9 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,116 +1,118 @@ -PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 +.equ GAVE_PROFILE, VAR_TEMP_1 + +MysteryEventClub_EventScript_Man:: @ 81BEE16 lock faceplayer - compare VAR_TEMP_1, 1 - goto_if_eq EventScript_1BEE3A - goto_if_set FLAG_SYS_SET_TRAINER_CARD_PROFILE, EventScript_1BEECD - msgbox Text_1BEF88 - goto EventScript_1BEE44 + compare GAVE_PROFILE, TRUE + goto_if_eq EventScript_AlreadyGaveProfile + goto_if_set FLAG_SYS_SET_TRAINER_CARD_PROFILE, EventScript_GivenProfileBefore + msgbox Text_IdLoveToHearYourProfile + goto EventScript_AskForProfile end -EventScript_1BEE3A:: @ 81BEE3A - msgbox gUnknown_81BF36A +EventScript_AlreadyGaveProfile: @ 81BEE3A + msgbox Text_TellMoreNextTime release end -EventScript_1BEE44:: @ 81BEE44 - message Text_1BF017 +EventScript_AskForProfile: @ 81BEE44 + message Text_TellMeWhatsYourProfile waitmessage multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE switch VAR_RESULT - case 0, EventScript_1BEE8F - case 1, EventScript_1BEEC3 - case 2, EventScript_1BEE81 - case SCR_MENU_CANCEL, EventScript_1BEEC3 + case 0, EventScript_AcceptGiveProfile + case 1, EventScript_DeclineGiveProfile + case 2, EventScript_ProfileInfo + case SCR_MENU_CANCEL, EventScript_DeclineGiveProfile end -EventScript_1BEE81:: @ 81BEE81 - msgbox gUnknown_81BF053 - goto EventScript_1BEE44 +EventScript_ProfileInfo: @ 81BEE81 + msgbox Text_ExplainProfile + goto EventScript_AskForProfile end -EventScript_1BEE8F:: @ 81BEE8F - msgbox gUnknown_81BF166 +EventScript_AcceptGiveProfile: @ 81BEE8F + msgbox Text_WhatsYourProfile closemessage - goto EventScript_1BEF5A + goto EventScript_GiveProfile end -EventScript_1BEE9E:: @ 81BEE9E - msgbox gUnknown_81BF1B2 +EventScript_CancelGiveProfile: @ 81BEE9E + msgbox Text_DecidedNotTo release end -EventScript_1BEEA8:: @ 81BEEA8 - setvar VAR_TEMP_1, 1 +EventScript_GaveProfile: @ 81BEEA8 + setvar GAVE_PROFILE, TRUE setvar VAR_0x8004, 0 special Special_BufferEasyChatMessage waitmessage delay 80 - msgbox gUnknown_81BF28E + msgbox Text_ProfileSaysSomethingAboutYou release end -EventScript_1BEEC3:: @ 81BEEC3 - msgbox gUnknown_81BF17B +EventScript_DeclineGiveProfile: @ 81BEEC3 + msgbox Text_DontBeLikeThat release end -EventScript_1BEECD:: @ 81BEECD - msgbox gUnknown_81BF1E8 - goto EventScript_1BEEDB +EventScript_GivenProfileBefore: @ 81BEECD + msgbox Text_HiWeMeetAgain + goto EventScript_AskForNewProfile end -EventScript_1BEEDB:: @ 81BEEDB - message Text_1BF1FB +EventScript_AskForNewProfile: @ 81BEEDB + message Text_ChangeYourProfile waitmessage multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE switch VAR_RESULT - case 0, EventScript_1BEF26 - case 1, EventScript_1BEF35 - case 2, EventScript_1BEF18 - case SCR_MENU_CANCEL, EventScript_1BEF35 + case 0, EventScript_AcceptGiveNewProfile + case 1, EventScript_DeclineGiveNewProfile + case 2, EventScript_ProfileInfo2 + case SCR_MENU_CANCEL, EventScript_DeclineGiveNewProfile end -EventScript_1BEF18:: @ 81BEF18 - msgbox gUnknown_81BF053 - goto EventScript_1BEEDB +EventScript_ProfileInfo2: @ 81BEF18 + msgbox Text_ExplainProfile + goto EventScript_AskForNewProfile end -EventScript_1BEF26:: @ 81BEF26 - msgbox gUnknown_81BF222 +EventScript_AcceptGiveNewProfile: @ 81BEF26 + msgbox Text_WhatAreYouLikeNow closemessage - goto EventScript_1BEF5A + goto EventScript_GiveProfile end -EventScript_1BEF35:: @ 81BEF35 - msgbox gUnknown_81BF252 +EventScript_DeclineGiveNewProfile: @ 81BEF35 + msgbox Text_LikeProfileWayItIs release end -EventScript_1BEF3F:: @ 81BEF3F - setvar VAR_TEMP_1, 1 +EventScript_GaveSpecialProfile: @ 81BEF3F + setvar GAVE_PROFILE, TRUE setvar VAR_0x8004, 0 special Special_BufferEasyChatMessage waitmessage delay 80 - msgbox gUnknown_81BF30D + msgbox Text_HeardThatBefore release end -EventScript_1BEF5A:: @ 81BEF5A +EventScript_GiveProfile: @ 81BEF5A setvar VAR_0x8004, 0 call EventScript_1A6AC0 lock faceplayer compare VAR_0x8004, 0 - goto_if_eq EventScript_1BEF3F - compare VAR_RESULT, 0 - goto_if_eq EventScript_1BEE9E - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BEEA8 + goto_if_eq EventScript_GaveSpecialProfile + compare VAR_RESULT, FALSE + goto_if_eq EventScript_CancelGiveProfile + compare VAR_RESULT, TRUE + goto_if_eq EventScript_GaveProfile end -Text_1BEF88:: @ 81BEF88 +Text_IdLoveToHearYourProfile: @ 81BEF88 .string "Hi, glad to meet you!\p" .string "…That's unfriendly of you.\n" .string "How about saying hi back?\p" @@ -118,11 +120,11 @@ Text_1BEF88:: @ 81BEF88 .string "yourself.\p" .string "I'd love to hear your profile!$" -Text_1BF017:: @ 81BF017 +Text_TellMeWhatsYourProfile: @ 81BF017 .string "Tell me something good about\n" .string "yourself. What's your profile?$" -gUnknown_81BF053:: @ 81BF053 +Text_ExplainProfile: @ 81BF053 .string "A profile is written using four\n" .string "words or phrases.\p" .string "There're plenty of words to choose\n" @@ -134,46 +136,46 @@ gUnknown_81BF053:: @ 81BF053 .string "…It's easier than it sounds.\n" .string "Why don't you try it?$" -gUnknown_81BF166:: @ 81BF166 +Text_WhatsYourProfile: @ 81BF166 .string "What's your profile?$" -gUnknown_81BF17B:: @ 81BF17B +Text_DontBeLikeThat: @ 81BF17B .string "Aww… Don't be like that.\n" .string "You can tell me your profile.$" -gUnknown_81BF1B2:: @ 81BF1B2 +Text_DecidedNotTo: @ 81BF1B2 .string "Oh, you've decided not to?\n" .string "You're fickle, aren't you?$" -gUnknown_81BF1E8:: @ 81BF1E8 +Text_HiWeMeetAgain: @ 81BF1E8 .string "Hi!\n" .string "We meet again!$" -Text_1BF1FB:: @ 81BF1FB +Text_ChangeYourProfile: @ 81BF1FB .string "Would you like to change your\n" .string "profile?$" -gUnknown_81BF222:: @ 81BF222 +Text_WhatAreYouLikeNow: @ 81BF222 .string "What are you like now?\n" .string "I'd really like to know.$" -gUnknown_81BF252:: @ 81BF252 +Text_LikeProfileWayItIs: @ 81BF252 .string "Okay, you like your profile the\n" .string "way it is.\p" .string "I think so, too.$" -gUnknown_81BF28E:: @ 81BF28E +Text_ProfileSaysSomethingAboutYou: @ 81BF28E .string "Hmhm…\p" .string "Your profile really says something\n" .string "about who you are.\p" .string "Now that I know you better, it \n" .string "makes us better friends than ever!$" -gUnknown_81BF30D:: @ 81BF30D +Text_HeardThatBefore: @ 81BF30D .string "Oh, I've heard that before…\p" .string "My cousin, who lives far away,\n" .string "always used to say that, I think.$" -gUnknown_81BF36A:: @ 81BF36A +Text_TellMoreNextTime: @ 81BF36A .string "Please tell me more about\n" .string "yourself next time!$" diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index cd5790cd0..ff61d2e2e 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -31,9 +31,9 @@ EventScript_ChoosePCMenu:: @ 81A69A8 case 0, EventScript_AccessPokemonStorage case 1, EventScript_AccessPlayersPC case 2, EventScript_AccessProfOaksPC - case 3, EventScript_1A6A56 - case 4, EventScript_1A6A46 - case SCR_MENU_CANCEL, EventScript_1A6A46 + case 3, EventScript_AccessHallOfFame + case 4, EventScript_TurnOffPC + case SCR_MENU_CANCEL, EventScript_TurnOffPC end EventScript_AccessPlayersPC:: @ 81A69F0 @@ -46,8 +46,8 @@ EventScript_AccessPlayersPC:: @ 81A69F0 EventScript_AccessPokemonStorage:: @ 81A6A05 playse SE_PC_LOGIN - call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A6A34 - call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A6A3D + call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_AccessSomeonesPC + call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_AccessBillsPC msgbox Text_OpenedPkmnStorage special ShowPokemonStorageSystem waitstate @@ -56,15 +56,15 @@ EventScript_AccessPokemonStorage:: @ 81A6A05 goto EventScript_PCMainMenu end -EventScript_1A6A34:: @ 81A6A34 +EventScript_AccessSomeonesPC:: @ 81A6A34 msgbox Text_AccessedSomeonesPC return -EventScript_1A6A3D:: @ 81A6A3D +EventScript_AccessBillsPC:: @ 81A6A3D msgbox Text_AccessedBillsPC return -EventScript_1A6A46:: @ 81A6A46 +EventScript_TurnOffPC:: @ 81A6A46 setvar VAR_0x8004, 0 playse SE_PC_OFF special Special_AnimatePcTurnOff @@ -72,8 +72,8 @@ EventScript_1A6A46:: @ 81A6A46 releaseall end -EventScript_1A6A56:: @ 81A6A56 - goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A6A46 +EventScript_AccessHallOfFame:: @ 81A6A56 + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC playse SE_PC_LOGIN setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable @@ -85,14 +85,14 @@ EventScript_1A6A56:: @ 81A6A56 end EventScript_AccessProfOaksPC:: @ 81A6A7A - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1A6A46 + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_TurnOffPC playse SE_PC_LOGIN msgbox Text_AccessedProfOaksPC msgbox Text_HavePokedexRated, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_ExitOaksPC setflag FLAG_OAKS_RATING_IS_VIA_PC - call EventScript_1A73E0 + call ProfOak_EventScript_RatePokedex clearflag FLAG_OAKS_RATING_IS_VIA_PC goto EventScript_ExitOaksPC end diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 7fa2b0d46..cd92dad8a 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -45,7 +45,7 @@ EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC EventScript_PkmnCenterNurse_ReturnPkmn:: @ 81A661D message Text_RestoredPkmnToFullHealth waitmessage - applymovement VAR_LAST_TALKED, Movement_1A666C + applymovement VAR_LAST_TALKED, Movement_Bow waitmovement 0 msgbox Text_WeHopeToSeeYouAgain return @@ -56,7 +56,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: @ 81A6636 setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER message Text_PlayerIsPlayingRightNowGoForIt waitmessage - applymovement VAR_LAST_TALKED, Movement_1A666C + applymovement VAR_LAST_TALKED, Movement_Bow waitmovement 0 msgbox Text_WeHopeToSeeYouAgain return @@ -65,7 +65,7 @@ EventScript_PkmnCenterNurse_Goodbye:: @ 81A6663 msgbox Text_WeHopeToSeeYouAgain return -Movement_1A666C:: @ 81A666C +Movement_Bow:: @ 81A666C nurse_joy_bow delay_4 step_end diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 3eb741441..c9d836aee 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,42 +1,42 @@ -EventScript_1A737B:: @ 81A737B +ProfOak_EventScript_RatePokedexInPerson:: @ 81A737B special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 - call_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_1A73A4 - call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, EventScript_1A73AD - call EventScript_1A73E0 + call_if_set FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_DexCompleteIntro + call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_NormalIntro + call ProfOak_EventScript_RatePokedex return -EventScript_1A73A4:: @ 81A73A4 - msgbox Text_1A72F2 +ProfOak_EventScript_DexCompleteIntro:: @ 81A73A4 + msgbox Text_LoveSeeingYourPokedex return -EventScript_1A73AD:: @ 81A73AD - msgbox gUnknown_81A6C51 +ProfOak_EventScript_NormalIntro:: @ 81A73AD + msgbox Text_HowIsPokedexComingAlong return -EventScript_1A73B6:: @ 81A73B6 +ProfOak_EventScript_ShowRatingMsg:: @ 81A73B6 copyvar VAR_0x8004, VAR_0x8009 special Special_GetProfOaksRatingMessage waitmessage - compare VAR_RESULT, 0 - call_if_eq EventScript_1A73D8 - compare VAR_RESULT, 1 - call_if_eq EventScript_1A73DC + compare VAR_RESULT, FALSE + call_if_eq ProfOak_EventScript_RatingFanfare + compare VAR_RESULT, TRUE + call_if_eq ProfOak_EventScript_DexCompleteFanfare waitfanfare waitbuttonpress return -EventScript_1A73D8:: @ 81A73D8 +ProfOak_EventScript_RatingFanfare:: @ 81A73D8 playfanfare MUS_FAN2 return -EventScript_1A73DC:: @ 81A73DC +ProfOak_EventScript_DexCompleteFanfare:: @ 81A73DC playfanfare MUS_FANFA5 return -EventScript_1A73E0:: @ 81A73E0 +ProfOak_EventScript_RatePokedex:: @ 81A73E0 setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable special Special_SetSomeVariable @@ -45,42 +45,42 @@ EventScript_1A73E0:: @ 81A73E0 copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x800A, VAR_RESULT - getnumberstring 0, VAR_0x8008 - getnumberstring 1, VAR_0x8009 - msgbox Text_1A6CA3 - call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, EventScript_1A746D - call EventScript_1A73B6 - compare VAR_0x800A, 0 - goto_if_eq EventScript_1A748F + getnumberstring 0, VAR_0x8008 @ Num Kanto Seen + getnumberstring 1, VAR_0x8009 @ Num Kanto Caught + msgbox Text_YouveSeenXAndOwnedYMons + call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, ProfOak_EventScript_SetTextColor + call ProfOak_EventScript_ShowRatingMsg + compare VAR_0x800A, FALSE + goto_if_eq ProfOak_EventScript_EndRatePokedex @ National Dex not enabled setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 - getnumberstring 0, VAR_0x8008 - getnumberstring 1, VAR_0x8009 - msgbox Text_1A71AA + getnumberstring 0, VAR_0x8008 @ Num National Seen + getnumberstring 1, VAR_0x8009 @ Num National Caught + msgbox Text_AndNationalDexSeenXOwnedY specialvar VAR_RESULT, HasAllMons - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A7470 - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A747E + compare VAR_RESULT, FALSE + goto_if_eq ProfOak_EventScript_DexIncomplete + compare VAR_RESULT, TRUE + goto_if_eq ProfOak_EventScript_DexComplete end -EventScript_1A746D:: @ 81A746D +ProfOak_EventScript_SetTextColor:: @ 81A746D textcolor 0 return -EventScript_1A7470:: @ 81A7470 - msgbox Text_1A71EE - goto EventScript_1A748F +ProfOak_EventScript_DexIncomplete:: @ 81A7470 + msgbox Text_LookForwardToFilledNationalDex + goto ProfOak_EventScript_EndRatePokedex end -EventScript_1A747E:: @ 81A747E +ProfOak_EventScript_DexComplete:: @ 81A747E setflag FLAG_OAK_SAW_DEX_COMPLETION - msgbox Text_1A722F - goto EventScript_1A748F + msgbox Text_YouveCompletedDex + goto ProfOak_EventScript_EndRatePokedex end -EventScript_1A748F:: @ 81A748F +ProfOak_EventScript_EndRatePokedex:: @ 81A748F special HelpSystem_RestoreSomeVariable return diff --git a/data/scripts/pokemon_mansion.inc b/data/scripts/pokemon_mansion.inc new file mode 100644 index 000000000..cb0931600 --- /dev/null +++ b/data/scripts/pokemon_mansion.inc @@ -0,0 +1,207 @@ +EventScript_1A7AE2:: @ 81A7AE2 + msgbox Text_177460, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq EventScript_1A7B70 + msgbox Text_17747B + goto_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B3B + setflag FLAG_POKEMON_MANSION_SWITCH_STATE + switch VAR_0x8004 + case 0, EventScript_1A7B7A + case 1, EventScript_1A7D3E + case 2, EventScript_1A7E72 + case 3, EventScript_1A7F4C + end + +EventScript_1A7B3B:: @ 81A7B3B + clearflag FLAG_POKEMON_MANSION_SWITCH_STATE + switch VAR_0x8004 + case 0, EventScript_1A7C5C + case 1, EventScript_1A7DD8 + case 2, EventScript_1A7EDF + case 3, EventScript_1A8025 + end + +EventScript_1A7B70:: @ 81A7B70 + msgbox Text_177489 + releaseall + end + +EventScript_1A7B7A:: @ 81A7B7A + setmetatile 22, 10, 645, 0 + setmetatile 23, 10, 644, 0 + setmetatile 24, 10, 644, 0 + setmetatile 22, 11, 645, 0 + setmetatile 23, 11, 644, 0 + setmetatile 24, 11, 644, 0 + setmetatile 27, 25, 645, 0 + setmetatile 28, 25, 644, 0 + setmetatile 29, 25, 644, 0 + setmetatile 27, 26, 645, 0 + setmetatile 28, 26, 644, 0 + setmetatile 29, 26, 644, 0 + setmetatile 32, 25, 645, 0 + setmetatile 33, 25, 644, 0 + setmetatile 34, 25, 644, 0 + setmetatile 32, 26, 645, 0 + setmetatile 33, 26, 644, 0 + setmetatile 34, 26, 644, 0 + setmetatile 31, 18, 760, 1 + setmetatile 32, 18, 761, 1 + setmetatile 33, 18, 762, 1 + setmetatile 31, 19, 768, 1 + setmetatile 32, 19, 769, 1 + setmetatile 33, 19, 770, 1 + setmetatile 5, 4, 845, 0 + return + +EventScript_1A7C5C:: @ 81A7C5C + setmetatile 22, 10, 760, 1 + setmetatile 23, 10, 761, 1 + setmetatile 24, 10, 762, 1 + setmetatile 22, 11, 768, 1 + setmetatile 23, 11, 769, 1 + setmetatile 24, 11, 770, 1 + setmetatile 27, 25, 760, 1 + setmetatile 28, 25, 761, 1 + setmetatile 29, 25, 762, 1 + setmetatile 27, 26, 768, 1 + setmetatile 28, 26, 769, 1 + setmetatile 29, 26, 770, 1 + setmetatile 32, 25, 760, 1 + setmetatile 33, 25, 761, 1 + setmetatile 34, 25, 762, 1 + setmetatile 32, 26, 768, 1 + setmetatile 33, 26, 769, 1 + setmetatile 34, 26, 770, 1 + setmetatile 31, 18, 645, 0 + setmetatile 32, 18, 644, 0 + setmetatile 33, 18, 644, 0 + setmetatile 31, 19, 645, 0 + setmetatile 32, 19, 644, 0 + setmetatile 33, 19, 644, 0 + setmetatile 5, 4, 788, 0 + return + +EventScript_1A7D3E:: @ 81A7D3E + setmetatile 24, 14, 645, 0 + setmetatile 25, 14, 644, 0 + setmetatile 26, 14, 644, 0 + setmetatile 24, 15, 645, 0 + setmetatile 25, 15, 644, 0 + setmetatile 26, 15, 644, 0 + setmetatile 10, 28, 677, 1 + setmetatile 10, 29, 685, 1 + setmetatile 10, 30, 645, 0 + setmetatile 10, 31, 644, 0 + setmetatile 10, 32, 693, 0 + setmetatile 12, 4, 848, 1 + setmetatile 12, 5, 856, 1 + setmetatile 12, 6, 864, 1 + setmetatile 12, 7, 872, 1 + setmetatile 12, 8, 880, 1 + setmetatile 2, 15, 845, 0 + return + +EventScript_1A7DD8:: @ 81A7DD8 + setmetatile 24, 14, 760, 1 + setmetatile 25, 14, 761, 1 + setmetatile 26, 14, 762, 1 + setmetatile 24, 15, 768, 1 + setmetatile 25, 15, 769, 1 + setmetatile 26, 15, 770, 1 + setmetatile 10, 28, 848, 1 + setmetatile 10, 29, 856, 1 + setmetatile 10, 30, 864, 1 + setmetatile 10, 31, 872, 1 + setmetatile 10, 32, 880, 1 + setmetatile 12, 4, 677, 1 + setmetatile 12, 5, 685, 1 + setmetatile 12, 6, 645, 0 + setmetatile 12, 7, 644, 0 + setmetatile 12, 8, 693, 0 + setmetatile 2, 15, 788, 0 + return + +EventScript_1A7E72:: @ 81A7E72 + setmetatile 17, 11, 645, 0 + setmetatile 18, 11, 644, 0 + setmetatile 19, 11, 644, 0 + setmetatile 17, 12, 645, 0 + setmetatile 18, 12, 644, 0 + setmetatile 19, 12, 644, 0 + setmetatile 21, 4, 848, 1 + setmetatile 21, 5, 856, 1 + setmetatile 21, 6, 864, 1 + setmetatile 21, 7, 872, 1 + setmetatile 21, 8, 880, 1 + setmetatile 12, 4, 845, 0 + return + +EventScript_1A7EDF:: @ 81A7EDF + setmetatile 17, 11, 760, 1 + setmetatile 18, 11, 761, 1 + setmetatile 19, 11, 762, 1 + setmetatile 17, 12, 768, 1 + setmetatile 18, 12, 769, 1 + setmetatile 19, 12, 770, 1 + setmetatile 21, 4, 677, 1 + setmetatile 21, 5, 685, 1 + setmetatile 21, 6, 645, 0 + setmetatile 21, 7, 644, 0 + setmetatile 21, 8, 693, 0 + setmetatile 12, 4, 788, 0 + return + +EventScript_1A7F4C:: @ 81A7F4C + setmetatile 33, 20, 760, 1 + setmetatile 34, 20, 761, 1 + setmetatile 35, 20, 762, 1 + setmetatile 33, 21, 852, 1 + setmetatile 34, 21, 853, 1 + setmetatile 35, 21, 854, 1 + setmetatile 16, 26, 848, 1 + setmetatile 16, 27, 856, 1 + setmetatile 16, 28, 866, 1 + setmetatile 16, 29, 874, 1 + setmetatile 16, 30, 882, 1 + setmetatile 12, 8, 677, 1 + setmetatile 12, 9, 685, 1 + setmetatile 12, 10, 647, 0 + setmetatile 12, 11, 646, 0 + setmetatile 12, 12, 688, 0 + setmetatile 20, 22, 647, 0 + setmetatile 21, 22, 646, 0 + setmetatile 22, 22, 646, 0 + setmetatile 20, 23, 647, 0 + setmetatile 21, 23, 646, 0 + setmetatile 22, 23, 646, 0 + setmetatile 24, 28, 847, 0 + setmetatile 27, 4, 847, 0 + return + +EventScript_1A8025:: @ 81A8025 + setmetatile 33, 20, 647, 0 + setmetatile 34, 20, 646, 0 + setmetatile 35, 20, 646, 0 + setmetatile 33, 21, 647, 0 + setmetatile 34, 21, 646, 0 + setmetatile 35, 21, 646, 0 + setmetatile 16, 26, 677, 1 + setmetatile 16, 27, 685, 1 + setmetatile 16, 28, 647, 0 + setmetatile 16, 29, 646, 0 + setmetatile 16, 30, 688, 0 + setmetatile 12, 8, 848, 1 + setmetatile 12, 9, 856, 1 + setmetatile 12, 10, 866, 1 + setmetatile 12, 11, 874, 1 + setmetatile 12, 12, 882, 1 + setmetatile 20, 22, 760, 1 + setmetatile 21, 22, 761, 1 + setmetatile 22, 22, 762, 1 + setmetatile 20, 23, 852, 1 + setmetatile 21, 23, 853, 1 + setmetatile 22, 23, 854, 1 + setmetatile 24, 28, 790, 0 + setmetatile 27, 4, 790, 0 + return diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc index 1cc93c95d..db2ec60ec 100644 --- a/data/scripts/repel.inc +++ b/data/scripts/repel.inc @@ -1,6 +1,6 @@ EventScript_RepelWoreOff:: @ 81BFB65 - msgbox Text_1BFB6E, MSGBOX_SIGN + msgbox Text_RepelWoreOff, MSGBOX_SIGN end -Text_1BFB6E:: @ 81BFB6E +Text_RepelWoreOff:: @ 81BFB6E .string "REPEL's effect wore off…$" diff --git a/data/scripts/static_pokemon.inc b/data/scripts/static_pokemon.inc index 9b738ea19..5334688a3 100644 --- a/data/scripts/static_pokemon.inc +++ b/data/scripts/static_pokemon.inc @@ -1,23 +1,23 @@ -EventScript_1A922D:: @ 81A922D +EventScript_RemoveStaticMon:: @ 81A922D fadescreen FADE_TO_BLACK removeobject VAR_LAST_TALKED fadescreen FADE_FROM_BLACK release end -EventScript_1A9236:: @ 81A9236 +EventScript_MonFlewAway:: @ 81A9236 fadescreen FADE_TO_BLACK removeobject VAR_LAST_TALKED fadescreen FADE_FROM_BLACK getspeciesname 0, VAR_0x8004 - msgbox Text_1A63C4 + msgbox Text_MonFlewAway release end -EventScript_1A924B:: @ 81A924B - message Text_1853E8 +EventScript_AwakenSnorlax:: @ 81A924B + message Text_PlayedPokeFlute waitmessage playfanfare MUS_POKEFUE waitfanfare - msgbox Text_185354 + msgbox Text_SnorlaxWokeUp return diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc index 4c79f638b..d1605976e 100644 --- a/data/scripts/std_msgbox.inc +++ b/data/scripts/std_msgbox.inc @@ -30,34 +30,34 @@ Std_MsgboxYesNo:: @ 81A4E5C Std_ReceivedItem:: @ 81A4E66 textcolor 3 compare VAR_0x8002, MUS_FANFA1 - call_if_eq EventScript_1A4EA2 + call_if_eq EventScript_ReceivedItemFanfare1 compare VAR_0x8002, MUS_FAN5 - call_if_eq EventScript_1A4EA6 + call_if_eq EventScript_ReceivedItemFanfare2 message 0x0 waitmessage waitfanfare compare VAR_0x8002, MUS_FANFA1 - call_if_eq EventScript_1A4EAA + call_if_eq EventScript_ReceivedItemWaitFanfare putitemaway VAR_0x8000, VAR_0x8001 call EventScript_1A6675 return -EventScript_1A4EA2:: @ 81A4EA2 +EventScript_ReceivedItemFanfare1:: @ 81A4EA2 playfanfare MUS_FANFA1 return -EventScript_1A4EA6:: @ 81A4EA6 +EventScript_ReceivedItemFanfare2:: @ 81A4EA6 playfanfare MUS_FAN5 return -EventScript_1A4EAA:: @ 81A4EAA +EventScript_ReceivedItemWaitFanfare:: @ 81A4EAA delay 50 return EventScript_UnusedReturn:: @ 81A4EAE return -EventScript_1A4EAF:: @ 81A4EAF +EventScript_AskSaveGame:: @ 81A4EAF special Field_AskSaveTheGame waitstate return diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index edc11e317..456cad9e9 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -8,17 +8,17 @@ EventScript_UseSurf:: @ 81A6AC8 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT lockall - msgbox Text_1A556E, MSGBOX_YESNO + msgbox Text_WantToSurf, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_UseSurfRelease - msgbox Text_1A55A5 + msgbox Text_UsedSurf dofieldeffect FLDEFF_USE_SURF EventScript_UseSurfRelease:@ 81A6B0B releaseall EventScript_UseSurfEnd: @ 81A6B0C end -gUnknown_81A6B0D:: @ 81A6B0D +EventScript_CurrentTooFast:: @ 81A6B0D lockall msgbox Text_CurrentTooFast releaseall diff --git a/data/text/poke_mart.inc b/data/text/poke_mart.inc index de1a0596c..1b389642b 100644 --- a/data/text/poke_mart.inc +++ b/data/text/poke_mart.inc @@ -6,13 +6,13 @@ Text_FillOutQuestionnaire:: @ 81A622C .string "There is a questionnaire.\n" .string "Would you like to fill it out?$" -Text_1A6265:: @ 81A6265 +Text_QuestionnaireThankYou:: @ 81A6265 .string "Thank you for taking the time to\n" .string "fill out our questionnaire.\p" .string "Your feedback will be used for\n" .string "future reference.$" -Text_1A62D3:: @ 81A62D3 +Text_YouKnowThoseWords:: @ 81A62D3 .string "Oh, hello!\n" .string "You know those words?\p" .string "That means you must know about\n" @@ -20,10 +20,10 @@ Text_1A62D3:: @ 81A62D3 .string "From now on, you should be\n" .string "receiving MYSTERY GIFTS!$" -Text_1A6359:: @ 81A6359 +Text_YouCanAccessMysteryGift:: @ 81A6359 .string "Once you save your game, you can\n" .string "access the MYSTERY GIFT.$" -Text_1A6393:: @ 81A6393 +Text_ThankYouForAccessingMysteryGift:: @ 81A6393 .string "Thank you for accessing the\n" .string "MYSTERY GIFT System.$" diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index 461c29e26..306cd5225 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -1,9 +1,9 @@ -gUnknown_81A6C51:: @ 81A6C51 +Text_HowIsPokedexComingAlong:: @ 81A6C51 .string "OAK: Good to see you!\n" .string "How is your POKéDEX coming along?\p" .string "Here, let me take a look.$" -Text_1A6CA3:: @ 81A6CA3 +Text_YouveSeenXAndOwnedYMons:: @ 81A6CA3 .string "The amount of progress you've made\n" .string "on your POKéDEX is:\p" .string "{STR_VAR_1} POKéMON seen and\n" @@ -86,16 +86,16 @@ gUnknown_81A7175:: @ 81A7175 .string "Your POKéDEX is entirely complete!\n" .string "Congratulations!!$" -Text_1A71AA:: @ 81A71AA +Text_AndNationalDexSeenXOwnedY:: @ 81A71AA .string "And your NATIONAL POKéDEX is:\p" .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.$" -Text_1A71EE:: @ 81A71EE +Text_LookForwardToFilledNationalDex:: @ 81A71EE .string "I'll be looking forward to seeing\n" .string "you fill the NATIONAL POKéDEX!$" -Text_1A722F:: @ 81A722F +Text_YouveCompletedDex:: @ 81A722F .string "Finally…\p" .string "You've finally completed the\n" .string "POKéDEX!\p" @@ -113,7 +113,7 @@ gUnknown_81A72AD:: @ 81A72AD .string "Sincerely, thank you!\l" .string "You've made my dream a reality!$" -Text_1A72F2:: @ 81A72F2 +Text_LoveSeeingYourPokedex:: @ 81A72F2 .string "OAK: Ah, welcome!\p" .string "Tell me, how is your POKéDEX\n" .string "coming along?\p" diff --git a/data/text/save.inc b/data/text/save.inc index 4d459a7f3..23050f9f4 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -12,7 +12,7 @@ gText_SavingDontTurnOffThePower:: @ 81C5625 gText_PlayerSavedTheGame:: @ 81C5647 .string "{PLAYER} saved the game.$" -gUnknown_81C565A:: +gText_SaveFailed:: .string "セーブに　しっぱい　しました‥$" gText_DifferentGameFile:: @ 81C566A diff --git a/data/text/surf.inc b/data/text/surf.inc index 177a70491..ce9d9ee50 100644 --- a/data/text/surf.inc +++ b/data/text/surf.inc @@ -1,8 +1,8 @@ -Text_1A556E:: @ 81A556E +Text_WantToSurf:: @ 81A556E .string "The water is dyed a deep blue…\n" .string "Would you like to SURF?$" -Text_1A55A5:: @ 81A55A5 +Text_UsedSurf:: @ 81A55A5 .string "{STR_VAR_1} used SURF!$" Text_CurrentTooFast:: @ 81A55B3 diff --git a/include/constants/flags.h b/include/constants/flags.h index 8e7a6a694..982c90fcc 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -722,7 +722,7 @@ #define FLAG_TUTOR_THUNDER_WAVE 0x2C1 #define FLAG_TUTOR_ROCK_SLIDE 0x2C2 #define FLAG_TUTOR_EXPLOSION 0x2C3 -#define FLAG_TUTOR_META_PUNCH 0x2C4 +#define FLAG_TUTOR_MEGA_PUNCH 0x2C4 #define FLAG_TUTOR_MEGA_KICK 0x2C5 #define FLAG_TUTOR_DREAM_EATER 0x2C6 #define FLAG_TUTOR_SOFT_BOILED 0x2C7 diff --git a/include/constants/vars.h b/include/constants/vars.h index 164ac7c7b..de03ab6ee 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -52,7 +52,7 @@ #define VAR_FRIENDSHIP_STEP_COUNT 0x4021 // Maybe unused? -#define VAR_ICE_STEP_COUNT 0x4022 +#define VAR_0x4022 0x4022 // Step counter. Caps at 1500. If you enter a map with // renewable hidden items and this counter is capped, @@ -89,7 +89,7 @@ #define VAR_0x402F 0x402F -#define VAR_0x4030 0x4030 +#define VAR_ICE_STEP_COUNT 0x4030 #define VAR_STARTER_MON 0x4031 #define VAR_0x4032 0x4032 #define VAR_ENIGMA_BERRY_AVAILABLE 0x4033 diff --git a/src/event_data.c b/src/event_data.c index 9291c06aa..010a4414c 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -213,7 +213,7 @@ static bool8 IsFlagOrVarStoredInQuestLog(u16 idx, bool8 isVar) } else { - if (idx < VAR_0x4030 - VARS_START) + if (idx < VAR_ICE_STEP_COUNT - VARS_START) return FALSE; if (idx >= VAR_MAP_SCENE_PALLET_TOWN_OAK - VARS_START && idx < VAR_PORTHOLE - VARS_START) return FALSE; diff --git a/src/field_tasks.c b/src/field_tasks.c index e39009a2e..67717c567 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -268,7 +268,7 @@ static void CrackedFloorPerStepCallback(u8 taskId) if (MetatileBehavior_ReturnFalse_13(behavior)) { if (GetPlayerSpeed() != 4) - VarSet(VAR_0x4030, 0); + VarSet(VAR_ICE_STEP_COUNT, 0); if (data[4] == 0) { From 388c40575de92923b576e37a97729c27f292b67f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 15:18:53 -0500 Subject: [PATCH 15/20] Sync Birth Island / Navel Rock scripts --- data/event_scripts.s | 4 +- data/maps/BirthIsland_Exterior/map.json | 2 +- data/maps/BirthIsland_Exterior/scripts.inc | 54 +++++++++--------- data/maps/BirthIsland_Harbor/map.json | 2 +- data/maps/BirthIsland_Harbor/scripts.inc | 10 ++-- data/maps/CeruleanCave_B1F/scripts.inc | 2 +- data/maps/FiveIsland_Harbor/scripts.inc | 2 +- .../FiveIsland_RocketWarehouse/scripts.inc | 2 +- data/maps/FourIsland_Harbor/scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 2 +- data/maps/MtEmber_Summit/scripts.inc | 2 +- data/maps/NavelRock_Base/map.json | 2 +- data/maps/NavelRock_Base/scripts.inc | 48 ++++++++-------- data/maps/NavelRock_Harbor/map.json | 2 +- data/maps/NavelRock_Harbor/scripts.inc | 11 ++-- data/maps/NavelRock_Summit/map.json | 2 +- data/maps/NavelRock_Summit/scripts.inc | 56 +++++++++---------- data/maps/OneIsland/text.inc | 2 +- data/maps/OneIsland_Harbor/scripts.inc | 2 +- data/maps/PalletTown/scripts.inc | 4 +- data/maps/PowerPlant/scripts.inc | 2 +- data/maps/SeafoamIslands_B4F/scripts.inc | 2 +- data/maps/SevenIsland_Harbor/scripts.inc | 2 +- data/maps/SixIsland_Harbor/scripts.inc | 2 +- data/maps/ThreeIsland_Harbor/scripts.inc | 2 +- data/maps/TwoIsland_Harbor/scripts.inc | 2 +- data/maps/VermilionCity/scripts.inc | 16 +++--- data/maps/VermilionCity_Gym/scripts.inc | 2 +- data/maps/ViridianCity/scripts.inc | 12 ++-- data/scripts/seagallop.inc | 34 +++++------ data/specials.inc | 2 +- src/field_specials.c | 8 +-- 33 files changed, 151 insertions(+), 152 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 4bf0b0598..ff8e1715f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1555,7 +1555,7 @@ gUnknown_81A77A0:: @ 81A77A0 msgbox Text_BagItemCanBeRegistered, MSGBOX_SIGN end -EventScript_1A77A9:: @ 81A77A9 +EventScript_Return:: @ 81A77A9 return EventScript_1A77AA:: @ 81A77AA @@ -1941,7 +1941,7 @@ EventScript_1A8EC0:: @ 81A8EC0 .include "data/scripts/static_pokemon.inc" EventScript_1A925E:: @ 81A925E - goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_1A77A9 + goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return setweather 11 doweather return diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 563f45333..a00613e92 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BirthIsland_Exterior_EventScript_165271", + "script": "BirthIsland_Exterior_EventScript_Triangle", "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index f0843ae01..2b13d4440 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -13,61 +13,61 @@ BirthIsland_Exterior_OnTransition:: @ 8165217 setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 setvar VAR_DEOXYS_INTERACTION_NUM, 0 - call_if_set FLAG_FOUGHT_DEOXYS, EventScript_16523C - call_if_unset FLAG_FOUGHT_DEOXYS, EventScript_165243 + call_if_set FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle + call_if_unset FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle end -EventScript_16523C:: @ 816523C +BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: @ 816523C setflag FLAG_HIDE_DEOXYS setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE return -EventScript_165243:: @ 8165243 - goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_1A77A9 +BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: @ 8165243 + goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_Return clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE clearflag FLAG_SYS_DEOXYS_AWAKENED return BirthIsland_Exterior_OnResume:: @ 8165253 - call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_16525D + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, BirthIsland_Exterior_EventScript_TryRemoveDeoxys end -EventScript_16525D:: @ 816525D +BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if_ne EventScript_1A77A9 + goto_if_ne EventScript_Return removeobject 2 return -BirthIsland_Exterior_EventScript_165271:: @ 8165271 +BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 lock faceplayer special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 - special Special_DeoxysSound + special DoDeoxysRockInteraction waitstate switch VAR_RESULT - case 0, EventScript_1652BA - case 1, EventScript_1652BC - case 2, EventScript_1652C0 - case 3, EventScript_1652BE + case 0, BirthIsland_Exterior_EventScript_NotSolved1 + case 1, BirthIsland_Exterior_EventScript_NotSolved2 + case 2, BirthIsland_Exterior_EventScript_Deoxys + case 3, BirthIsland_Exterior_EventScript_NotSolved3 end -EventScript_1652BA:: @ 81652BA +BirthIsland_Exterior_EventScript_NotSolved1:: @ 81652BA release end -EventScript_1652BC:: @ 81652BC +BirthIsland_Exterior_EventScript_NotSolved2:: @ 81652BC release end -EventScript_1652BE:: @ 81652BE +BirthIsland_Exterior_EventScript_NotSolved3:: @ 81652BE release end -EventScript_1652C0:: @ 81652C0 +BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 addobject 2 waitse setfieldeffectarg 0, 1 @@ -76,7 +76,7 @@ EventScript_1652C0:: @ 81652C0 dofieldeffect 68 playbgm MUS_DEOEYE, 0 waitfieldeffect 68 - applymovement 2, Movement_165353 + applymovement 2, Movement_DeoxysApproach waitmovement 0 waitse playmoncry SPECIES_DEOXYS, 2 @@ -84,8 +84,8 @@ EventScript_1652C0:: @ 81652C0 waitmoncry setvar VAR_LAST_TALKED, 2 setvar VAR_0x8004, SPECIES_DEOXYS - setvar VAR_0x8005, 30 - setvar VAR_0x8006, 0 + setvar VAR_0x8005, 30 @ Level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special Special_StartLegendaryBattle @@ -93,27 +93,27 @@ EventScript_1652C0:: @ 81652C0 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq EventScript_16533A + goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq EventScript_165348 + goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq EventScript_165348 + goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys setflag FLAG_FOUGHT_DEOXYS release end -EventScript_16533A:: @ 816533A +BirthIsland_Exterior_EventScript_DefeatedDeoxys:: @ 816533A setflag FLAG_DEOXYS_FLEW_AWAY setvar VAR_0x8004, SPECIES_DEOXYS goto EventScript_MonFlewAway end -EventScript_165348:: @ 8165348 +BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8165348 setvar VAR_0x8004, SPECIES_DEOXYS goto EventScript_MonFlewAway end -Movement_165353:: @ 8165353 +Movement_DeoxysApproach: @ 8165353 walk_slowest_down walk_slowest_down walk_slowest_down diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index f8c4be078..0feaa5fe5 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BirthIsland_Harbor_EventScript_1653E7", + "script": "BirthIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 6df635f1a..0d7cdf80b 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -1,15 +1,15 @@ BirthIsland_Harbor_MapScripts:: @ 81653E6 .byte 0 -BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 +BirthIsland_Harbor_EventScript_Sailor:: @ 81653E7 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT - case 0, EventScript_1A91D5 - case 1, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 0, EventScript_SailToVermilionCity + case 1, EventScript_CancelSail + case 127, EventScript_CancelSail end diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index e896c8372..874bfce06 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -10,7 +10,7 @@ CeruleanCave_B1F_OnResume:: @ 81624C9 EventScript_1624D3:: @ 81624D3 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if_ne EventScript_1A77A9 + goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc index 9ab26aa3a..71f305d0b 100644 --- a/data/maps/FiveIsland_Harbor/scripts.inc +++ b/data/maps/FiveIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_Harbor_MapScripts:: @ 8171D42 FiveIsland_Harbor_EventScript_171D43:: @ 8171D43 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND goto EventScript_1A900F diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index aa54456f0..8382d4a72 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -139,7 +139,7 @@ EventScript_1640A2:: @ 81640A2 EventScript_16412E:: @ 816412E compare VAR_0x8004, 27 - goto_if_eq EventScript_1A77A9 + goto_if_eq EventScript_Return applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc index b9c632972..39d98de68 100644 --- a/data/maps/FourIsland_Harbor/scripts.inc +++ b/data/maps/FourIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ FourIsland_Harbor_MapScripts:: @ 8171C98 FourIsland_Harbor_EventScript_171C99:: @ 8171C99 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND goto EventScript_1A900F diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 044f821a0..d3f100d76 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -154,10 +154,10 @@ EventScript_16D457:: @ 816D457 EventScript_16D462:: @ 816D462 getpartysize compare VAR_RESULT, PARTY_SIZE - goto_if_ne EventScript_1A77A9 + goto_if_ne EventScript_Return specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon compare VAR_RESULT, 1 - goto_if_eq EventScript_1A77A9 + goto_if_eq EventScript_Return msgbox gUnknown_81BFEAC goto EventScript_16D49A end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 1ba5b7380..13491fce9 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -11,7 +11,7 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 end EventScript_16EA79:: @ 816EA79 - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1A77A9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return setobjectxyperm 4, 4, 2 return diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 7614cfd9a..76261b037 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -10,7 +10,7 @@ MtEmber_Summit_OnResume:: @ 8163B07 EventScript_163B11:: @ 8163B11 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if_ne EventScript_1A77A9 + goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index f483a5f85..656956abc 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "NavelRock_Base_EventScript_165134", + "script": "NavelRock_Base_EventScript_Lugia", "flag": "FLAG_HIDE_LUGIA" } ], diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index c7fcd191a..4a844fe12 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -4,31 +4,31 @@ NavelRock_Base_MapScripts:: @ 81650E7 .byte 0 NavelRock_Base_OnTransition:: @ 81650F2 - call_if_set FLAG_FOUGHT_LUGIA, EventScript_165105 - call_if_unset FLAG_FOUGHT_LUGIA, EventScript_165109 + call_if_set FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_HideLugia + call_if_unset FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_TryShowLugia end -EventScript_165105:: @ 8165105 +NavelRock_Base_EventScript_HideLugia:: @ 8165105 setflag FLAG_HIDE_LUGIA return -EventScript_165109:: @ 8165109 - goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_1A77A9 +NavelRock_Base_EventScript_TryShowLugia:: @ 8165109 + goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_Return clearflag FLAG_HIDE_LUGIA return NavelRock_Base_OnResume:: @ 8165116 - call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_165120 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, NavelRock_Base_EventScript_TryRemoveLugia end -EventScript_165120:: @ 8165120 +NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if_ne EventScript_1A77A9 + goto_if_ne EventScript_Return removeobject 1 return -NavelRock_Base_EventScript_165134:: @ 8165134 +NavelRock_Base_EventScript_Lugia:: @ 8165134 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -38,17 +38,17 @@ NavelRock_Base_EventScript_165134:: @ 8165134 waitse delay 20 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 + setvar VAR_0x8004, 0 @ Vertical pan + setvar VAR_0x8005, 3 @ Horizontal pan + setvar VAR_0x8006, 4 @ Num shakes + setvar VAR_0x8007, 2 @ Shake delay special Special_ShakeScreen delay 30 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 + setvar VAR_0x8004, 0 @ Vertical pan + setvar VAR_0x8005, 3 @ Horizontal pan + setvar VAR_0x8006, 4 @ Num shakes + setvar VAR_0x8007, 2 @ Shake delay special Special_ShakeScreen delay 30 delay 50 @@ -57,8 +57,8 @@ NavelRock_Base_EventScript_165134:: @ 8165134 waitmoncry delay 20 setvar VAR_0x8004, SPECIES_LUGIA - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8005, 70 @ Level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special Special_StartLegendaryBattle @@ -66,22 +66,22 @@ NavelRock_Base_EventScript_165134:: @ 8165134 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq EventScript_1651D9 + goto_if_eq NavelRock_Base_EventScript_DefeatedLugia compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq EventScript_1651E7 + goto_if_eq NavelRock_Base_EventScript_RanFromLugia compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq EventScript_1651E7 + goto_if_eq NavelRock_Base_EventScript_RanFromLugia setflag FLAG_FOUGHT_LUGIA release end -EventScript_1651D9:: @ 81651D9 +NavelRock_Base_EventScript_DefeatedLugia:: @ 81651D9 setflag FLAG_LUGIA_FLEW_AWAY setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_MonFlewAway end -EventScript_1651E7:: @ 81651E7 +NavelRock_Base_EventScript_RanFromLugia:: @ 81651E7 setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_MonFlewAway end diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 334886745..c19fdb1a0 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "NavelRock_Harbor_EventScript_165421", + "script": "NavelRock_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 60832d168..facc302f1 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -1,16 +1,15 @@ - NavelRock_Harbor_MapScripts:: @ 8165420 .byte 0 -NavelRock_Harbor_EventScript_165421:: @ 8165421 +NavelRock_Harbor_EventScript_Sailor:: @ 8165421 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT - case 0, EventScript_1A91D5 - case 1, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 0, EventScript_SailToVermilionCity + case 1, EventScript_CancelSail + case 127, EventScript_CancelSail end diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 669097ef3..11808290f 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -44,7 +44,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "NavelRock_Summit_EventScript_164FFB" + "script": "NavelRock_Summit_EventScript_HoOh" } ], "bg_events": [ diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 7cbeb764f..97eb64ff2 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -4,34 +4,34 @@ NavelRock_Summit_MapScripts:: @ 8164F9F .byte 0 NavelRock_Summit_OnTransition:: @ 8164FAA - call_if_set FLAG_FOUGHT_HO_OH, EventScript_164FBD - call_if_unset FLAG_FOUGHT_HO_OH, EventScript_164FC6 + call_if_set FLAG_FOUGHT_HO_OH, NavelRock_Summit_EventScript_HideHoOh + call_if_unset FLAG_FOUGHT_HO_OH, NavelRock_Summit_EventScript_TryShowHoOh end -EventScript_164FBD:: @ 8164FBD +NavelRock_Summit_EventScript_HideHoOh:: @ 8164FBD setvar VAR_TEMP_1, 1 setflag FLAG_HIDE_HO_OH return -EventScript_164FC6:: @ 8164FC6 +NavelRock_Summit_EventScript_TryShowHoOh:: @ 8164FC6 setvar VAR_TEMP_1, 1 - goto_if_set FLAG_HO_OH_FLEW_AWAY, EventScript_1A77A9 + goto_if_set FLAG_HO_OH_FLEW_AWAY, EventScript_Return setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return NavelRock_Summit_OnResume:: @ 8164FDD - call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_164FE7 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, NavelRock_Summit_EventScript_TryRemoveHoOh end -EventScript_164FE7:: @ 8164FE7 +NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if_ne EventScript_1A77A9 + goto_if_ne EventScript_Return removeobject 1 return -NavelRock_Summit_EventScript_164FFB:: @ 8164FFB +NavelRock_Summit_EventScript_HoOh:: @ 8164FFB special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -39,11 +39,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB lockall setvar VAR_TEMP_1, 1 special SpawnCameraObject - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 + setvar VAR_0x8004, 3 @ Num loops + setvar VAR_0x8005, 35 @ Delay special Special_LoopWingFlapSound - applymovement 1, Movement_1650E0 - applymovement OBJ_EVENT_ID_CAMERA, Movement_1650CD + applymovement 1, Movement_HoOhAppear + applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp waitmovement 0 delay 50 setweather 0 @@ -53,16 +53,16 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB delay 30 waitmoncry delay 60 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 + setvar VAR_0x8004, 3 @ Num loops + setvar VAR_0x8005, 35 @ Delay special Special_LoopWingFlapSound - applymovement OBJ_EVENT_ID_CAMERA, Movement_1650D1 - applymovement 1, Movement_1650D7 + applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown + applymovement 1, Movement_HoOhApproach waitmovement 0 special RemoveCameraObject setvar VAR_0x8004, SPECIES_HO_OH - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8005, 70 @ Level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special Special_StartLegendaryBattle @@ -71,33 +71,33 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq EventScript_1650B4 + goto_if_eq NavelRock_Summit_EventScript_DefeatedHoOh compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq EventScript_1650C2 + goto_if_eq NavelRock_Summit_EventScript_RanFromHoOh compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq EventScript_1650C2 + goto_if_eq NavelRock_Summit_EventScript_RanFromHoOh setflag FLAG_FOUGHT_HO_OH releaseall end -EventScript_1650B4:: @ 81650B4 +NavelRock_Summit_EventScript_DefeatedHoOh:: @ 81650B4 setflag FLAG_HO_OH_FLEW_AWAY setvar VAR_0x8004, SPECIES_HO_OH goto EventScript_MonFlewAway end -EventScript_1650C2:: @ 81650C2 +NavelRock_Summit_EventScript_RanFromHoOh:: @ 81650C2 setvar VAR_0x8004, SPECIES_HO_OH goto EventScript_MonFlewAway end -Movement_1650CD:: @ 81650CD +Movement_CameraPanUp: @ 81650CD walk_up walk_up walk_up step_end -Movement_1650D1:: @ 81650D1 +Movement_CameraPanDown: @ 81650D1 delay_16 delay_16 walk_down @@ -105,7 +105,7 @@ Movement_1650D1:: @ 81650D1 walk_down step_end -Movement_1650D7:: @ 81650D7 +Movement_HoOhApproach: @ 81650D7 walk_down walk_down walk_down @@ -116,7 +116,7 @@ Movement_1650D7:: @ 81650D7 delay_16 step_end -Movement_1650E0:: @ 81650E0 +Movement_HoOhAppear: @ 81650E0 delay_16 delay_16 walk_in_place_down diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc index f3777a036..aeccc1e47 100644 --- a/data/maps/OneIsland/text.inc +++ b/data/maps/OneIsland/text.inc @@ -19,7 +19,7 @@ gUnknown_818161B:: @ 818161B .string "…Why am I telling you this now?\n" .string "Let's just go see CELIO!$" -Text_181726:: @ 8181726 +Text_WhereDoYouWantToSail:: @ 8181726 .string "Ahoy, there!\n" .string "Where do you want to sail?$" diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 3fb0928db..754c6f7c6 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -35,7 +35,7 @@ Movement_1713B9:: @ 81713B9 OneIsland_Harbor_EventScript_1713BD:: @ 81713BD lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND goto EventScript_1A8EC5 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 4d3356019..9fd73f882 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -13,9 +13,9 @@ PalletTown_OnTransition:: @ 8165465 end EventScript_165488:: @ 8165488 - goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_1A77A9 + goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_Return compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if_ge EventScript_1A77A9 + goto_if_ge EventScript_Return setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 08a223f1b..bc6e108f8 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -10,7 +10,7 @@ PowerPlant_OnResume:: @ 816376F EventScript_163779:: @ 8163779 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if_ne EventScript_1A77A9 + goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 68e45d952..c18472399 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -13,7 +13,7 @@ SeafoamIslands_B4F_OnResume:: @ 8163048 EventScript_163052:: @ 8163052 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if_ne EventScript_1A77A9 + goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc index 8fa30cfa5..dfa2da755 100644 --- a/data/maps/SevenIsland_Harbor/scripts.inc +++ b/data/maps/SevenIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_Harbor_MapScripts:: @ 8170BE4 SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_SEVEN_ISLAND goto EventScript_1A900F diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc index 0730e3b72..8db4500ca 100644 --- a/data/maps/SixIsland_Harbor/scripts.inc +++ b/data/maps/SixIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ SixIsland_Harbor_MapScripts:: @ 8171E47 SixIsland_Harbor_EventScript_171E48:: @ 8171E48 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_SIX_ISLAND goto EventScript_1A900F diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc index 9fd44c116..0edd8cac9 100644 --- a/data/maps/ThreeIsland_Harbor/scripts.inc +++ b/data/maps/ThreeIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_Harbor_MapScripts:: @ 8171EA9 ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_THREE_ISLAND goto EventScript_1A900F diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc index 919239a0b..ff1bb82bf 100644 --- a/data/maps/TwoIsland_Harbor/scripts.inc +++ b/data/maps/TwoIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ TwoIsland_Harbor_MapScripts:: @ 8171805 TwoIsland_Harbor_EventScript_171806:: @ 8171806 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_TWO_ISLAND goto EventScript_1A8F54 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 9ddc33439..aebeb69b7 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -110,8 +110,8 @@ EventScript_1669FD:: @ 81669FD switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B0B - case 2, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 2, EventScript_CancelSail + case 127, EventScript_CancelSail end EventScript_166A53:: @ 8166A53 @@ -127,8 +127,8 @@ EventScript_166A5F:: @ 8166A5F switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B23 - case 2, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 2, EventScript_CancelSail + case 127, EventScript_CancelSail end EventScript_166AA5:: @ 8166AA5 @@ -146,8 +146,8 @@ EventScript_166AB1:: @ 8166AB1 case 0, EventScript_1A911E case 1, EventScript_166B0B case 2, EventScript_166B23 - case 3, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 3, EventScript_CancelSail + case 127, EventScript_CancelSail end EventScript_166B0B:: @ 8166B0B @@ -173,8 +173,8 @@ EventScript_166B3B:: @ 8166B3B case 0, EventScript_1A8FEE case 1, EventScript_1A8FF9 case 2, EventScript_1A9004 - case 3, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 3, EventScript_CancelSail + case 127, EventScript_CancelSail end EventScript_166B88:: @ 8166B88 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 222f8b05b..baf3d82df 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -39,7 +39,7 @@ VermilionCity_Gym_OnTransition:: @ 816B772 end EventScript_16B778:: @ 816B778 - goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_1A77A9 + goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return special Special_SetVermilionTrashCans copyvar VAR_TEMP_0, VAR_0x8004 copyvar VAR_TEMP_1, VAR_0x8005 diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 4c9c09af8..cbd813d03 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -31,12 +31,12 @@ EventScript_165920:: @ 8165920 return EventScript_165931:: @ 8165931 - goto_if_unset FLAG_BADGE02_GET, EventScript_1A77A9 - goto_if_unset FLAG_BADGE03_GET, EventScript_1A77A9 - goto_if_unset FLAG_BADGE04_GET, EventScript_1A77A9 - goto_if_unset FLAG_BADGE05_GET, EventScript_1A77A9 - goto_if_unset FLAG_BADGE06_GET, EventScript_1A77A9 - goto_if_unset FLAG_BADGE07_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE02_GET, EventScript_Return + goto_if_unset FLAG_BADGE03_GET, EventScript_Return + goto_if_unset FLAG_BADGE04_GET, EventScript_Return + goto_if_unset FLAG_BADGE05_GET, EventScript_Return + goto_if_unset FLAG_BADGE06_GET, EventScript_Return + goto_if_unset FLAG_BADGE07_GET, EventScript_Return setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index 75f0e4707..af0bd4156 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -7,8 +7,8 @@ EventScript_1A8EC5:: @ 81A8EC5 switch VAR_RESULT case 0, EventScript_1A8FF9 case 1, EventScript_1A9004 - case 2, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 + case 2, EventScript_CancelSail + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_1A8F12:: @ 81A8F12 @@ -17,8 +17,8 @@ EventScript_1A8F12:: @ 81A8F12 case 0, EventScript_1A8FE3 case 1, EventScript_1A8FF9 case 2, EventScript_1A9004 - case 3, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 + case 3, EventScript_CancelSail + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_1A8F54:: @ 81A8F54 @@ -30,8 +30,8 @@ EventScript_1A8F54:: @ 81A8F54 switch VAR_RESULT case 0, EventScript_1A8FEE case 1, EventScript_1A9004 - case 2, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 + case 2, EventScript_CancelSail + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_1A8FA1:: @ 81A8FA1 @@ -40,8 +40,8 @@ EventScript_1A8FA1:: @ 81A8FA1 case 0, EventScript_1A8FE3 case 1, EventScript_1A8FEE case 2, EventScript_1A9004 - case 3, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 + case 3, EventScript_CancelSail + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_1A8FE3:: @ 81A8FE3 @@ -73,8 +73,8 @@ EventScript_1A900F:: @ 81A900F switch VAR_RESULT case 0, EventScript_1A8FEE case 1, EventScript_1A8FF9 - case 2, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 + case 2, EventScript_CancelSail + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_1A905C:: @ 81A905C @@ -83,8 +83,8 @@ EventScript_1A905C:: @ 81A905C case 0, EventScript_1A8FE3 case 1, EventScript_1A8FEE case 2, EventScript_1A8FF9 - case 3, EventScript_1A90F6 - case SCR_MENU_CANCEL, EventScript_1A90F6 + case 3, EventScript_CancelSail + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_1A909E:: @ 81A909E @@ -118,7 +118,7 @@ EventScript_1A90DA:: @ 81A90DA waitstate end -EventScript_1A90F6:: @ 81A90F6 +EventScript_CancelSail:: @ 81A90F6 specialvar VAR_RESULT, sub_8147594 compare VAR_RESULT, 1 goto_if_eq EventScript_1A9108 @@ -143,13 +143,13 @@ EventScript_1A911E:: @ 81A911E waitstate specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination switch VAR_0x8006 - case SEAGALLOP_VERMILION_CITY, EventScript_1A91D5 + case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0 case SEAGALLOP_TWO_ISLAND, EventScript_1A91EB case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6 case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 case SEAGALLOP_MORE, EventScript_1A917F - case SCR_MENU_CANCEL, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_1A917F:: @ 81A917F @@ -163,10 +163,10 @@ EventScript_1A917F:: @ 81A917F case SEAGALLOP_SIX_ISLAND, EventScript_1A9217 case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222 case SEAGALLOP_MORE, EventScript_1A911E - case SCR_MENU_CANCEL, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_1A91D5:: @ 81A91D5 +EventScript_SailToVermilionCity:: @ 81A91D5 setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY goto EventScript_1A909E end diff --git a/data/specials.inc b/data/specials.inc index ef42f9ae8..a12a1ee29 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -435,7 +435,7 @@ gSpecials:: @ 815FD60 def_special Special_GetSelectedSeagallopDestination def_special sub_8147500 def_special GetPlayerFacingDirection - def_special Special_DeoxysSound + def_special DoDeoxysRockInteraction def_special Special_SetDeoxysTriangleObjectPal def_special sub_8147594 def_special Special_BadEggInParty diff --git a/src/field_specials.c b/src/field_specials.c index 7abc3f5c9..55f3bcce5 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -80,7 +80,7 @@ static void ChangeBoxPokemonNickname_CB(void); static void ChangePokemonNickname_CB(void); static void Task_RunPokemonLeagueLightingEffect(u8 taskId); static void Task_CancelPokemonLeagueLightingEffect(u8 taskId); -static void task_deoxys_sound(u8 taskId); +static void Task_DoDeoxysRockInteraction(u8 taskId); static void MoveDeoxysObject(u8 num); static void Task_WaitDeoxysFieldEffect(u8 taskId); static void Task_WingFlapSound(u8 taskId); @@ -2309,12 +2309,12 @@ static const u8 sDeoxysStepCaps[] = { 3 }; -void Special_DeoxysSound(void) +void DoDeoxysRockInteraction(void) { - CreateTask(task_deoxys_sound, 8); + CreateTask(Task_DoDeoxysRockInteraction, 8); } -static void task_deoxys_sound(u8 taskId) +static void Task_DoDeoxysRockInteraction(u8 taskId) { u16 r5; u16 r6; From a5375776714b126dbe478a4f535392373f3ba9f0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 16:21:36 -0500 Subject: [PATCH 16/20] Sync obtain item --- asm/field_control_avatar.s | 8 +- data/event_scripts.s | 49 ++--- .../CeladonCity_Condominiums_1F/scripts.inc | 4 +- data/maps/CeruleanCity_House5/scripts.inc | 4 +- .../PalletTown_PlayersHouse_1F/scripts.inc | 2 +- data/maps/RocketHideout_B4F/scripts.inc | 8 +- data/maps/Route1/scripts.inc | 2 +- data/maps/SSAnne_1F_Room6/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/SilphCo_9F/scripts.inc | 2 +- data/maps/VermilionCity/scripts.inc | 12 +- data/scripts/bag_full.inc | 21 +++ data/scripts/cable_club.inc | 4 +- data/scripts/obtain_item.inc | 168 +++++++++--------- data/scripts/seagallop.inc | 6 +- data/text/obtain_item.inc | 6 +- 16 files changed, 152 insertions(+), 148 deletions(-) create mode 100644 data/scripts/bag_full.inc diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 4dd8854d7..6a7454475 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1180,14 +1180,14 @@ _0806D17A: beq _0806D164 ldr r0, _0806D1D0 @ =gSpecialVar_Facing strh r6, [r0] - ldr r0, _0806D1D4 @ =EventScript_PickUpHiddenItem + ldr r0, _0806D1D4 @ =EventScript_FoundHiddenItem b _0806D1E6 .align 2, 0 _0806D1C4: .4byte gSpecialVar_0x8005 _0806D1C8: .4byte gSpecialVar_0x8004 _0806D1CC: .4byte gSpecialVar_0x8006 _0806D1D0: .4byte gSpecialVar_Facing -_0806D1D4: .4byte EventScript_PickUpHiddenItem +_0806D1D4: .4byte EventScript_FoundHiddenItem _0806D1D8: cmp r2, 0xFF beq _0806D1E0 @@ -1231,10 +1231,10 @@ _0806D218: lsrs r0, 24 cmp r0, 0x1 bne _0806D230 - ldr r0, _0806D22C @ =gUnknown_81A6C32 + ldr r0, _0806D22C @ =EventScript_WallTownMap b _0806D53E .align 2, 0 -_0806D22C: .4byte gUnknown_81A6C32 +_0806D22C: .4byte EventScript_WallTownMap _0806D230: adds r0, r4, 0 bl MetatileBehavior_IsBookshelf diff --git a/data/event_scripts.s b/data/event_scripts.s index ff8e1715f..4bc69dacf 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1100,7 +1100,7 @@ Text_1A63D6:: @ 81A63D6 .string "ベッドが　ある‥‥\n" .string "やすんでいこう$" -Text_1A63E8:: @ 81A63E8 +Text_FoundTMHMContainsMove:: @ 81A63E8 .string "{PLAYER} found a {STR_VAR_2}!\n" .string "It contains {STR_VAR_1}.$" @@ -1224,32 +1224,15 @@ EventScript_1A6AC0:: @ 81A6AC0 .include "data/scripts/surf.inc" .include "data/scripts/set_gym_trainers.inc" + .include "data/scripts/bag_full.inc" -EventScript_1A6BF9:: @ 81A6BF9 - textcolor 3 - msgbox Text_TooBadBagFull - release - end - -EventScript_1A6C05:: @ 81A6C05 - msgbox Text_TooBadBagFull - return - -EventScript_1A6C0E:: @ 81A6C0E - msgbox Text_1A5301 - release - end - -EventScript_1A6C18:: @ 81A6C18 - msgbox Text_1A5301 - return - -EventScript_1A6C21:: @ 81A6C21 +@ Unused +EventScript_GymBadgeFanfare:: @ 81A6C21 playfanfare MUS_ME_BACHI waitfanfare return -EventScript_FadeOut_Heal_FadeIn:: @ 81A6C26 +EventScript_OutOfCenterPartyHeal:: @ 81A6C26 fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare @@ -1257,7 +1240,7 @@ EventScript_FadeOut_Heal_FadeIn:: @ 81A6C26 fadescreen FADE_FROM_BLACK return -gUnknown_81A6C32:: @ 81A6C32 +EventScript_WallTownMap:: @ 81A6C32 lockall msgbox Text_ATownMap special sub_8110AB4 @@ -1558,12 +1541,12 @@ gUnknown_81A77A0:: @ 81A77A0 EventScript_Return:: @ 81A77A9 return -EventScript_1A77AA:: @ 81A77AA - setvar VAR_RESULT, 1 +EventScript_SetResultTrue:: @ 81A77AA + setvar VAR_RESULT, TRUE return -EventScript_1A77B0:: @ 81A77B0 - setvar VAR_RESULT, 0 +EventScript_SetResultFalse:: @ 81A77B0 + setvar VAR_RESULT, FALSE return Route16_NorthEntrance_1F_EventScript_1A77B6:: @ 81A77B6 @@ -1792,8 +1775,8 @@ VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 msgbox Text_194234 setflag FLAG_GOT_VS_SEEKER giveitem ITEM_VS_SEEKER - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull msgbox Text_19430F release end @@ -1807,10 +1790,10 @@ EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 lockall textcolor 3 waitse - call EventScript_GiveItem - compare VAR_0x8007, 1 + call EventScript_TryPickUpHiddenItem + compare VAR_0x8007, TRUE goto_if_eq EventScript_DigUpItemPutInPocket - compare VAR_0x8007, 0 + compare VAR_0x8007, FALSE goto_if_eq EventScript_DigUpItemBagIsFull end @@ -1858,7 +1841,7 @@ EventScript_MomHeal:: @ 81A8DD8 applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Text_1A5FDF - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox Text_1A6046 fadedefaultbgm releaseall diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 2842caec7..41912748b 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -10,8 +10,8 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 msgbox gUnknown_81960C9 setflag FLAG_GOT_TEA giveitem ITEM_TEA - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull msgbox gUnknown_8196109 release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index b4c8b16be..51243d31f 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -12,8 +12,8 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 msgbox gUnknown_8193003 setflag FLAG_GOT_POWDER_JAR giveitem ITEM_POWDER_JAR - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull msgbox gUnknown_8193033 release end diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 9ac19e6ff..6dc0a1a47 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -27,7 +27,7 @@ EventScript_168C41:: @ 8168C41 EventScript_168C4A:: @ 8168C4A msgbox gUnknown_818D3D1 closemessage - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox gUnknown_818D3F8 release end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index d5fb798c5..4f75320b3 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -40,8 +40,8 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 faceplayer removeobject 2 giveitem ITEM_SILPH_SCOPE - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull release end @@ -64,8 +64,8 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT removeobject 4 giveitem ITEM_LIFT_KEY - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull release end diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 6f163cc22..8d5617e3f 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -9,7 +9,7 @@ Route1_EventScript_167EFE:: @ 8167EFE textcolor 3 checkitemspace ITEM_POTION, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1A6BF9 + goto_if_eq EventScript_BagIsFull getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 message Text_ObtainedTheX diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index f356fa305..42c69fb3b 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -8,7 +8,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 compare VAR_RESULT, NO goto_if_eq EventScript_160E18 closemessage - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox gUnknown_8174490 release end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 3e495c6cd..975444645 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -27,7 +27,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 waitmovement 0 fadedefaultbgm delay 30 - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox gUnknown_81A4DF5 setflag FLAG_TEMP_2 release diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 87df12d97..7f4258b5d 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -16,7 +16,7 @@ SilphCo_9F_EventScript_161D09:: @ 8161D09 goto_if_ge EventScript_161D2E msgbox gUnknown_8176B54 closemessage - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox gUnknown_8176B81 release end diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index aebeb69b7..7767bbb2b 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -57,19 +57,19 @@ VermilionCity_EventScript_166941:: @ 8166941 end EventScript_166958:: @ 8166958 - goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_1A77B0 + goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_SetResultFalse checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1A77B0 - goto EventScript_1A77AA + goto_if_eq EventScript_SetResultFalse + goto EventScript_SetResultTrue end EventScript_166977:: @ 8166977 - goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_1A77B0 + goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_SetResultFalse checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1A77B0 - goto EventScript_1A77AA + goto_if_eq EventScript_SetResultFalse + goto EventScript_SetResultTrue end EventScript_166996:: @ 8166996 diff --git a/data/scripts/bag_full.inc b/data/scripts/bag_full.inc new file mode 100644 index 000000000..4454b326a --- /dev/null +++ b/data/scripts/bag_full.inc @@ -0,0 +1,21 @@ +EventScript_BagIsFull:: @ 81A6BF9 + textcolor 3 + msgbox Text_TooBadBagFull + release + end + +@ Unused +EventScript_BagIsFullRet:: @ 81A6C05 + msgbox Text_TooBadBagFull + return + +@ Unused +EventScript_NoRoomForAnotherDecor:: @ 81A6C0E + msgbox Text_NoRoomForAnotherDecor + release + end + +@ Unused +EventScript_NoRoomForAnotherDecorRet:: @ 81A6C18 + msgbox Text_NoRoomForAnotherDecor + return diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index deb4c66bf..4d8ea5f1c 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -870,14 +870,14 @@ EventScript_1BBB1E:: @ 81BBB1E EventScript_1BBB44:: @ 81BBB44 msgbox gUnknown_81BCBC3 - goto EventScript_1A77B0 + goto EventScript_SetResultFalse EventScript_1BBB51:: @ 81BBB51 end EventScript_1BBB52:: @ 81BBB52 msgbox gUnknown_81BCC00 - goto EventScript_1A77B0 + goto EventScript_SetResultFalse EventScript_1BBB5F:: @ 81BBB5F end diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index d3ca91f19..71a0b7e21 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -11,60 +11,60 @@ Std_ObtainItem:: @ 81A667B textcolor 3 additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT - call EventScript_1A6697 + call EventScript_ObtainItemMessage copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS return -EventScript_1A6697:: @ 81A6697 +EventScript_ObtainItemMessage:: @ 81A6697 bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 - call EventScript_1A66BC - compare VAR_0x8007, 1 - call_if_eq EventScript_1A6749 - compare VAR_0x8007, 0 - call_if_eq EventScript_1A675E + call EventScript_BufferPocketNameTryFanfare + compare VAR_0x8007, TRUE + call_if_eq EventScript_ObtainedItem + compare VAR_0x8007, FALSE + call_if_eq EventScript_NoRoomForItem return -EventScript_1A66BC:: @ 81A66BC +EventScript_BufferPocketNameTryFanfare:: @ 81A66BC switch VAR_RESULT - case POCKET_ITEMS, EventScript_1A66F9 - case POCKET_KEY_ITEMS, EventScript_1A6709 - case POCKET_POKE_BALLS, EventScript_1A6719 - case POCKET_TM_CASE, EventScript_1A6729 - case POCKET_BERRY_POUCH, EventScript_1A6739 + case POCKET_ITEMS, EventScript_BufferItemsPocket + case POCKET_KEY_ITEMS, EventScript_BufferKeyItemsPocket + case POCKET_POKE_BALLS, EventScript_BufferPokeBallsPocket + case POCKET_TM_CASE, EventScript_BufferTMCase + case POCKET_BERRY_POUCH, EventScript_BufferBerryPouch end -EventScript_1A66F9:: @ 81A66F9 +EventScript_BufferItemsPocket:: @ 81A66F9 getstdstring 2, 24 - compare VAR_0x8007, 1 - call_if_eq EventScript_1A6764 + compare VAR_0x8007, TRUE + call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_1A6709:: @ 81A6709 +EventScript_BufferKeyItemsPocket:: @ 81A6709 getstdstring 2, 25 - compare VAR_0x8007, 1 - call_if_eq EventScript_1A6764 + compare VAR_0x8007, TRUE + call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_1A6719:: @ 81A6719 +EventScript_BufferPokeBallsPocket:: @ 81A6719 getstdstring 2, 26 - compare VAR_0x8007, 1 - call_if_eq EventScript_1A6764 + compare VAR_0x8007, TRUE + call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_1A6729:: @ 81A6729 +EventScript_BufferTMCase:: @ 81A6729 getstdstring 2, 27 - compare VAR_0x8007, 1 - call_if_eq EventScript_1A6768 + compare VAR_0x8007, TRUE + call_if_eq EventScript_PlayFanfareObtainedTMHM return -EventScript_1A6739:: @ 81A6739 +EventScript_BufferBerryPouch:: @ 81A6739 getstdstring 2, 28 - compare VAR_0x8007, 1 - call_if_eq EventScript_1A6764 + compare VAR_0x8007, TRUE + call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_1A6749:: @ 81A6749 +EventScript_ObtainedItem:: @ 81A6749 message Text_ObtainedTheX waitfanfare waitmessage @@ -72,43 +72,43 @@ EventScript_1A6749:: @ 81A6749 setvar VAR_RESULT, 1 return -EventScript_1A675E:: @ 81A675E - setvar VAR_RESULT, 0 +EventScript_NoRoomForItem:: @ 81A675E + setvar VAR_RESULT, FALSE return -EventScript_1A6764:: @ 81A6764 +EventScript_PlayFanfareObtainedItem:: @ 81A6764 playfanfare MUS_FANFA1 return -EventScript_1A6768:: @ 81A6768 +EventScript_PlayFanfareObtainedTMHM:: @ 81A6768 playfanfare MUS_FANFA1 return Std_ObtainDecoration:: @ 81A676C adddecor VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT - call EventScript_1A677A + call EventScript_ObtainDecorMessage return -EventScript_1A677A:: @ 81A677A +EventScript_ObtainDecorMessage:: @ 81A677A getdecorname 1, VAR_0x8000 - compare VAR_0x8007, 1 - call_if_eq EventScript_1A6795 - compare VAR_0x8007, 0 - call_if_eq EventScript_1A67AD + compare VAR_0x8007, TRUE + call_if_eq EventScript_ObtainedDecor + compare VAR_0x8007, FALSE + call_if_eq EventScript_NoRoomForDecor return -EventScript_1A6795:: @ 81A6795 +EventScript_ObtainedDecor:: @ 81A6795 playfanfare MUS_FANFA4 - message Text_1A52F0 + message Text_ObtainedTheDecor waitfanfare waitmessage - msgbox gUnknown_81A532F - setvar VAR_RESULT, 1 + msgbox Text_DecorTransferredToPC + setvar VAR_RESULT, TRUE return -EventScript_1A67AD:: @ 81A67AD - setvar VAR_RESULT, 0 +EventScript_NoRoomForDecor:: @ 81A67AD + setvar VAR_RESULT, FALSE return Std_FindItem:: @ 81A67B3 @@ -121,68 +121,68 @@ Std_FindItem:: @ 81A67B3 copyvar VAR_0x8007, VAR_RESULT getitemname 1, VAR_0x8000 checkitemtype VAR_0x8000 - call EventScript_1A66BC - compare VAR_0x8007, 1 - call_if_eq EventScript_1A67EE - compare VAR_0x8007, 0 - call_if_eq EventScript_1A682D + call EventScript_BufferPocketNameTryFanfare + compare VAR_0x8007, TRUE + call_if_eq EventScript_PickUpItem + compare VAR_0x8007, FALSE + call_if_eq EventScript_NoRoomToPickUpItem release return -EventScript_1A67EE:: @ 81A67EE +EventScript_PickUpItem:: @ 81A67EE removeobject VAR_LAST_TALKED additem VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName copyvar VAR_0x8008, VAR_RESULT - compare VAR_0x8008, 1 - call_if_eq EventScript_1A6821 - compare VAR_0x8008, 0 - call_if_eq EventScript_1A6827 + compare VAR_0x8008, TRUE + call_if_eq EventScript_FoundTMHM + compare VAR_0x8008, FALSE + call_if_eq EventScript_FoundItem waitfanfare waitmessage msgbox Text_PutItemAway return -EventScript_1A6821:: @ 81A6821 - message Text_1A63E8 +EventScript_FoundTMHM:: @ 81A6821 + message Text_FoundTMHMContainsMove return -EventScript_1A6827:: @ 81A6827 +EventScript_FoundItem:: @ 81A6827 message Text_FoundOneItem return -EventScript_1A682D:: @ 81A682D +EventScript_NoRoomToPickUpItem:: @ 81A682D msgbox Text_ObtainedTheX msgbox Text_TooBadBagFull - setvar VAR_RESULT, 0 + setvar VAR_RESULT, FALSE return -EventScript_PickUpHiddenItem:: @ 81A6843 +EventScript_FoundHiddenItem:: @ 81A6843 lockall textcolor 3 waitse compare VAR_0x8005, 0 - goto_if_eq EventScript_PickUpHiddenCoins - call EventScript_GiveItem - compare VAR_0x8007, 1 - goto_if_eq EventScript_ItemInPocketMessage - compare VAR_0x8007, 0 - goto_if_eq EventScript_BagIsFullMessage + goto_if_eq EventScript_TryPickUpHiddenCoins + call EventScript_TryPickUpHiddenItem + compare VAR_0x8007, TRUE + goto_if_eq EventScript_PickedUpHiddenItem + compare VAR_0x8007, FALSE + goto_if_eq EventScript_NoRoomForHiddenItem end -EventScript_GiveItem:: +EventScript_TryPickUpHiddenItem:: additem VAR_0x8005, VAR_0x8006 copyvar VAR_0x8007, VAR_RESULT getitemname 1, VAR_0x8005 checkitemtype VAR_0x8005 - call EventScript_1A66BC + call EventScript_BufferPocketNameTryFanfare return -EventScript_ItemInPocketMessage:: +EventScript_PickedUpHiddenItem:: compare VAR_0x8006, 1 - call_if_eq EventScript_FoundSingleItemMessage + call_if_eq EventScript_FoundSingleItem compare VAR_0x8006, 1 - call_if_ne EventScript_FoundMultipleItemsMessage + call_if_ne EventScript_FoundMultipleItems waitfanfare waitmessage msgbox Text_PutItemAway @@ -190,37 +190,37 @@ EventScript_ItemInPocketMessage:: releaseall end -EventScript_FoundSingleItemMessage:: +EventScript_FoundSingleItem:: message Text_FoundOneItem return -EventScript_FoundCoinsMessage:: +EventScript_FoundCoins:: getnumberstring 0, VAR_0x8006 message Text_FoundXCoins return -EventScript_FoundMultipleItemsMessage:: +EventScript_FoundMultipleItems:: getnumberstring 0, VAR_0x8006 message Text_FoundXItems return -EventScript_BagIsFullMessage:: +EventScript_NoRoomForHiddenItem:: msgbox Text_FoundOneItem msgbox Text_TooBadBagFull setvar VAR_RESULT, 0 releaseall end -EventScript_PickUpHiddenCoins:: - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_HiddenCoinsButNoCoinCase +EventScript_TryPickUpHiddenCoins:: + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_NoCaseForHiddenCoins checkcoins VAR_RESULT specialvar VAR_RESULT, Special_CheckAddCoins - compare VAR_RESULT, 0 - goto_if_eq EventScript_HiddenCoinsButTheCoinCaseIsFull + compare VAR_RESULT, FALSE + goto_if_eq EventScript_HiddenCoinsButCaseIsFull givecoins VAR_0x8006 getstdstring 1, 0x17 - call EventScript_1A6764 - call EventScript_FoundCoinsMessage + call EventScript_PlayFanfareObtainedItem + call EventScript_FoundCoins waitfanfare waitmessage msgbox Text_PutCoinsAwayInCoinCase @@ -228,7 +228,7 @@ EventScript_PickUpHiddenCoins:: releaseall end -EventScript_HiddenCoinsButTheCoinCaseIsFull:: +EventScript_HiddenCoinsButCaseIsFull:: getnumberstring 0, VAR_0x8006 getstdstring 1, 0x17 msgbox Text_FoundXCoins @@ -237,7 +237,7 @@ EventScript_HiddenCoinsButTheCoinCaseIsFull:: releaseall end -EventScript_HiddenCoinsButNoCoinCase:: +EventScript_NoCaseForHiddenCoins:: getnumberstring 0, VAR_0x8006 getstdstring 1, 0x17 msgbox Text_FoundXCoins diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index af0bd4156..c14cda778 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -149,7 +149,7 @@ EventScript_1A911E:: @ 81A911E case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6 case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 case SEAGALLOP_MORE, EventScript_1A917F - case SCR_MENU_CANCEL, EventScript_CancelSail + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_1A917F:: @ 81A917F @@ -162,8 +162,8 @@ EventScript_1A917F:: @ 81A917F case SEAGALLOP_FIVE_ISLAND, EventScript_1A920C case SEAGALLOP_SIX_ISLAND, EventScript_1A9217 case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222 - case SEAGALLOP_MORE, EventScript_1A911E - case SCR_MENU_CANCEL, EventScript_CancelSail + case SEAGALLOP_MORE, EventScript_1A911E + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_SailToVermilionCity:: @ 81A91D5 diff --git a/data/text/obtain_item.inc b/data/text/obtain_item.inc index 74a2716f8..b1860f58e 100644 --- a/data/text/obtain_item.inc +++ b/data/text/obtain_item.inc @@ -35,13 +35,13 @@ Text_FoundXItems:: @ 81A52DD .string "{PLAYER} found\n" .string "{STR_VAR_1} {STR_VAR_2}(s)!$" -Text_1A52F0:: @ 81A52F0 +Text_ObtainedTheDecor:: @ 81A52F0 .string "Obtained the {STR_VAR_2}!$" -Text_1A5301:: @ 81A5301 +Text_NoRoomForAnotherDecor:: @ 81A5301 .string "Too bad! There's no room left for\n" .string "another {STR_VAR_2}…$" -gUnknown_81A532F:: @ 81A532F +Text_DecorTransferredToPC:: @ 81A532F .string "The {STR_VAR_2} was transferred\n" .string "to the PC.$" From 0bb7f18b8e609f76a9021420470737bbd16cc2bd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 16:55:58 -0500 Subject: [PATCH 17/20] Sync Cable Club scripts --- asm/cable_club.s | 56 +- asm/dodrio_berry_picking.s | 12 +- asm/field_control_avatar.s | 8 +- asm/link_rfu_3.s | 32 +- asm/macros/event.inc | 7 + asm/overworld.s | 74 +- asm/pokemon_jump_2.s | 12 +- asm/script_pokemon_util_80A0058.s | 18 +- data/event_scripts.s | 83 +- .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../{UnknownMap_00_01 => TradeCenter}/map.bin | 0 .../border.bin | Bin .../{UnknownMap_00_04 => UnionRoom}/map.bin | 0 data/layouts/layouts.json | 40 +- .../map.json | 12 +- data/maps/BattleColosseum2P/scripts.inc | 2 + .../map.json | 14 +- data/maps/BattleColosseum4P/scripts.inc | 2 + .../CeladonCity_PokemonCenter_1F/scripts.inc | 2 +- .../CeladonCity_PokemonCenter_2F/map.json | 10 +- .../CeladonCity_PokemonCenter_2F/scripts.inc | 13 +- .../CeruleanCity_PokemonCenter_1F/scripts.inc | 2 +- .../CeruleanCity_PokemonCenter_2F/map.json | 10 +- .../CeruleanCity_PokemonCenter_2F/scripts.inc | 13 +- .../scripts.inc | 2 +- .../CinnabarIsland_PokemonCenter_2F/map.json | 10 +- .../scripts.inc | 13 +- .../FiveIsland_PokemonCenter_1F/scripts.inc | 2 +- .../maps/FiveIsland_PokemonCenter_2F/map.json | 10 +- .../FiveIsland_PokemonCenter_2F/scripts.inc | 13 +- .../FourIsland_PokemonCenter_1F/scripts.inc | 2 +- .../maps/FourIsland_PokemonCenter_2F/map.json | 10 +- .../FourIsland_PokemonCenter_2F/scripts.inc | 13 +- .../FuchsiaCity_PokemonCenter_1F/scripts.inc | 2 +- .../FuchsiaCity_PokemonCenter_2F/map.json | 10 +- .../FuchsiaCity_PokemonCenter_2F/scripts.inc | 13 +- .../scripts.inc | 2 +- .../IndigoPlateau_PokemonCenter_2F/map.json | 10 +- .../scripts.inc | 13 +- .../LavenderTown_PokemonCenter_1F/scripts.inc | 2 +- .../LavenderTown_PokemonCenter_2F/map.json | 10 +- .../LavenderTown_PokemonCenter_2F/scripts.inc | 13 +- .../OneIsland_KindleRoad_EmberSpa/scripts.inc | 2 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/OneIsland_PokemonCenter_2F/map.json | 10 +- .../OneIsland_PokemonCenter_2F/scripts.inc | 13 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 2 +- .../PewterCity_PokemonCenter_1F/scripts.inc | 2 +- .../maps/PewterCity_PokemonCenter_2F/map.json | 10 +- .../PewterCity_PokemonCenter_2F/scripts.inc | 13 +- data/maps/PokemonTower_5F/scripts.inc | 2 +- .../map.json | 16 +- data/maps/RecordCenter/scripts.inc | 2 + .../maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route10_PokemonCenter_2F/map.json | 10 +- .../maps/Route10_PokemonCenter_2F/scripts.inc | 13 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route4_PokemonCenter_2F/map.json | 10 +- data/maps/Route4_PokemonCenter_2F/scripts.inc | 13 +- .../SaffronCity_PokemonCenter_1F/scripts.inc | 2 +- .../SaffronCity_PokemonCenter_2F/map.json | 10 +- .../SaffronCity_PokemonCenter_2F/scripts.inc | 13 +- data/maps/SevenIsland_House_Room1/scripts.inc | 2 +- data/maps/SevenIsland_House_Room2/scripts.inc | 2 +- .../SevenIsland_PokemonCenter_1F/scripts.inc | 2 +- .../SevenIsland_PokemonCenter_2F/map.json | 10 +- .../SevenIsland_PokemonCenter_2F/scripts.inc | 13 +- .../scripts.inc | 2 +- .../SixIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SixIsland_PokemonCenter_2F/map.json | 10 +- .../SixIsland_PokemonCenter_2F/scripts.inc | 13 +- .../ThreeIsland_PokemonCenter_1F/scripts.inc | 2 +- .../ThreeIsland_PokemonCenter_2F/map.json | 10 +- .../ThreeIsland_PokemonCenter_2F/scripts.inc | 13 +- .../map.json | 12 +- data/maps/TradeCenter/scripts.inc | 2 + data/maps/TwoIsland_JoyfulGameCorner/map.json | 4 +- .../TwoIsland_JoyfulGameCorner/scripts.inc | 4 +- .../TwoIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/TwoIsland_PokemonCenter_2F/map.json | 10 +- .../TwoIsland_PokemonCenter_2F/scripts.inc | 13 +- .../{UnknownMap_00_04 => UnionRoom}/map.json | 24 +- .../scripts.inc | 30 +- data/maps/UnknownMap_00_00/scripts.inc | 2 - data/maps/UnknownMap_00_01/scripts.inc | 2 - data/maps/UnknownMap_00_02/scripts.inc | 2 - data/maps/UnknownMap_00_03/scripts.inc | 2 - .../scripts.inc | 2 +- .../VermilionCity_PokemonCenter_2F/map.json | 10 +- .../scripts.inc | 13 +- .../ViridianCity_PokemonCenter_1F/scripts.inc | 2 +- .../ViridianCity_PokemonCenter_2F/map.json | 10 +- .../ViridianCity_PokemonCenter_2F/scripts.inc | 13 +- data/maps/map_groups.json | 10 +- data/scripts/cable_club.inc | 1198 ++++++++--------- data/scripts/pkmn_center_nurse.inc | 2 +- data/scripts/trainer_battle.inc | 8 +- data/scripts/trainer_tower.inc | 2 +- data/specials.inc | 40 +- include/constants/layouts.h | 10 +- include/constants/map_groups.h | 10 +- include/constants/pokemon.h | 4 + include/constants/union_room.h | 28 + include/event_scripts.h | 12 +- include/pokemon.h | 4 - include/script_pokemon_util_80A0058.h | 2 +- src/battle_records.c | 2 +- src/battle_setup.c | 2 +- src/event_object_lock.c | 4 +- src/field_fadetransition.c | 2 +- src/field_specials.c | 2 +- src/post_battle_event_funcs.c | 2 +- src/save_location.c | 6 +- src/script_menu.c | 20 +- 120 files changed, 1142 insertions(+), 1189 deletions(-) rename data/layouts/{UnknownMap_00_00 => BattleColosseum2P}/border.bin (100%) rename data/layouts/{UnknownMap_00_00 => BattleColosseum2P}/map.bin (100%) rename data/layouts/{UnknownMap_00_01 => BattleColosseum4P}/border.bin (100%) rename data/layouts/{UnknownMap_00_03 => BattleColosseum4P}/map.bin (100%) rename data/layouts/{UnknownMap_00_02 => RecordCenter}/border.bin (100%) rename data/layouts/{UnknownMap_00_02 => RecordCenter}/map.bin (100%) rename data/layouts/{UnknownMap_00_03 => TradeCenter}/border.bin (100%) rename data/layouts/{UnknownMap_00_01 => TradeCenter}/map.bin (100%) rename data/layouts/{UnknownMap_00_04 => UnionRoom}/border.bin (100%) rename data/layouts/{UnknownMap_00_04 => UnionRoom}/map.bin (100%) rename data/maps/{UnknownMap_00_00 => BattleColosseum2P}/map.json (80%) create mode 100644 data/maps/BattleColosseum2P/scripts.inc rename data/maps/{UnknownMap_00_03 => BattleColosseum4P}/map.json (80%) create mode 100644 data/maps/BattleColosseum4P/scripts.inc rename data/maps/{UnknownMap_00_02 => RecordCenter}/map.json (81%) create mode 100644 data/maps/RecordCenter/scripts.inc rename data/maps/{UnknownMap_00_01 => TradeCenter}/map.json (81%) create mode 100644 data/maps/TradeCenter/scripts.inc rename data/maps/{UnknownMap_00_04 => UnionRoom}/map.json (84%) rename data/maps/{UnknownMap_00_04 => UnionRoom}/scripts.inc (59%) delete mode 100644 data/maps/UnknownMap_00_00/scripts.inc delete mode 100644 data/maps/UnknownMap_00_01/scripts.inc delete mode 100644 data/maps/UnknownMap_00_02/scripts.inc delete mode 100644 data/maps/UnknownMap_00_03/scripts.inc create mode 100644 include/constants/union_room.h diff --git a/asm/cable_club.s b/asm/cable_club.s index 3fea2b935..d949cc492 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -446,18 +446,18 @@ sub_8080A4C: @ 8080A4C bne _08080AB0 movs r0, 0x15 bl PlaySE - ldr r0, _08080AA8 @ =gUnknown_81BC4CE + ldr r0, _08080AA8 @ =CableClub_Text_WhenAllPlayersReadyAConfirmBCancel bl ShowFieldAutoScrollMessage ldr r0, _08080AAC @ =sub_8080AD0 b _08080ABE .align 2, 0 _08080AA4: .4byte gTasks -_08080AA8: .4byte gUnknown_81BC4CE +_08080AA8: .4byte CableClub_Text_WhenAllPlayersReadyAConfirmBCancel _08080AAC: .4byte sub_8080AD0 _08080AB0: movs r0, 0x16 bl PlaySE - ldr r0, _08080AC8 @ =gUnknown_81BC54C + ldr r0, _08080AC8 @ =CableClub_Text_AwaitingLinkupBCancel bl ShowFieldAutoScrollMessage ldr r0, _08080ACC @ =sub_8080CDC _08080ABE: @@ -467,7 +467,7 @@ _08080AC0: pop {r0} bx r0 .align 2, 0 -_08080AC8: .4byte gUnknown_81BC54C +_08080AC8: .4byte CableClub_Text_AwaitingLinkupBCancel _08080ACC: .4byte sub_8080CDC thumb_func_end sub_8080A4C @@ -564,7 +564,7 @@ sub_8080B20: @ 8080B20 movs r2, 0 movs r3, 0x1 bl ConvertIntToDecimalStringN - ldr r0, _08080BC0 @ =gUnknown_81BC50D + ldr r0, _08080BC0 @ =CableClub_Text_StartLinkWithXPlayersAConfirmBCancel bl ShowFieldAutoScrollMessage mov r0, r9 subs r0, 0x8 @@ -582,7 +582,7 @@ _08080BA8: _08080BB4: .4byte gTasks+0x8 _08080BB8: .4byte gMain _08080BBC: .4byte gStringVar1 -_08080BC0: .4byte gUnknown_81BC50D +_08080BC0: .4byte CableClub_Text_StartLinkWithXPlayersAConfirmBCancel _08080BC4: .4byte sub_8080BC8 thumb_func_end sub_8080B20 @@ -622,7 +622,7 @@ sub_8080BC8: @ 8080BC8 cmp r0, 0 beq _08080C3C _08080C16: - ldr r0, _08080C30 @ =gUnknown_81BC4CE + ldr r0, _08080C30 @ =CableClub_Text_WhenAllPlayersReadyAConfirmBCancel bl ShowFieldAutoScrollMessage ldr r1, _08080C34 @ =gTasks lsls r0, r5, 2 @@ -634,7 +634,7 @@ _08080C16: b _08080C5C .align 2, 0 _08080C2C: .4byte gMain -_08080C30: .4byte gUnknown_81BC4CE +_08080C30: .4byte CableClub_Text_WhenAllPlayersReadyAConfirmBCancel _08080C34: .4byte gTasks _08080C38: .4byte sub_8080AD0 _08080C3C: @@ -1148,8 +1148,8 @@ _0808105A: _08081060: .4byte sub_8080FF0 thumb_func_end sub_808102C - thumb_func_start sub_8081064 -sub_8081064: @ 8081064 + thumb_func_start TryBattleLinkup +TryBattleLinkup: @ 8081064 push {r4,lr} movs r3, 0x2 movs r2, 0x2 @@ -1202,10 +1202,10 @@ _080810B4: .align 2, 0 _080810C4: .4byte gLinkType _080810C8: .4byte 0x00002255 - thumb_func_end sub_8081064 + thumb_func_end TryBattleLinkup - thumb_func_start sub_80810CC -sub_80810CC: @ 80810CC + thumb_func_start TryTradeLinkup +TryTradeLinkup: @ 80810CC push {lr} ldr r1, _080810E8 @ =gLinkType ldr r2, _080810EC @ =0x00001133 @@ -1223,7 +1223,7 @@ sub_80810CC: @ 80810CC _080810E8: .4byte gLinkType _080810EC: .4byte 0x00001133 _080810F0: .4byte gBattleTypeFlags - thumb_func_end sub_80810CC + thumb_func_end TryTradeLinkup thumb_func_start sub_80810F4 sub_80810F4: @ 80810F4 @@ -2012,8 +2012,8 @@ _0808173C: .4byte c2_8056854 _08081740: .4byte CB2_SetUpSaveAfterLinkBattle thumb_func_end sub_8081668 - thumb_func_start sub_8081744 -sub_8081744: @ 8081744 + thumb_func_start CleanupLinkRoomState +CleanupLinkRoomState: @ 8081744 push {lr} ldr r0, _0808176C @ =gSpecialVar_0x8004 ldrh r1, [r0] @@ -2034,7 +2034,7 @@ _08081760: bx r0 .align 2, 0 _0808176C: .4byte gSpecialVar_0x8004 - thumb_func_end sub_8081744 + thumb_func_end CleanupLinkRoomState thumb_func_start sub_8081770 sub_8081770: @ 8081770 @@ -2072,13 +2072,13 @@ _080817A4: beq _0808180C b _08081820 _080817AE: - ldr r0, _080817BC @ =gUnknown_81BC4AC + ldr r0, _080817BC @ =CableClub_Text_PleaseWaitBCancel bl ShowFieldMessage movs r0, 0x1 strh r0, [r5, 0x8] b _08081820 .align 2, 0 -_080817BC: .4byte gUnknown_81BC4AC +_080817BC: .4byte CableClub_Text_PleaseWaitBCancel _080817C0: bl IsFieldMessageBoxHidden lsls r0, 24 @@ -2296,8 +2296,8 @@ _08081970: bx r0 thumb_func_end sub_80818E8 - thumb_func_start sub_8081978 -sub_8081978: @ 8081978 + thumb_func_start EnterTradeSeat +EnterTradeSeat: @ 8081978 push {lr} ldr r0, _0808198C @ =gWirelessCommType ldrb r0, [r0] @@ -2317,7 +2317,7 @@ _0808199A: bx r0 .align 2, 0 _080819A0: .4byte sub_8081850 - thumb_func_end sub_8081978 + thumb_func_end EnterTradeSeat thumb_func_start sub_80819A4 sub_80819A4: @ 80819A4 @@ -2340,8 +2340,8 @@ sub_80819B8: @ 80819B8 bx r0 thumb_func_end sub_80819B8 - thumb_func_start sub_80819C8 -sub_80819C8: @ 80819C8 + thumb_func_start EnterColosseumPlayerSpot +EnterColosseumPlayerSpot: @ 80819C8 push {lr} ldr r1, _080819E4 @ =gLinkType ldr r2, _080819E8 @ =0x00002211 @@ -2367,7 +2367,7 @@ _080819FA: bx r0 .align 2, 0 _08081A00: .4byte sub_8081318 - thumb_func_end sub_80819C8 + thumb_func_end EnterColosseumPlayerSpot thumb_func_start sub_8081A04 sub_8081A04: @ 8081A04 @@ -2382,8 +2382,8 @@ sub_8081A04: @ 8081A04 _08081A18: .4byte sub_808177C thumb_func_end sub_8081A04 - thumb_func_start sp02A_crash_sound -sp02A_crash_sound: @ 8081A1C + thumb_func_start Script_ShowLinkTrainerCard +Script_ShowLinkTrainerCard: @ 8081A1C push {lr} ldr r0, _08081A2C @ =gSpecialVar_0x8006 ldrb r0, [r0] @@ -2394,7 +2394,7 @@ sp02A_crash_sound: @ 8081A1C .align 2, 0 _08081A2C: .4byte gSpecialVar_0x8006 _08081A30: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic - thumb_func_end sp02A_crash_sound + thumb_func_end Script_ShowLinkTrainerCard thumb_func_start sub_8081A34 sub_8081A34: @ 8081A34 diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s index 9928f14b4..3e9c18491 100644 --- a/asm/dodrio_berry_picking.s +++ b/asm/dodrio_berry_picking.s @@ -6306,8 +6306,8 @@ sub_81537AC: @ 81537AC _081537BC: .4byte gUnknown_203F3E0 thumb_func_end sub_81537AC - thumb_func_start sub_81537C0 -sub_81537C0: @ 81537C0 + thumb_func_start IsDodrioInParty +IsDodrioInParty: @ 81537C0 push {r4-r6,lr} movs r5, 0 ldr r6, _081537F0 @ =gSpecialVar_Result @@ -6346,10 +6346,10 @@ _08153804: bx r0 .align 2, 0 _0815380C: .4byte gSpecialVar_Result - thumb_func_end sub_81537C0 + thumb_func_end IsDodrioInParty - thumb_func_start sub_8153810 -sub_8153810: @ 8153810 + thumb_func_start ShowDodrioBerryPickingRecords +ShowDodrioBerryPickingRecords: @ 8153810 push {r4,lr} ldr r4, _0815382C @ =sub_8153830 adds r0, r4, 0 @@ -6363,7 +6363,7 @@ sub_8153810: @ 8153810 bx r0 .align 2, 0 _0815382C: .4byte sub_8153830 - thumb_func_end sub_8153810 + thumb_func_end ShowDodrioBerryPickingRecords thumb_func_start sub_8153830 sub_8153830: @ 8153830 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 6a7454475..22a987f03 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1519,10 +1519,10 @@ _0806D488: lsrs r0, 24 cmp r0, 0x1 bne _0806D4A0 - ldr r0, _0806D49C @ =gUnknown_81BBFD8 + ldr r0, _0806D49C @ =CableClub_EventScript_81BBFD8 b _0806D53E .align 2, 0 -_0806D49C: .4byte gUnknown_81BBFD8 +_0806D49C: .4byte CableClub_EventScript_81BBFD8 _0806D4A0: adds r0, r4, 0 bl MetatileBehavior_IsQuestionnaire @@ -1542,10 +1542,10 @@ _0806D4B8: lsrs r0, 24 cmp r0, 0x1 bne _0806D4D0 - ldr r0, _0806D4CC @ =gUnknown_81BB8A7 + ldr r0, _0806D4CC @ =CableClub_EventScript_ShowBattleRecords b _0806D53E .align 2, 0 -_0806D4CC: .4byte gUnknown_81BB8A7 +_0806D4CC: .4byte CableClub_EventScript_ShowBattleRecords _0806D4D0: adds r0, r4, 0 bl MetatileBehavior_IsIndigoPlateauMark diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index efbea2956..ef64c08dd 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -210,8 +210,8 @@ _08115A1C: .4byte gStringVar4 _08115A20: .4byte gUnknown_8457234 thumb_func_end sub_811599C - thumb_func_start sub_8115A24 -sub_8115A24: @ 8115A24 + thumb_func_start TryBecomeLinkLeader +TryBecomeLinkLeader: @ 8115A24 push {lr} ldr r0, _08115A54 @ =sub_8115A68 movs r1, 0 @@ -240,7 +240,7 @@ _08115A58: .4byte gUnknown_203B05C _08115A5C: .4byte gTasks+0x8 _08115A60: .4byte gUnknown_3002024 _08115A64: .4byte gSpecialVar_Result - thumb_func_end sub_8115A24 + thumb_func_end TryBecomeLinkLeader thumb_func_start sub_8115A68 sub_8115A68: @ 8115A68 @@ -1747,8 +1747,8 @@ _081166E4: bx r1 thumb_func_end sub_81165E8 - thumb_func_start BerryBlenderLinkJoinGroup -BerryBlenderLinkJoinGroup: @ 81166F4 + thumb_func_start TryJoinLinkGroup +TryJoinLinkGroup: @ 81166F4 push {lr} ldr r0, _08116724 @ =sub_8116738 movs r1, 0 @@ -1777,7 +1777,7 @@ _08116728: .4byte gUnknown_203B05C _0811672C: .4byte gTasks+0x8 _08116730: .4byte gUnknown_3002028 _08116734: .4byte gSpecialVar_Result - thumb_func_end BerryBlenderLinkJoinGroup + thumb_func_end TryJoinLinkGroup thumb_func_start sub_8116738 sub_8116738: @ 8116738 @@ -3272,7 +3272,7 @@ sub_81173C0: @ 81173C0 adds r6, r0, 0 lsls r6, 16 lsrs r6, 16 - bl sp000_heal_pokemon + bl HealPlayerParty bl SavePlayerParty bl LoadPlayerBag ldr r5, _0811742C @ =gLinkPlayers @@ -3660,7 +3660,7 @@ _081177A0: ldr r0, _081177C4 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 - bl sp000_heal_pokemon + bl HealPlayerParty bl SavePlayerParty bl LoadPlayerBag movs r0, 0x1 @@ -3673,7 +3673,7 @@ _081177A0: _081177C4: .4byte gBlockSendBuffer _081177C8: bl CleanupOverworldWindowsAndTilemaps - bl sp000_heal_pokemon + bl HealPlayerParty bl SavePlayerParty bl LoadPlayerBag ldr r0, _081177EC @ =gBlockSendBuffer @@ -3689,7 +3689,7 @@ _081177C8: _081177EC: .4byte gBlockSendBuffer _081177F0: bl CleanupOverworldWindowsAndTilemaps - bl sp000_heal_pokemon + bl HealPlayerParty bl SavePlayerParty bl LoadPlayerBag ldr r0, _08117814 @ =gBlockSendBuffer @@ -7556,8 +7556,8 @@ _08119996: bx r1 thumb_func_end sub_8119944 - thumb_func_start sub_811999C -sub_811999C: @ 811999C + thumb_func_start InitUnionRoom +InitUnionRoom: @ 811999C push {r4-r6,lr} ldr r5, _081199E8 @ =gUnknown_203B04C movs r0, 0x1 @@ -7600,7 +7600,7 @@ _081199EC: .4byte gUnknown_203ADFA _081199F0: .4byte sub_81199FC _081199F4: .4byte gUnknown_203B05C _081199F8: .4byte gUnknown_300202C - thumb_func_end sub_811999C + thumb_func_end InitUnionRoom thumb_func_start sub_81199FC sub_81199FC: @ 81199FC @@ -10685,8 +10685,8 @@ sub_811B148: @ 811B148 bx lr thumb_func_end sub_811B148 - thumb_func_start sub_811B15C -sub_811B15C: @ 811B15C + thumb_func_start Script_ResetUnionRoomTrade +Script_ResetUnionRoomTrade: @ 811B15C push {lr} ldr r0, _0811B168 @ =gUnknown_203B06C bl sub_811B148 @@ -10694,7 +10694,7 @@ sub_811B15C: @ 811B15C bx r0 .align 2, 0 _0811B168: .4byte gUnknown_203B06C - thumb_func_end sub_811B15C + thumb_func_end Script_ResetUnionRoomTrade thumb_func_start sub_811B16C sub_811B16C: @ 811B16C diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 1169905b5..5526b1e50 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1626,3 +1626,10 @@ setvar VAR_0x8008, \gym call EventScript_SetGymTrainers .endm + + @ Appears frequently at start of NPC scripts. Should be used once named/understood + .macro unk_questlog + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 + .endm diff --git a/asm/overworld.s b/asm/overworld.s index 4fbe39153..fb746285f 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -19,7 +19,7 @@ sub_8054BC8: @ 8054BC8 adds r1, r0, 0 adds r0, r4, 0 bl RemoveMoney - bl sp000_heal_pokemon + bl HealPlayerParty bl sub_8054DD8 bl sub_80554BC bl WarpIntoMap @@ -6453,7 +6453,7 @@ _08057E80: bl sub_8057954 cmp r0, 0x1 bne _08057E96 - ldr r0, _08057EA0 @ =gUnknown_81BB9FC + ldr r0, _08057EA0 @ =CableClub_EventScript_DoLinkRoomExit bl ScriptContext1_SetupScript ldr r0, _08057EA4 @ =sub_8057E6C bl c1_link_related_func_set @@ -6463,7 +6463,7 @@ _08057E96: bx r1 .align 2, 0 _08057E9C: .4byte gUnknown_3000E80 -_08057EA0: .4byte gUnknown_81BB9FC +_08057EA0: .4byte CableClub_EventScript_DoLinkRoomExit _08057EA4: .4byte sub_8057E6C thumb_func_end sub_8057E70 @@ -6798,7 +6798,7 @@ _08058074: cmp r0, 0x80 beq _080580FC _080580E0: - ldr r0, _080580F8 @ =gUnknown_81BB9A3 + ldr r0, _080580F8 @ =CableClub_EventScript_TooBusyToNotice b _08058122 .align 2, 0 _080580E4: .4byte gDirectionToVectors @@ -6806,21 +6806,21 @@ _080580E8: .4byte 0xffff0000 _080580EC: .4byte 0x0000ffff _080580F0: .4byte 0xffffff00 _080580F4: .4byte gUnknown_3000E80 -_080580F8: .4byte gUnknown_81BB9A3 +_080580F8: .4byte CableClub_EventScript_TooBusyToNotice _080580FC: adds r0, r2, 0 bl sub_8081A34 cmp r0, 0 bne _08058110 - ldr r0, _0805810C @ =gUnknown_81BB981 + ldr r0, _0805810C @ =CableClub_EventScript_ReadTrainerCard b _08058122 .align 2, 0 -_0805810C: .4byte gUnknown_81BB981 +_0805810C: .4byte CableClub_EventScript_ReadTrainerCard _08058110: - ldr r0, _08058114 @ =gUnknown_81BB992 + ldr r0, _08058114 @ =CableClub_EventScript_ReadTrainerCardColored b _08058122 .align 2, 0 -_08058114: .4byte gUnknown_81BB992 +_08058114: .4byte CableClub_EventScript_ReadTrainerCardColored _08058118: ldrb r1, [r4, 0xC] ldrb r2, [r4, 0x3] @@ -6837,62 +6837,62 @@ _08058122: sub_805812C: @ 805812C push {lr} adds r1, r0, 0 - ldr r0, _08058178 @ =gUnknown_81BB8DB + ldr r0, _08058178 @ =BattleColosseum4P_EventScript_PlayerSpot0 cmp r1, r0 beq _08058172 - ldr r0, _0805817C @ =gUnknown_81BB8F8 + ldr r0, _0805817C @ =BattleColosseum4P_EventScript_PlayerSpot1 cmp r1, r0 beq _080581B4 - ldr r0, _08058180 @ =gUnknown_81BB915 + ldr r0, _08058180 @ =BattleColosseum4P_EventScript_PlayerSpot2 cmp r1, r0 beq _08058172 - ldr r0, _08058184 @ =gUnknown_81BB932 + ldr r0, _08058184 @ =BattleColosseum4P_EventScript_PlayerSpot3 cmp r1, r0 beq _080581B4 - ldr r0, _08058188 @ =gUnknown_81BB980 + ldr r0, _08058188 @ =RecordCenter_EventScript_Spot cmp r1, r0 beq _08058172 - ldr r0, _0805818C @ =gUnknown_81BB980 + ldr r0, _0805818C @ =RecordCenter_EventScript_Spot cmp r1, r0 beq _080581B4 - ldr r0, _08058190 @ =gUnknown_81BB980 + ldr r0, _08058190 @ =RecordCenter_EventScript_Spot cmp r1, r0 beq _08058172 - ldr r0, _08058194 @ =gUnknown_81BB980 + ldr r0, _08058194 @ =RecordCenter_EventScript_Spot cmp r1, r0 beq _080581B4 - ldr r0, _08058198 @ =gUnknown_81BB8C3 + ldr r0, _08058198 @ =BattleColosseum2P_EventScript_PlayerSpot0 cmp r1, r0 beq _08058172 - ldr r0, _0805819C @ =gUnknown_81BB8CF + ldr r0, _0805819C @ =BattleColosseum2P_EventScript_PlayerSpot1 cmp r1, r0 beq _080581B4 - ldr r0, _080581A0 @ =gUnknown_81BB950 + ldr r0, _080581A0 @ =TradeCenter_EventScript_Chair0 cmp r1, r0 bne _080581A4 _08058172: movs r0, 0xA b _080581B6 .align 2, 0 -_08058178: .4byte gUnknown_81BB8DB -_0805817C: .4byte gUnknown_81BB8F8 -_08058180: .4byte gUnknown_81BB915 -_08058184: .4byte gUnknown_81BB932 -_08058188: .4byte gUnknown_81BB980 -_0805818C: .4byte gUnknown_81BB980 -_08058190: .4byte gUnknown_81BB980 -_08058194: .4byte gUnknown_81BB980 -_08058198: .4byte gUnknown_81BB8C3 -_0805819C: .4byte gUnknown_81BB8CF -_080581A0: .4byte gUnknown_81BB950 +_08058178: .4byte BattleColosseum4P_EventScript_PlayerSpot0 +_0805817C: .4byte BattleColosseum4P_EventScript_PlayerSpot1 +_08058180: .4byte BattleColosseum4P_EventScript_PlayerSpot2 +_08058184: .4byte BattleColosseum4P_EventScript_PlayerSpot3 +_08058188: .4byte RecordCenter_EventScript_Spot +_0805818C: .4byte RecordCenter_EventScript_Spot +_08058190: .4byte RecordCenter_EventScript_Spot +_08058194: .4byte RecordCenter_EventScript_Spot +_08058198: .4byte BattleColosseum2P_EventScript_PlayerSpot0 +_0805819C: .4byte BattleColosseum2P_EventScript_PlayerSpot1 +_080581A0: .4byte TradeCenter_EventScript_Chair0 _080581A4: - ldr r0, _080581B0 @ =gUnknown_81BB95C + ldr r0, _080581B0 @ =TradeCenter_EventScript_Chair1 cmp r1, r0 beq _080581B4 movs r0, 0 b _080581B6 .align 2, 0 -_080581B0: .4byte gUnknown_81BB95C +_080581B0: .4byte TradeCenter_EventScript_Chair1 _080581B4: movs r0, 0x9 _080581B6: @@ -6938,13 +6938,13 @@ sub_80581F8: @ 80581F8 push {lr} movs r0, 0x6 bl PlaySE - ldr r0, _08058210 @ =gUnknown_81BB9D4 + ldr r0, _08058210 @ =TradeCenter_ConfirmLeaveRoom bl ScriptContext1_SetupScript bl ScriptContext2_Enable pop {r0} bx r0 .align 2, 0 -_08058210: .4byte gUnknown_81BB9D4 +_08058210: .4byte TradeCenter_ConfirmLeaveRoom thumb_func_end sub_80581F8 thumb_func_start sub_8058214 @@ -6964,13 +6964,13 @@ sub_8058214: @ 8058214 thumb_func_start sub_8058230 sub_8058230: @ 8058230 push {lr} - ldr r0, _08058240 @ =EventScript_1BB9F0 + ldr r0, _08058240 @ =TradeCenter_TerminateLink bl ScriptContext1_SetupScript bl ScriptContext2_Enable pop {r0} bx r0 .align 2, 0 -_08058240: .4byte EventScript_1BB9F0 +_08058240: .4byte TradeCenter_TerminateLink thumb_func_end sub_8058230 thumb_func_start sub_8058244 diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s index 8ae94ce5e..38e233d6c 100644 --- a/asm/pokemon_jump_2.s +++ b/asm/pokemon_jump_2.s @@ -4244,8 +4244,8 @@ IsSpeciesAllowedInPokemonJump: @ 8149A00 bx r1 thumb_func_end IsSpeciesAllowedInPokemonJump - thumb_func_start sub_8149A18 -sub_8149A18: @ 8149A18 + thumb_func_start IsPokemonJumpSpeciesInParty +IsPokemonJumpSpeciesInParty: @ 8149A18 push {r4,r5,lr} movs r5, 0 _08149A1C: @@ -4286,7 +4286,7 @@ _08149A5E: bx r0 .align 2, 0 _08149A68: .4byte gSpecialVar_Result - thumb_func_end sub_8149A18 + thumb_func_end IsPokemonJumpSpeciesInParty thumb_func_start sub_8149A6C sub_8149A6C: @ 8149A6C @@ -7808,8 +7808,8 @@ _0814B4FC: _0814B500: .4byte 0x0000270e thumb_func_end sub_814B4E8 - thumb_func_start sub_814B504 -sub_814B504: @ 814B504 + thumb_func_start ShowPokemonJumpRecords +ShowPokemonJumpRecords: @ 814B504 push {r4,lr} ldr r4, _0814B520 @ =sub_814B524 adds r0, r4, 0 @@ -7823,7 +7823,7 @@ sub_814B504: @ 814B504 bx r0 .align 2, 0 _0814B520: .4byte sub_814B524 - thumb_func_end sub_814B504 + thumb_func_end ShowPokemonJumpRecords thumb_func_start sub_814B524 sub_814B524: @ 814B524 diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 6f451b90a..17385cd01 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -5,8 +5,8 @@ .text - thumb_func_start sp000_heal_pokemon -sp000_heal_pokemon: @ 80A0058 + thumb_func_start HealPlayerParty +HealPlayerParty: @ 80A0058 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -100,7 +100,7 @@ _080A0104: .align 2, 0 _080A0114: .4byte gPlayerPartyCount _080A0118: .4byte gPlayerParty - thumb_func_end sp000_heal_pokemon + thumb_func_end HealPlayerParty thumb_func_start ScriptGiveMon ScriptGiveMon: @ 80A011C @@ -204,8 +204,8 @@ ScriptGiveEgg: @ 80A01AC bx r1 thumb_func_end ScriptGiveEgg - thumb_func_start CheckForAlivePartyMons -CheckForAlivePartyMons: @ 80A01F4 + thumb_func_start HasEnoughMonsForDoubleBattle +HasEnoughMonsForDoubleBattle: @ 80A01F4 push {lr} bl GetMonsStateToDoubles lsls r0, 24 @@ -228,7 +228,7 @@ _080A0214: bx r0 .align 2, 0 _080A0218: .4byte gSpecialVar_Result - thumb_func_end CheckForAlivePartyMons + thumb_func_end HasEnoughMonsForDoubleBattle thumb_func_start CheckPartyMonHasHeldItem CheckPartyMonHasHeldItem: @ 80A021C @@ -378,8 +378,8 @@ _080A032C: .4byte gPlayerPartyCount _080A0330: .4byte gPlayerParty thumb_func_end ScriptSetMonMoveSlot - thumb_func_start sub_80A0334 -sub_80A0334: @ 80A0334 + thumb_func_start ChooseHalfPartyForBattle +ChooseHalfPartyForBattle: @ 80A0334 push {lr} ldr r1, _080A0348 @ =gMain ldr r0, _080A034C @ =sub_80A0350 @@ -391,7 +391,7 @@ sub_80A0334: @ 80A0334 .align 2, 0 _080A0348: .4byte gMain _080A034C: .4byte sub_80A0350 - thumb_func_end sub_80A0334 + thumb_func_end ChooseHalfPartyForBattle thumb_func_start sub_80A0350 sub_80A0350: @ 80A0350 diff --git a/data/event_scripts.s b/data/event_scripts.s index 4bc69dacf..5e0a0dc8c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5,6 +5,7 @@ #include "constants/items.h" #include "constants/layouts.h" #include "constants/maps.h" +#include "constants/pokemon.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" @@ -23,6 +24,7 @@ #include "constants/map_scripts.h" #include "constants/cable_club.h" #include "constants/field_weather.h" +#include "constants/union_room.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -72,11 +74,11 @@ gStdScripts:: @ 8160450 .4byte Std_ReceivedItem gStdScriptsEnd:: - .include "data/maps/UnknownMap_00_00/scripts.inc" - .include "data/maps/UnknownMap_00_01/scripts.inc" - .include "data/maps/UnknownMap_00_02/scripts.inc" - .include "data/maps/UnknownMap_00_03/scripts.inc" - .include "data/maps/UnknownMap_00_04/scripts.inc" + .include "data/maps/BattleColosseum2P/scripts.inc" + .include "data/maps/TradeCenter/scripts.inc" + .include "data/maps/RecordCenter/scripts.inc" + .include "data/maps/BattleColosseum4P/scripts.inc" + .include "data/maps/UnionRoom/scripts.inc" .include "data/maps/ViridianForest/scripts.inc" .include "data/maps/MtMoon_1F/scripts.inc" .include "data/maps/MtMoon_B1F/scripts.inc" @@ -1236,7 +1238,7 @@ EventScript_OutOfCenterPartyHeal:: @ 81A6C26 fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty fadescreen FADE_FROM_BLACK return @@ -1699,73 +1701,16 @@ gUnknown_81A8CED:: @ 81A8CED releaseall end -CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -FiveIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -OneIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -PewterCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -SevenIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -VermilionCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -FourIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -SixIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -TwoIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -Route4_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -SaffronCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -CeladonCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -LavenderTown_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -ViridianCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 - call EventScript_1BBA04 +Common_EventScript_UnionRoomAttendant:: @ 81A8CF6 + call CableClub_EventScript_UnionRoomAttendant end -CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -FiveIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -OneIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -PewterCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -SevenIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -VermilionCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -FourIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -SixIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -TwoIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -Route4_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -SaffronCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -CeladonCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -LavenderTown_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -ViridianCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC - call EventScript_1BBB6A +Common_EventScript_WirelessClubAttendant:: @ 81A8CFC + call CableClub_EventScript_WirelessClubAttendant end -CeruleanCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -FiveIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -OneIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -PewterCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -SevenIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -VermilionCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -FourIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -SixIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -ThreeIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -TwoIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -Route4_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -SaffronCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -CeladonCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -LavenderTown_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 - call EventScript_1BBB9C +Common_EventScript_DirectCornerAttendant:: @ 81A8D02 + call CableClub_EventScript_DirectCornerAttendant end VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 diff --git a/data/layouts/UnknownMap_00_00/border.bin b/data/layouts/BattleColosseum2P/border.bin similarity index 100% rename from data/layouts/UnknownMap_00_00/border.bin rename to data/layouts/BattleColosseum2P/border.bin diff --git a/data/layouts/UnknownMap_00_00/map.bin b/data/layouts/BattleColosseum2P/map.bin similarity index 100% rename from data/layouts/UnknownMap_00_00/map.bin rename to data/layouts/BattleColosseum2P/map.bin diff --git a/data/layouts/UnknownMap_00_01/border.bin b/data/layouts/BattleColosseum4P/border.bin similarity index 100% rename from data/layouts/UnknownMap_00_01/border.bin rename to data/layouts/BattleColosseum4P/border.bin diff --git a/data/layouts/UnknownMap_00_03/map.bin b/data/layouts/BattleColosseum4P/map.bin similarity index 100% rename from data/layouts/UnknownMap_00_03/map.bin rename to data/layouts/BattleColosseum4P/map.bin diff --git a/data/layouts/UnknownMap_00_02/border.bin b/data/layouts/RecordCenter/border.bin similarity index 100% rename from data/layouts/UnknownMap_00_02/border.bin rename to data/layouts/RecordCenter/border.bin diff --git a/data/layouts/UnknownMap_00_02/map.bin b/data/layouts/RecordCenter/map.bin similarity index 100% rename from data/layouts/UnknownMap_00_02/map.bin rename to data/layouts/RecordCenter/map.bin diff --git a/data/layouts/UnknownMap_00_03/border.bin b/data/layouts/TradeCenter/border.bin similarity index 100% rename from data/layouts/UnknownMap_00_03/border.bin rename to data/layouts/TradeCenter/border.bin diff --git a/data/layouts/UnknownMap_00_01/map.bin b/data/layouts/TradeCenter/map.bin similarity index 100% rename from data/layouts/UnknownMap_00_01/map.bin rename to data/layouts/TradeCenter/map.bin diff --git a/data/layouts/UnknownMap_00_04/border.bin b/data/layouts/UnionRoom/border.bin similarity index 100% rename from data/layouts/UnknownMap_00_04/border.bin rename to data/layouts/UnionRoom/border.bin diff --git a/data/layouts/UnknownMap_00_04/map.bin b/data/layouts/UnionRoom/map.bin similarity index 100% rename from data/layouts/UnknownMap_00_04/map.bin rename to data/layouts/UnionRoom/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index fbeee8c39..6a9b024bd 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -433,52 +433,52 @@ "blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_00", - "name": "UnknownMap_00_00_Layout", + "id": "LAYOUT_BATTLE_COLOSSEUM_2P", + "name": "BattleColosseum2P_Layout", "width": 14, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C44", - "border_filepath": "data/layouts/UnknownMap_00_00/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_00/map.bin" + "border_filepath": "data/layouts/BattleColosseum2P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_01", - "name": "UnknownMap_00_01_Layout", + "id": "LAYOUT_TRADE_CENTER", + "name": "TradeCenter_Layout", "width": 12, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C44", - "border_filepath": "data/layouts/UnknownMap_00_01/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_01/map.bin" + "border_filepath": "data/layouts/TradeCenter/border.bin", + "blockdata_filepath": "data/layouts/TradeCenter/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_02", - "name": "UnknownMap_00_02_Layout", + "id": "LAYOUT_RECORD_CENTER", + "name": "RecordCenter_Layout", "width": 20, "height": 10, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C44", - "border_filepath": "data/layouts/UnknownMap_00_02/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_02/map.bin" + "border_filepath": "data/layouts/RecordCenter/border.bin", + "blockdata_filepath": "data/layouts/RecordCenter/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_03", - "name": "UnknownMap_00_03_Layout", + "id": "LAYOUT_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P_Layout", "width": 14, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C44", - "border_filepath": "data/layouts/UnknownMap_00_03/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_03/map.bin" + "border_filepath": "data/layouts/BattleColosseum4P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin" }, { "id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", @@ -2936,16 +2936,16 @@ "blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_04", - "name": "UnknownMap_00_04_Layout", + "id": "LAYOUT_UNION_ROOM", + "name": "UnionRoom_Layout", "width": 15, "height": 12, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D50DC", - "border_filepath": "data/layouts/UnknownMap_00_04/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_04/map.bin" + "border_filepath": "data/layouts/UnionRoom/border.bin", + "blockdata_filepath": "data/layouts/UnionRoom/map.bin" }, { "id": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/BattleColosseum2P/map.json similarity index 80% rename from data/maps/UnknownMap_00_00/map.json rename to data/maps/BattleColosseum2P/map.json index 43e5f14ad..aebc124e1 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/BattleColosseum2P/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_00", - "name": "UnknownMap_00_00", - "layout": "LAYOUT_UNKNOWN_MAP_00_00", + "id": "MAP_BATTLE_COLOSSEUM_2P", + "name": "BattleColosseum2P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_00_EventScript_1BB9AF", + "script": "BattleColosseum2P_EventScript_Attendant", "flag": "0" } ], @@ -51,7 +51,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_00_EventScript_1BB8C3" + "script": "BattleColosseum2P_EventScript_PlayerSpot0" }, { "type": "trigger", @@ -60,7 +60,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_00_EventScript_1BB8CF" + "script": "BattleColosseum2P_EventScript_PlayerSpot1" } ], "bg_events": [] diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc new file mode 100644 index 000000000..59a5b3754 --- /dev/null +++ b/data/maps/BattleColosseum2P/scripts.inc @@ -0,0 +1,2 @@ +BattleColosseum2P_MapScripts:: @ 8160478 + .byte 0 diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/BattleColosseum4P/map.json similarity index 80% rename from data/maps/UnknownMap_00_03/map.json rename to data/maps/BattleColosseum4P/map.json index 52295b5ea..d385ca315 100644 --- a/data/maps/UnknownMap_00_03/map.json +++ b/data/maps/BattleColosseum4P/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_03", - "name": "UnknownMap_00_03", - "layout": "LAYOUT_UNKNOWN_MAP_00_03", + "id": "MAP_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -51,7 +51,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB8DB" + "script": "BattleColosseum4P_EventScript_PlayerSpot0" }, { "type": "trigger", @@ -60,7 +60,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB915" + "script": "BattleColosseum4P_EventScript_PlayerSpot2" }, { "type": "trigger", @@ -69,7 +69,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB8F8" + "script": "BattleColosseum4P_EventScript_PlayerSpot1" }, { "type": "trigger", @@ -78,7 +78,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB932" + "script": "BattleColosseum4P_EventScript_PlayerSpot3" } ], "bg_events": [] diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc new file mode 100644 index 000000000..918c093d0 --- /dev/null +++ b/data/maps/BattleColosseum4P/scripts.inc @@ -0,0 +1,2 @@ +BattleColosseum4P_MapScripts:: @ 816047B + .byte 0 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 943d1e396..322968550 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 931b2c4e5..efb05b214 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc index b4fefdc98..19975f531 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CeladonCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816C634 + call CableClub_EventScript_Colosseum end -EventScript_16C63A:: @ 816C63A - call EventScript_1BB6AB +CeladonCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816C63A + call CableClub_EventScript_TradeCenter end -EventScript_16C640:: @ 816C640 - call EventScript_1BB7DE +CeladonCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816C640 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index f7b309f3e..a59e9710d 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 70a15e76e..837ab4956 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc index 7c8a7f024..f6f83f0da 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CeruleanCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816AA8E + call CableClub_EventScript_Colosseum end -EventScript_16AA94:: @ 816AA94 - call EventScript_1BB6AB +CeruleanCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816AA94 + call CableClub_EventScript_TradeCenter end -EventScript_16AA9A:: @ 816AA9A - call EventScript_1BB7DE +CeruleanCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816AA9A + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index c3137faec..626263f76 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 9eafc6d0a..bd8c9d41e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 2f0476988..9cec10be2 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CinnabarIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 816E9FD + call CableClub_EventScript_Colosseum end -EventScript_16EA03:: @ 816EA03 - call EventScript_1BB6AB +CinnabarIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EA03 + call CableClub_EventScript_TradeCenter end -EventScript_16EA09:: @ 816EA09 - call EventScript_1BB7DE +CinnabarIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EA09 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index 01da41d52..21148cede 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 11fb855fb..d28b198ce 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc index d518317ed..67f84b9bc 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FiveIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171D30 + call CableClub_EventScript_Colosseum end -EventScript_171D36:: @ 8171D36 - call EventScript_1BB6AB +FiveIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171D36 + call CableClub_EventScript_TradeCenter end -EventScript_171D3C:: @ 8171D3C - call EventScript_1BB7DE +FiveIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171D3C + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 3d99baddb..4ee8e33c1 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FourIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 53d8c630e..af9538b03 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc index c3742867c..a8cc194aa 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FourIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171C32 + call CableClub_EventScript_Colosseum end -EventScript_171C38:: @ 8171C38 - call EventScript_1BB6AB +FourIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171C38 + call CableClub_EventScript_TradeCenter end -EventScript_171C3E:: @ 8171C3E - call EventScript_1BB7DE +FourIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171C3E + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index 864a2cb86..428305d1c 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 025f090c7..6ce142aac 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc index 993a88457..2be67866e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FuchsiaCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816D739 + call CableClub_EventScript_Colosseum end -EventScript_16D73F:: @ 816D73F - call EventScript_1BB6AB +FuchsiaCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816D73F + call CableClub_EventScript_TradeCenter end -EventScript_16D745:: @ 816D745 - call EventScript_1BB7DE +FuchsiaCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816D745 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 13491fce9..d1496398b 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index ac00b284b..7298dc99f 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc index a6fc31686..b2b3bd00d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +IndigoPlateau_PokemonCenter_2F_EventScript_Colosseum:: @ 816EB24 + call CableClub_EventScript_Colosseum end -EventScript_16EB2A:: @ 816EB2A - call EventScript_1BB6AB +IndigoPlateau_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EB2A + call CableClub_EventScript_TradeCenter end -EventScript_16EB30:: @ 816EB30 - call EventScript_1BB7DE +IndigoPlateau_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EB30 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index 7718ecbfd..2109df4d0 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index cc72593c7..beefaa49a 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc index 45f05a491..2ef3c6643 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +LavenderTown_PokemonCenter_2F_EventScript_Colosseum:: @ 816B137 + call CableClub_EventScript_Colosseum end -EventScript_16B13D:: @ 816B13D - call EventScript_1BB6AB +LavenderTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B13D + call CableClub_EventScript_TradeCenter end -EventScript_16B143:: @ 816B143 - call EventScript_1BB7DE +LavenderTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B143 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 9f59c9c5c..d32ab0d4a 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -44,7 +44,7 @@ EventScript_1653C5:: @ 81653C5 OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF lockall fadescreen FADE_TO_WHITE - special sp000_heal_pokemon + special HealPlayerParty fadescreen FADE_FROM_WHITE msgbox gUnknown_817D450 setvar VAR_TEMP_1, 1 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 6c7c3e762..4f1a059ad 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, OneIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_1F_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_1F_OnFrame .byte 0 diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 8a847a81c..a74cbc00a 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc index 0d553f8e4..8adbf8907 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +OneIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171349 + call CableClub_EventScript_Colosseum end -EventScript_17134F:: @ 817134F - call EventScript_1BB6AB +OneIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 817134F + call CableClub_EventScript_TradeCenter end -EventScript_171355:: @ 8171355 - call EventScript_1BB7DE +OneIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171355 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 261b16c1c..0b5008f79 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -487,7 +487,7 @@ Movement_1694BE:: @ 81694BE step_end EventScript_1694C2:: @ 81694C2 - special sp000_heal_pokemon + special HealPlayerParty msgbox gUnknown_818DE38 closemessage playbgm MUS_RIVAL2, 0 diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index ababfb549..6cf1f5137 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PewterCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index d07a3ba3f..b5017653f 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc index 9d3148d6c..1bcf9728b 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +PewterCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A7CA + call CableClub_EventScript_Colosseum end -EventScript_16A7D0:: @ 816A7D0 - call EventScript_1BB6AB +PewterCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A7D0 + call CableClub_EventScript_TradeCenter end -EventScript_16A7D6:: @ 816A7D6 - call EventScript_1BB7DE +PewterCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A7D6 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 7c45a6947..4f9145909 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -8,7 +8,7 @@ PokemonTower_5F_EventScript_163433:: @ 8163433 PokemonTower_5F_EventScript_16343C:: @ 816343C lockall fadescreen FADE_TO_WHITE - special sp000_heal_pokemon + special HealPlayerParty fadescreen FADE_FROM_WHITE msgbox gUnknown_817A1FA setvar VAR_TEMP_1, 1 diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/RecordCenter/map.json similarity index 81% rename from data/maps/UnknownMap_00_02/map.json rename to data/maps/RecordCenter/map.json index 8dc5e473f..9dda49e24 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/RecordCenter/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_02", - "name": "UnknownMap_00_02", - "layout": "LAYOUT_UNKNOWN_MAP_00_02", + "id": "MAP_RECORD_CENTER", + "name": "RecordCenter", + "layout": "LAYOUT_RECORD_CENTER", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_02_EventScript_1BB9D3", + "script": "RecordCenter_EventScript_Attendant", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" }, { "type": "trigger", @@ -92,7 +92,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" } ], "bg_events": [] diff --git a/data/maps/RecordCenter/scripts.inc b/data/maps/RecordCenter/scripts.inc new file mode 100644 index 000000000..873fc2826 --- /dev/null +++ b/data/maps/RecordCenter/scripts.inc @@ -0,0 +1,2 @@ +RecordCenter_MapScripts:: @ 816047A + .byte 0 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 7d165279d..f81563b0c 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, Route10_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 548ff6007..31472bf81 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc index e0262a627..2760e125c 100644 --- a/data/maps/Route10_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +Route10_PokemonCenter_2F_EventScript_Colosseum:: @ 816FD0F + call CableClub_EventScript_Colosseum end -EventScript_16FD15:: @ 816FD15 - call EventScript_1BB6AB +Route10_PokemonCenter_2F_EventScript_TradeCenter:: @ 816FD15 + call CableClub_EventScript_TradeCenter end -EventScript_16FD1B:: @ 816FD1B - call EventScript_1BB7DE +Route10_PokemonCenter_2F_EventScript_RecordCorner:: @ 816FD1B + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index fcb681783..bd2864629 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, Route4_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 Route4_PokemonCenter_1F_OnTransition:: @ 816F744 diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 2f53bfcef..f602e0e25 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index e70f53403..32b1905a4 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +Route4_PokemonCenter_2F_EventScript_Colosseum:: @ 816F8ED + call CableClub_EventScript_Colosseum end -EventScript_16F8F3:: @ 816F8F3 - call EventScript_1BB6AB +Route4_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F8F3 + call CableClub_EventScript_TradeCenter end -EventScript_16F8F9:: @ 816F8F9 - call EventScript_1BB7DE +Route4_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F8F9 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index fe28e6c75..8639de5af 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 457ef551e..b6ae61450 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc index 12b688a7d..5a62223a3 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SaffronCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816F04C + call CableClub_EventScript_Colosseum end -EventScript_16F052:: @ 816F052 - call EventScript_1BB6AB +SaffronCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F052 + call CableClub_EventScript_TradeCenter end -EventScript_16F058:: @ 816F058 - call EventScript_1BB7DE +SaffronCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F058 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 70a27185a..60183ed13 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -128,7 +128,7 @@ EventScript_170A11:: @ 8170A11 EventScript_170A1E:: @ 8170A1E msgbox gUnknown_81A06AB fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate return diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index c109d3eeb..8d0ef3475 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -29,7 +29,7 @@ EventScript_170A97:: @ 8170A97 compare VAR_RESULT, 2 call_if_eq EventScript_170B17 closemessage - special sp000_heal_pokemon + special HealPlayerParty applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 waitmovement 0 special LoadPlayerParty diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 3992ac871..459806f32 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index dd727d017..c44ce8385 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc index 654725ffb..7aa713902 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SevenIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8170BD1 + call CableClub_EventScript_Colosseum end -EventScript_170BD7:: @ 8170BD7 - call EventScript_1BB6AB +SevenIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8170BD7 + call CableClub_EventScript_TradeCenter end -EventScript_170BDD:: @ 8170BDD - call EventScript_1BB7DE +SevenIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8170BDD + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index fb6204f22..713400e2a 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -196,7 +196,7 @@ EventScript_164A53:: @ 8164A53 EventScript_164AA0:: @ 8164AA0 copyvar VAR_0x8005, VAR_RESULT setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 - special sp000_heal_pokemon + special HealPlayerParty msgbox gUnknown_817C8BF setvar VAR_0x8004, 6 special sub_815D9E8 diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 3316ec0b5..6bde430ab 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SixIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_1F_OnFrame .byte 0 diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 1cb356b1f..9966343f0 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc index a86377b29..05555c8d1 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SixIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171E35 + call CableClub_EventScript_Colosseum end -EventScript_171E3B:: @ 8171E3B - call EventScript_1BB6AB +SixIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171E3B + call CableClub_EventScript_TradeCenter end -EventScript_171E41:: @ 8171E41 - call EventScript_1BB7DE +SixIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171E41 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index e3cb1e23b..15d568a6f 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 5fc3dfcca..7ee8e0316 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc index 7589c7946..83b97c22d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +ThreeIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 817187A + call CableClub_EventScript_Colosseum end -EventScript_171880:: @ 8171880 - call EventScript_1BB6AB +ThreeIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171880 + call CableClub_EventScript_TradeCenter end -EventScript_171886:: @ 8171886 - call EventScript_1BB7DE +ThreeIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171886 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/TradeCenter/map.json similarity index 81% rename from data/maps/UnknownMap_00_01/map.json rename to data/maps/TradeCenter/map.json index 3cf67c7b1..71310c57f 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/TradeCenter/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_01", - "name": "UnknownMap_00_01", - "layout": "LAYOUT_UNKNOWN_MAP_00_01", + "id": "MAP_TRADE_CENTER", + "name": "TradeCenter", + "layout": "LAYOUT_TRADE_CENTER", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_01_EventScript_1BB9C1", + "script": "TradeCenter_EventScript_Attendant", "flag": "0" } ], @@ -51,7 +51,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_01_EventScript_1BB950" + "script": "TradeCenter_EventScript_Chair0" }, { "type": "trigger", @@ -60,7 +60,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_01_EventScript_1BB95C" + "script": "TradeCenter_EventScript_Chair1" } ], "bg_events": [] diff --git a/data/maps/TradeCenter/scripts.inc b/data/maps/TradeCenter/scripts.inc new file mode 100644 index 000000000..fa3ed8869 --- /dev/null +++ b/data/maps/TradeCenter/scripts.inc @@ -0,0 +1,2 @@ +TradeCenter_MapScripts:: @ 8160479 + .byte 0 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 4caef4f41..bb927734e 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -82,14 +82,14 @@ "x": 1, "y": 1, "elevation": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2E7" + "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords" }, { "type": "bg_event_type_0", "x": 0, "y": 1, "elevation": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC" + "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords" } ] } diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index ce2f7c9ba..0bbb24423 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -125,7 +125,7 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC060 + goto_if_eq JoyfulGameCorner_EventScript_InfoMan2 goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555 msgbox gUnknown_81A285C release @@ -140,7 +140,7 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC0CE + goto_if_eq JoyfulGameCorner_EventScript_MinigameAttendant goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5 compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 goto_if_eq EventScript_17158A diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index c5da2e223..6661a61eb 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index aa762183c..ba3815e00 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 99da551b4..f8e803ccb 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +TwoIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 81717F3 + call CableClub_EventScript_Colosseum end -EventScript_1717F9:: @ 81717F9 - call EventScript_1BB6AB +TwoIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 81717F9 + call CableClub_EventScript_TradeCenter end -EventScript_1717FF:: @ 81717FF - call EventScript_1BB7DE +TwoIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 81717FF + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnionRoom/map.json similarity index 84% rename from data/maps/UnknownMap_00_04/map.json rename to data/maps/UnionRoom/map.json index b18296b2c..05afe6e01 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnionRoom/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_04", - "name": "UnknownMap_00_04", - "layout": "LAYOUT_UNKNOWN_MAP_00_04", + "id": "MAP_UNION_ROOM", + "name": "UnionRoom", + "layout": "LAYOUT_UNION_ROOM", "music": "MUS_UNION", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_16050C", + "script": "UnionRoom_EventScript_16050C", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604DA", + "script": "UnionRoom_EventScript_1604DA", "flag": "FLAG_HIDE_UNION_ROOM_4" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_160502", + "script": "UnionRoom_EventScript_160502", "flag": "FLAG_HIDE_UNION_ROOM_8" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604F8", + "script": "UnionRoom_EventScript_1604F8", "flag": "FLAG_HIDE_UNION_ROOM_7" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604EE", + "script": "UnionRoom_EventScript_1604EE", "flag": "FLAG_HIDE_UNION_ROOM_6" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604E4", + "script": "UnionRoom_EventScript_1604E4", "flag": "FLAG_HIDE_UNION_ROOM_5" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604D0", + "script": "UnionRoom_EventScript_1604D0", "flag": "FLAG_HIDE_UNION_ROOM_3" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604C6", + "script": "UnionRoom_EventScript_1604C6", "flag": "FLAG_HIDE_UNION_ROOM_2" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604BC", + "script": "UnionRoom_EventScript_1604BC", "flag": "FLAG_HIDE_UNION_ROOM_1" } ], diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnionRoom/scripts.inc similarity index 59% rename from data/maps/UnknownMap_00_04/scripts.inc rename to data/maps/UnionRoom/scripts.inc index 2cda124c4..c948682ce 100644 --- a/data/maps/UnknownMap_00_04/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,9 +1,9 @@ -UnknownMap_00_04_MapScripts:: @ 816047C - map_script MAP_SCRIPT_ON_RESUME, UnknownMap_00_04_OnResume - map_script MAP_SCRIPT_ON_TRANSITION, UnknownMap_00_04_OnTransition +UnionRoom_MapScripts:: @ 816047C + map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition .byte 0 -UnknownMap_00_04_OnResume:: @ 8160487 +UnionRoom_OnResume:: @ 8160487 setflag FLAG_HIDE_UNION_ROOM_1 setflag FLAG_HIDE_UNION_ROOM_2 setflag FLAG_HIDE_UNION_ROOM_3 @@ -23,10 +23,10 @@ UnknownMap_00_04_OnResume:: @ 8160487 special UnionRoomSpecial end -UnknownMap_00_04_OnTransition:: @ 81604BB +UnionRoom_OnTransition:: @ 81604BB end -UnknownMap_00_04_EventScript_1604BC:: @ 81604BC +UnionRoom_EventScript_1604BC:: @ 81604BC lock faceplayer setvar VAR_RESULT, 1 @@ -34,7 +34,7 @@ UnknownMap_00_04_EventScript_1604BC:: @ 81604BC release end -UnknownMap_00_04_EventScript_1604C6:: @ 81604C6 +UnionRoom_EventScript_1604C6:: @ 81604C6 lock faceplayer setvar VAR_RESULT, 2 @@ -42,7 +42,7 @@ UnknownMap_00_04_EventScript_1604C6:: @ 81604C6 release end -UnknownMap_00_04_EventScript_1604D0:: @ 81604D0 +UnionRoom_EventScript_1604D0:: @ 81604D0 lock faceplayer setvar VAR_RESULT, 3 @@ -50,7 +50,7 @@ UnknownMap_00_04_EventScript_1604D0:: @ 81604D0 release end -UnknownMap_00_04_EventScript_1604DA:: @ 81604DA +UnionRoom_EventScript_1604DA:: @ 81604DA lock faceplayer setvar VAR_RESULT, 4 @@ -58,7 +58,7 @@ UnknownMap_00_04_EventScript_1604DA:: @ 81604DA release end -UnknownMap_00_04_EventScript_1604E4:: @ 81604E4 +UnionRoom_EventScript_1604E4:: @ 81604E4 lock faceplayer setvar VAR_RESULT, 5 @@ -66,7 +66,7 @@ UnknownMap_00_04_EventScript_1604E4:: @ 81604E4 release end -UnknownMap_00_04_EventScript_1604EE:: @ 81604EE +UnionRoom_EventScript_1604EE:: @ 81604EE lock faceplayer setvar VAR_RESULT, 6 @@ -74,7 +74,7 @@ UnknownMap_00_04_EventScript_1604EE:: @ 81604EE release end -UnknownMap_00_04_EventScript_1604F8:: @ 81604F8 +UnionRoom_EventScript_1604F8:: @ 81604F8 lock faceplayer setvar VAR_RESULT, 7 @@ -82,7 +82,7 @@ UnknownMap_00_04_EventScript_1604F8:: @ 81604F8 release end -UnknownMap_00_04_EventScript_160502:: @ 8160502 +UnionRoom_EventScript_160502:: @ 8160502 lock faceplayer setvar VAR_RESULT, 8 @@ -90,7 +90,7 @@ UnknownMap_00_04_EventScript_160502:: @ 8160502 release end -UnknownMap_00_04_EventScript_16050C:: @ 816050C +UnionRoom_EventScript_16050C:: @ 816050C lock faceplayer setvar VAR_RESULT, 9 @@ -98,7 +98,7 @@ UnknownMap_00_04_EventScript_16050C:: @ 816050C release end -UnknownMap_00_04_EventScript_160516:: @ 8160516 +UnionRoom_EventScript_160516:: @ 8160516 lockall setvar VAR_RESULT, 10 waitstate diff --git a/data/maps/UnknownMap_00_00/scripts.inc b/data/maps/UnknownMap_00_00/scripts.inc deleted file mode 100644 index bd155a889..000000000 --- a/data/maps/UnknownMap_00_00/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_00_MapScripts:: @ 8160478 - .byte 0 diff --git a/data/maps/UnknownMap_00_01/scripts.inc b/data/maps/UnknownMap_00_01/scripts.inc deleted file mode 100644 index 0c05ea80d..000000000 --- a/data/maps/UnknownMap_00_01/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_01_MapScripts:: @ 8160479 - .byte 0 diff --git a/data/maps/UnknownMap_00_02/scripts.inc b/data/maps/UnknownMap_00_02/scripts.inc deleted file mode 100644 index d12ac4304..000000000 --- a/data/maps/UnknownMap_00_02/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_02_MapScripts:: @ 816047A - .byte 0 diff --git a/data/maps/UnknownMap_00_03/scripts.inc b/data/maps/UnknownMap_00_03/scripts.inc deleted file mode 100644 index 60c25bf54..000000000 --- a/data/maps/UnknownMap_00_03/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_03_MapScripts:: @ 816047B - .byte 0 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index 40ead09e0..ad7e02455 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 30504e96c..4a9190f0f 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc index 45278dc0f..66539b9b6 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +VermilionCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816B46C + call CableClub_EventScript_Colosseum end -EventScript_16B472:: @ 816B472 - call EventScript_1BB6AB +VermilionCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B472 + call CableClub_EventScript_TradeCenter end -EventScript_16B478:: @ 816B478 - call EventScript_1BB7DE +VermilionCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B478 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 4a09cff1e..43e74ef4c 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 0c3a4361a..c46d275cf 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc index 165ce15fc..58ada3f9f 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +ViridianCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A308 + call CableClub_EventScript_Colosseum end -EventScript_16A30E:: @ 816A30E - call EventScript_1BB6AB +ViridianCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A30E + call CableClub_EventScript_TradeCenter end -EventScript_16A314:: @ 816A314 - call EventScript_1BB7DE +ViridianCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A314 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 8619c19ad..0ff365eae 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -45,11 +45,11 @@ "gMapGroup42" ], "gMapGroup0": [ - "UnknownMap_00_00", - "UnknownMap_00_01", - "UnknownMap_00_02", - "UnknownMap_00_03", - "UnknownMap_00_04" + "BattleColosseum2P", + "TradeCenter", + "RecordCenter", + "BattleColosseum4P", + "UnionRoom" ], "gMapGroup1": [ "ViridianForest", diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 4d8ea5f1c..abbd37e06 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -118,17 +118,17 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 textcolor 1 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement VAR_0x8007, Movement_1BB88F + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88B + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return CableClub_EventScript_ExitTradeCenter:: @ 81BB34F lockall - call EventScript_1BB367 + call CableClub_EventScript_PlayerExitTradeCenter call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA @@ -136,7 +136,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F releaseall end -EventScript_1BB367:: @ 81BB367 +CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367 special CloseLink special HelpSystem_Enable special sub_811390C @@ -144,16 +144,16 @@ EventScript_1BB367:: @ 81BB367 textcolor 1 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88F + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call EventScript_1BB3E6 + call CableClub_EventScript_TrainerCardDataOverwritten return CableClub_EventScript_ExitUnionRoom:: @ 81BB39C lockall - call EventScript_1BB3B4 + call CableClub_EventScript_PlayerExitUnionRoom call CableClub_EventScript_CloseUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA @@ -161,34 +161,34 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C releaseall end -EventScript_1BB3B4:: @ 81BB3B4 +CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4 special HelpSystem_Enable special sub_811390C setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88F + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call EventScript_1BB3E6 + call CableClub_EventScript_TrainerCardDataOverwritten return -EventScript_1BB3E6:: @ 81BB3E6 - message Text_1BC918 +CableClub_EventScript_TrainerCardDataOverwritten:: @ 81BB3E6 + message CableClub_Text_TrainerCardDataOverwritten waitmessage playse SE_PIN - message Text_1BC943 + message CableClub_Text_HopeToSeeYouAgain waitmessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88B + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return CableClub_EventScript_PlayerExitLinkRoom:: @ 81BB40A - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 return @@ -197,413 +197,408 @@ CableClub_EventScript_Tutorial:: @ 81BB415 textcolor 1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81BD898 + msgbox CableClub_Text_FirstTimeRightThisWay closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB447 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachCounter waitmovement 0 delay 30 - msgbox gUnknown_81BD966 + msgbox CableClub_Text_ExplainWirelessClubFirstTime setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 2 releaseall end -Movement_1BB447:: @ 81BB447 +Movement_PlayerApproachCounter: @ 81BB447 walk_up walk_up step_end -EventScript_1BB44A:: @ 81BB44A - message gUnknown_81BC311 +CableClub_EventScript_WelcomeToCableClub:: @ 81BB44A + message CableClub_Text_WelcomeWhichCableClubService waitmessage delay 15 - goto EventScript_1BB467 + goto CableClub_EventScript_SelectCableClubRoom end -EventScript_1BB459:: @ 81BB459 - msgbox gUnknown_81BC35E - goto EventScript_1BB467 +CableClub_EventScript_UnusedWelcomeToCableClub:: @ 81BB459 + msgbox CableClub_Text_WhichService + goto CableClub_EventScript_SelectCableClubRoom end -EventScript_1BB467:: @ 81BB467 +CableClub_EventScript_SelectCableClubRoom:: @ 81BB467 setvar VAR_0x8004, 0 multichoice 0, 0, MULTICHOICE_TRADE_CENTER_COLOSSEUM, FALSE switch VAR_RESULT - case 0, EventScript_1BB6AB - case 1, EventScript_1BB4A3 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_TradeCenter + case 1, CableClub_EventScript_Colosseum + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BB4A3:: @ 81BB4A3 +CableClub_EventScript_Colosseum:: @ 81BB4A3 copyvar VAR_0x8007, VAR_LAST_TALKED - goto EventScript_1BB4AE - -EventScript_1BB4AD:: @ 81BB4AD + goto CableClub_EventScript_SelectBattleMode end -EventScript_1BB4AE:: @ 81BB4AE - message Text_1BD338 +CableClub_EventScript_SelectBattleMode:: @ 81BB4AE + message CableClub_Text_PlayWhichBattleMode waitmessage multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE switch VAR_RESULT - case 0, EventScript_1BB50F - case 1, EventScript_1BB51A - case 2, EventScript_1BB541 - case 3, EventScript_1BB501 - case 4, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_SingleBattleMode + case 1, CableClub_EventScript_DoubleBattleMode + case 2, CableClub_EventScript_MultiBattleMode + case 3, CableClub_EventScript_BattleModeInfo + case 4, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BB501:: @ 81BB501 - msgbox gUnknown_81BD390 - goto EventScript_1BB4AE +CableClub_EventScript_BattleModeInfo:: @ 81BB501 + msgbox CableClub_Text_ExplainBattleModes + goto CableClub_EventScript_SelectBattleMode end -EventScript_1BB50F:: @ 81BB50F - setvar VAR_0x8004, 1 - goto EventScript_1BB54C +CableClub_EventScript_SingleBattleMode:: @ 81BB50F + setvar VAR_0x8004, USING_SINGLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -EventScript_1BB51A:: @ 81BB51A - special CheckForAlivePartyMons - compare VAR_RESULT, 0 - goto_if_ne EventScript_1BB533 - setvar VAR_0x8004, 2 - goto EventScript_1BB54C +CableClub_EventScript_DoubleBattleMode:: @ 81BB51A + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS + goto_if_ne CableClub_EventScript_NeedTwoMonsForDoubleBattle + setvar VAR_0x8004, USING_DOUBLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -EventScript_1BB533:: @ 81BB533 - msgbox gUnknown_81BC409 - goto EventScript_1BB4AE +CableClub_EventScript_NeedTwoMonsForDoubleBattle:: @ 81BB533 + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle + goto CableClub_EventScript_SelectBattleMode end -EventScript_1BB541:: @ 81BB541 - setvar VAR_0x8004, 5 - goto EventScript_1BB54C +CableClub_EventScript_MultiBattleMode:: @ 81BB541 + setvar VAR_0x8004, USING_MULTI_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -EventScript_1BB54C:: @ 81BB54C +CableClub_EventScript_TryEnterColosseum:: @ 81BB54C call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F - message gUnknown_81BC4AC + goto_if_eq CableClub_EventScript_AbortLink + message CableClub_Text_PleaseWaitBCancel waitmessage special HelpSystem_Disable textcolor 3 - special sub_8081064 + special TryBattleLinkup waitstate call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB5B3 + goto_if_eq CableClub_EventScript_EnterColosseum compare VAR_RESULT, 2 - goto_if_eq EventScript_1BB80F + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq EventScript_1BB81F + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq EventScript_1BB63C + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers compare VAR_RESULT, 5 - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq EventScript_1BB7FF + goto_if_eq CableClub_EventScript_AbortLinkConnectionError end -EventScript_1BB5B3:: @ 81BB5B3 - special sp000_heal_pokemon +CableClub_EventScript_EnterColosseum:: @ 81BB5B3 + special HealPlayerParty special SavePlayerParty special LoadPlayerBag copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll Text_1BC590 + messageautoscroll CableClub_Text_PleaseEnter waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release - compare VAR_0x8004, 5 - goto_if_eq EventScript_1BB62C + compare VAR_0x8004, USING_MULTI_BATTLE + goto_if_eq CableClub_EventScript_WarpTo4PColosseum special SetCableClubWarp - warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 + warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8 special DoCableClubWarp waitstate end -EventScript_1BB621:: @ 81BB621 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB894 +@ Unused +CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 81BB621 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight waitmovement 0 return -EventScript_1BB62C:: @ 81BB62C +CableClub_EventScript_WarpTo4PColosseum:: @ 81BB62C special SetCableClubWarp - warp MAP_UNKNOWN_MAP_00_03, 255, 5, 8 + warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8 special DoCableClubWarp waitstate end -EventScript_1BB63C:: @ 81BB63C +CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: @ 81BB63C switch VAR_0x8004 - case 1, EventScript_1BB68A - case 2, EventScript_1BB679 - case 5, EventScript_1BB668 - goto EventScript_1BB857 - -EventScript_1BB667:: @ 81BB667 + case USING_SINGLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForSingleBattle + case USING_DOUBLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle + case USING_MULTI_BATTLE, CableClub_EventScript_AbortLinkNeedFourPlayers + goto CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants end -EventScript_1BB668:: @ 81BB668 +CableClub_EventScript_AbortLinkNeedFourPlayers:: @ 81BB668 special CloseLink - msgbox gUnknown_81BC736 - goto EventScript_1BB69B - -EventScript_1BB678:: @ 81BB678 + msgbox CableClub_Text_NeedFourPlayers + goto CableClub_EventScript_ConfirmNumberAndRestart end -EventScript_1BB679:: @ 81BB679 +CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle:: @ 81BB679 special CloseLink - msgbox gUnknown_81BC700 - goto EventScript_1BB69B - -EventScript_1BB689:: @ 81BB689 + msgbox CableClub_Text_CantDoubleBattleWithXPlayers + goto CableClub_EventScript_ConfirmNumberAndRestart end -EventScript_1BB68A:: @ 81BB68A +CableClub_EventScript_AbortLinkWrongNumberForSingleBattle:: @ 81BB68A special CloseLink - msgbox gUnknown_81BC6CA - goto EventScript_1BB69B - -EventScript_1BB69A:: @ 81BB69A + msgbox CableClub_Text_CantSingleBattleWithXPlayers + goto CableClub_EventScript_ConfirmNumberAndRestart end -EventScript_1BB69B:: @ 81BB69B - special CloseLink +CableClub_EventScript_ConfirmNumberAndRestart:: @ 81BB69B + special CloseLink @ Redundant special HelpSystem_Enable - msgbox gUnknown_81BC76B + msgbox CableClub_Text_PleaseConfirmNumberAndRestart release end -EventScript_1BB6AB:: @ 81BB6AB +CableClub_EventScript_TradeCenter:: @ 81BB6AB copyvar VAR_0x8007, VAR_LAST_TALKED - call EventScript_1BB79C + call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F - message gUnknown_81BC4AC + goto_if_eq CableClub_EventScript_AbortLink + message CableClub_Text_PleaseWaitBCancel waitmessage special HelpSystem_Disable textcolor 3 - special sub_80810CC + special TryTradeLinkup waitstate call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB73D + goto_if_eq CableClub_EventScript_EnterTradeCenter compare VAR_RESULT, 2 - goto_if_eq EventScript_1BB80F + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq EventScript_1BB81F + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq EventScript_1BB857 + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants compare VAR_RESULT, 5 - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq EventScript_1BB7FF + goto_if_eq CableClub_EventScript_AbortLinkConnectionError compare VAR_RESULT, 7 - goto_if_eq EventScript_1BB7DF + goto_if_eq CableClub_EventScript_AbortLinkPlayerNotReady compare VAR_RESULT, 9 - goto_if_eq EventScript_1BB7EF + goto_if_eq CableClub_EventScript_AbortLinkOtherTrainerNotReady end -EventScript_1BB73D:: @ 81BB73D - setvar VAR_0x8004, 3 +CableClub_EventScript_EnterTradeCenter:: @ 81BB73D + setvar VAR_0x8004, USING_TRADE_CENTER copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll Text_1BC590 + messageautoscroll CableClub_Text_PleaseEnter waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release special SetCableClubWarp - setwarp MAP_UNKNOWN_MAP_00_01, 255, 5, 8 + setwarp MAP_TRADE_CENTER, 255, 5, 8 special DoCableClubWarp waitstate end -EventScript_1BB79C:: @ 81BB79C +CableClub_EventScript_CheckPartyTradeRequirements:: @ 81BB79C specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 - goto_if_lt EventScript_1BB7C2 + goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB7D0 - setvar VAR_RESULT, 1 + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_CantTradeEnigmaBerry + setvar VAR_RESULT, TRUE return -EventScript_1BB7C2:: @ 81BB7C2 - msgbox gUnknown_81BC442 - setvar VAR_RESULT, 0 +CableClub_EventScript_NeedTwoMonsToTrade:: @ 81BB7C2 + msgbox CableClub_Text_NeedTwoMonsToTrade + setvar VAR_RESULT, FALSE return -EventScript_1BB7D0:: @ 81BB7D0 - msgbox gUnknown_81BC47C - setvar VAR_RESULT, 0 +CableClub_EventScript_CantTradeEnigmaBerry:: @ 81BB7D0 + msgbox CableClub_Text_CantTradeEnigmaBerry + setvar VAR_RESULT, FALSE return -EventScript_1BB7DE:: @ 81BB7DE +@ Record Corner is nopped in FRLG +CableClub_EventScript_RecordCorner:: @ 81BB7DE end -EventScript_1BB7DF:: @ 81BB7DF +CableClub_EventScript_AbortLinkPlayerNotReady:: @ 81BB7DF special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC95C + msgbox CableClub_Text_NotSetUpForFarAwayRegion release end -EventScript_1BB7EF:: @ 81BB7EF +CableClub_EventScript_AbortLinkOtherTrainerNotReady:: @ 81BB7EF special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC9C0 + msgbox CableClub_Text_OtherTrainerNotReady release end -EventScript_1BB7FF:: @ 81BB7FF +CableClub_EventScript_AbortLinkConnectionError:: @ 81BB7FF special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC615 + msgbox CableClub_Text_LinkErrorPleaseReset release end -EventScript_1BB80F:: @ 81BB80F +CableClub_EventScript_AbortLinkSomeoneNotReady:: @ 81BB80F special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC5C0 + msgbox CableClub_Text_SomeoneIsNotReadyToLink release end -EventScript_1BB81F:: @ 81BB81F +CableClub_EventScript_AbortLinkDifferentSelections:: @ 81BB81F special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC64E + msgbox CableClub_Text_PlayersMadeDifferentSelections release end -EventScript_1BB82F:: @ 81BB82F +CableClub_EventScript_AbortLink:: @ 81BB82F special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC68A + msgbox CableClub_Text_PleaseVisitAgain release end -EventScript_1BB83F:: @ 81BB83F +CableClub_EventScript_AbortMinigame:: @ 81BB83F special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BCFD1 + msgbox CableClub_Text_ComeAgain release end -EventScript_1BB84F:: @ 81BB84F +@ Unused +CableClub_EventScript_CableClubWarp:: @ 81BB84F special SetCableClubWarp special DoCableClubWarp waitstate end -EventScript_1BB857:: @ 81BB857 +CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants:: @ 81BB857 special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC6A1 + msgbox CableClub_Text_IncorrectNumberOfParticipants release end -EventScript_1BB867:: @ 81BB867 +CableClub_EventScript_AbortLinkPlayerHasBadEgg:: @ 81BB867 special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC9E0 + msgbox CableClub_Text_YouHaveAMonThatCantBeTaken release end -EventScript_1BB877:: @ 81BB877 +CableClub_EventScript_WirelessClubAdjustements:: @ 81BB877 msgbox Text_WirelessClubUndergoingAdjustments release end -EventScript_1BB881:: @ 81BB881 +CableClub_EventScript_NotReadyYet:: @ 81BB881 msgbox Text_AppearsToBeUndergoingAdjustments releaseall end -Movement_1BB88B:: @ 81BB88B +Movement_AttendantFaceDown:: @ 81BB88B face_down step_end -Movement_1BB88D:: @ 81BB88D +@ Unused +Movement_AttendantFaceRight:: @ 81BB88D face_right step_end -Movement_1BB88F:: @ 81BB88F +Movement_AttendantFaceLeft:: @ 81BB88F face_left step_end -Movement_1BB891:: @ 81BB891 +Movement_PlayerExitLinkRoom:: @ 81BB891 walk_down walk_down step_end -Movement_1BB894:: @ 81BB894 +Movement_PlayerApproachLinkRoomRight:: @ 81BB894 walk_right walk_up walk_up step_end -Movement_1BB898:: @ 81BB898 +Movement_PlayerApproachLinkRoomLeft:: @ 81BB898 walk_left walk_up walk_up step_end -Movement_1BB89C:: @ 81BB89C +Movement_PlayerEnterLinkRoom:: @ 81BB89C walk_up step_end -Movement_1BB89E:: @ 81BB89E +@ Unused +Movement_PlayerFaceAttendantLeft:: @ 81BB89E face_left step_end -Movement_1BB8A0:: @ 81BB8A0 +Movement_PlayerFaceAttendantRight:: @ 81BB8A0 face_right step_end -Movement_1BB8A2:: @ 81BB8A2 +Movement_PlayerEnterMinigameRoom:: @ 81BB8A2 walk_left walk_up walk_up walk_up step_end -gUnknown_81BB8A7:: @ 81BB8A7 +CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -615,551 +610,521 @@ gUnknown_81BB8A7:: @ 81BB8A7 releaseall end -gUnknown_81BB8C3:: @ 81BB8C3 -UnknownMap_00_00_EventScript_1BB8C3:: @ 81BB8C3 +BattleColosseum2P_EventScript_PlayerSpot0:: @ 81BB8C3 setvar VAR_0x8005, 0 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB8CF:: @ 81BB8CF -UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF +BattleColosseum2P_EventScript_PlayerSpot1:: @ 81BB8CF setvar VAR_0x8005, 1 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB8DB:: @ 81BB8DB -UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB +BattleColosseum4P_EventScript_PlayerSpot0:: @ 81BB8DB fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB94F + goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger setvar VAR_0x8005, 0 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB8F8:: @ 81BB8F8 -UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 +BattleColosseum4P_EventScript_PlayerSpot1:: @ 81BB8F8 fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB94F + goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger setvar VAR_0x8005, 1 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB915:: @ 81BB915 -UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 +BattleColosseum4P_EventScript_PlayerSpot2:: @ 81BB915 fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB94F + goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger setvar VAR_0x8005, 2 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB932:: @ 81BB932 -UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 +BattleColosseum4P_EventScript_PlayerSpot3:: @ 81BB932 fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB94F + goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger setvar VAR_0x8005, 3 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -EventScript_1BB94F:: @ 81BB94F +BattleColosseum4P_EventScript_CancelSpotTrigger:: @ 81BB94F end gUnknown_81BB950:: @ 81BB950 -UnknownMap_00_01_EventScript_1BB950:: @ 81BB950 +TradeCenter_EventScript_Chair0:: @ 81BB950 setvar VAR_0x8005, 0 textcolor 3 - special sub_8081978 + special EnterTradeSeat waitstate end -gUnknown_81BB95C:: @ 81BB95C -UnknownMap_00_01_EventScript_1BB95C:: @ 81BB95C +TradeCenter_EventScript_Chair1:: @ 81BB95C setvar VAR_0x8005, 1 textcolor 3 - special sub_8081978 + special EnterTradeSeat waitstate end -EventScript_1BB968:: @ 81BB968 +@ Unused +TradeCenter_EventScript_Chair2:: @ 81BB968 setvar VAR_0x8005, 2 textcolor 3 - special sub_8081978 + special EnterTradeSeat waitstate end -EventScript_1BB974:: @ 81BB974 +@ Unused +TradeCenter_EventScript_Chair3:: @ 81BB974 setvar VAR_0x8005, 3 textcolor 3 - special sub_8081978 + special EnterTradeSeat waitstate end -gUnknown_81BB980:: @ 81BB980 -UnknownMap_00_02_EventScript_1BB980:: @ 81BB980 +@ Nop in FRLG +RecordCenter_EventScript_Spot:: @ 81BB980 end -gUnknown_81BB981:: @ 81BB981 +CableClub_EventScript_ReadTrainerCard:: @ 81BB981 textcolor 3 msgbox Text_LookedAtPlayersTrainerCard fadescreen FADE_TO_BLACK - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gUnknown_81BB992:: @ 81BB992 +CableClub_EventScript_ReadTrainerCardColored:: @ 81BB992 textcolor 3 msgbox Text_LookedAtPlayersTrainerCardColored fadescreen FADE_TO_BLACK - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gUnknown_81BB9A3:: @ 81BB9A3 +CableClub_EventScript_TooBusyToNotice:: @ 81BB9A3 textcolor 3 msgbox Text_TrainerTooBusyToNotice closemessage end -UnknownMap_00_00_EventScript_1BB9AF:: @ 81BB9AF +BattleColosseum2P_EventScript_Attendant:: @ 81BB9AF textcolor 3 - special sub_8069740 + special Script_FacePlayer msgbox Text_TakeSeatStartBattle - special sub_8069768 + special Script_ClearHeldMovement closemessage end -UnknownMap_00_01_EventScript_1BB9C1:: @ 81BB9C1 +TradeCenter_EventScript_Attendant:: @ 81BB9C1 textcolor 3 - special sub_8069740 + special Script_FacePlayer msgbox Text_TakeSeatStartTrade - special sub_8069768 + special Script_ClearHeldMovement closemessage end -UnknownMap_00_02_EventScript_1BB9D3:: @ 81BB9D3 +@ Nop in FRLG +RecordCenter_EventScript_Attendant:: @ 81BB9D3 end -gUnknown_81BB9D4:: @ 81BB9D4 +TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4 textcolor 3 msgbox Text_TerminateLinkIfYouLeaveRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_1BB9F0 + goto_if_eq TradeCenter_TerminateLink erasebox 0, 0, 29, 19 releaseall end -EventScript_1BB9F0:: @ 81BB9F0 +TradeCenter_TerminateLink:: @ 81BB9F0 textcolor 3 - messageautoscroll Text_1BC7E2 + messageautoscroll Text_TerminateLinkConfirmation waitmessage special sub_8081770 end -gUnknown_81BB9FC:: @ 81BB9FC - special sub_8081744 - special sub_807E704 +CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC + special CleanupLinkRoomState + special ReturnFromLinkRoom waitstate end -EventScript_1BBA04:: @ 81BBA04 +CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, Special_BadEggInParty - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB867 + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE - goto_if_eq EventScript_1BBB60 - message Text_1BD65B + goto_if_eq CableClub_EventScript_UnionRoomAdapterNotConnected + message CableClub_Text_WelcomeUnionRoomEnter waitmessage - goto EventScript_1BBA51 - -EventScript_1BBA50:: @ 81BBA50 + goto CableClub_EventScript_AskEnterUnionRoom end -EventScript_1BBA51:: @ 81BBA51 +CableClub_EventScript_AskEnterUnionRoom:: @ 81BBA51 multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE switch VAR_RESULT - case 0, EventScript_1BBA94 - case 1, EventScript_1BB82F - case 2, EventScript_1BBA88 - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_EnterUnionRoom + case 1, CableClub_EventScript_AbortLink + case 2, CableClub_EventScript_UnionRoomInfo + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBA88:: @ 81BBA88 - message Text_1BD706 +CableClub_EventScript_UnionRoomInfo:: @ 81BBA88 + message CableClub_Text_UnionRoomInfo waitmessage - goto EventScript_1BBA51 - -EventScript_1BBA93:: @ 81BBA93 + goto CableClub_EventScript_AskEnterUnionRoom end -EventScript_1BBA94:: @ 81BBA94 - call EventScript_1BBB1E - compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F +CableClub_EventScript_EnterUnionRoom:: @ 81BBA94 + call CableClub_EventScript_CheckPartyUnionRoomRequirements + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_AbortLink call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F - msgbox gUnknown_81BD86A + goto_if_eq CableClub_EventScript_AbortLink + msgbox CableClub_Text_EnjoyUnionRoom closemessage - special sp000_heal_pokemon - setvar VAR_0x8004, 6 + special HealPlayerParty + setvar VAR_0x8004, USING_UNION_ROOM copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 special HelpSystem_Disable call CableClub_EventScript_OpenUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 5, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 closedoor 5, 1 waitdooranim - special sub_811B15C + special Script_ResetUnionRoomTrade special SetCableClubWarp - warpteleport2 MAP_UNKNOWN_MAP_00_04, 255, 7, 11 + warpteleport2 MAP_UNION_ROOM, 255, 7, 11 waitstate special UnionRoomSpecial waitstate end -EventScript_1BBB1E:: @ 81BBB1E +CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 81BBB1E specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 - goto_if_lt EventScript_1BBB44 + goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBB52 - setvar VAR_RESULT, 1 + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_NoEnigmaBerryInUnionRoom + setvar VAR_RESULT, TRUE return -EventScript_1BBB44:: @ 81BBB44 - msgbox gUnknown_81BCBC3 +CableClub_EventScript_NeedTwoMonsForUnionRoom:: @ 81BBB44 + msgbox CableClub_Text_NeedTwoMonsForUnionRoom goto EventScript_SetResultFalse - -EventScript_1BBB51:: @ 81BBB51 end -EventScript_1BBB52:: @ 81BBB52 - msgbox gUnknown_81BCC00 +CableClub_EventScript_NoEnigmaBerryInUnionRoom:: @ 81BBB52 + msgbox CableClub_Text_NoEnigmaBerryInUnionRoom goto EventScript_SetResultFalse - -EventScript_1BBB5F:: @ 81BBB5F end -EventScript_1BBB60:: @ 81BBB60 - msgbox gUnknown_81BCC3A +CableClub_EventScript_UnionRoomAdapterNotConnected:: @ 81BBB60 + msgbox CableClub_Text_UnionRoomAdapterNotConnected release return -EventScript_1BBB6A:: @ 81BBB6A +CableClub_EventScript_WirelessClubAttendant:: @ 81BBB6A lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877 - msgbox gUnknown_81BDB85, MSGBOX_YESNO + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements + msgbox CableClub_Text_AskAboutLinking, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BBB92 - msgbox gUnknown_81BDBF8 + goto_if_eq CableClub_EventScript_DontAskAboutLinking + msgbox CableClub_Text_ExplainWirelessClub release return -EventScript_1BBB92:: @ 81BBB92 - msgbox gUnknown_81BDEDF +CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92 + msgbox CableClub_Text_HopeYouEnjoyWirelessSystem release return -EventScript_1BBB9C:: @ 81BBB9C +CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, Special_BadEggInParty - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB867 + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE - goto_if_eq EventScript_1BB44A - message Text_1BD28D + goto_if_eq CableClub_EventScript_WelcomeToCableClub + message CableClub_Text_WelcomeWhichDirectCornerRoom waitmessage delay 15 - goto EventScript_1BBBE7 - -EventScript_1BBBE6:: @ 81BBBE6 + goto CableClub_EventScript_DirectCornerSelectService end -EventScript_1BBBE7:: @ 81BBBE7 - goto_if_unset FLAG_GOT_POWDER_JAR, EventScript_1BBC32 +CableClub_EventScript_DirectCornerSelectService:: @ 81BBBE7 + goto_if_unset FLAG_GOT_POWDER_JAR, CableClub_EventScript_DirectCornerNoBerry multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE switch VAR_RESULT - case 0, EventScript_1BBC69 - case 1, EventScript_1BBC97 - case 2, EventScript_1BBD35 - case 3, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessBerryCrush + case 3, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBC32:: @ 81BBC32 +CableClub_EventScript_DirectCornerNoBerry:: @ 81BBC32 multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_2, FALSE switch VAR_RESULT - case 0, EventScript_1BBC69 - case 1, EventScript_1BBC97 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBC69:: @ 81BBC69 - msgbox gUnknown_81BD317, MSGBOX_YESNO +CableClub_EventScript_WirelessTrade:: @ 81BBC69 + msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BB82F - call EventScript_1BB79C - compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F - setvar VAR_0x8004, 3 - goto EventScript_1BBD6F - -EventScript_1BBC96:: @ 81BBC96 + goto_if_eq CableClub_EventScript_AbortLink + call CableClub_EventScript_CheckPartyTradeRequirements + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_AbortLink + setvar VAR_0x8004, LINK_GROUP_TRADE + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBC97:: @ 81BBC97 - message Text_1BD338 +CableClub_EventScript_WirelessBattleSelect:: @ 81BBC97 + message CableClub_Text_PlayWhichBattleMode waitmessage multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE switch VAR_RESULT - case 0, EventScript_1BBCEA - case 1, EventScript_1BBCF5 - case 2, EventScript_1BBD1C - case 3, EventScript_1BBD27 - case 4, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_WirelessSingleBattle + case 1, CableClub_EventScript_WirelessDoubleBattle + case 2, CableClub_EventScript_WirelessMultiBattle + case 3, CableClub_EventScript_WirelessBattleInfo + case 4, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBCEA:: @ 81BBCEA - setvar VAR_0x8004, 0 - goto EventScript_1BBD6F - -EventScript_1BBCF4:: @ 81BBCF4 +CableClub_EventScript_WirelessSingleBattle:: @ 81BBCEA + setvar VAR_0x8004, LINK_GROUP_SINGLE_BATTLE + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBCF5:: @ 81BBCF5 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 - goto_if_ne EventScript_1BBD0E - setvar VAR_0x8004, 1 - goto EventScript_1BBD6F - -EventScript_1BBD0D:: @ 81BBD0D +CableClub_EventScript_WirelessDoubleBattle:: @ 81BBCF5 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS + goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle + setvar VAR_0x8004, LINK_GROUP_DOUBLE_BATTLE + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBD0E:: @ 81BBD0E - msgbox gUnknown_81BC409 - goto EventScript_1BBC97 - -EventScript_1BBD1B:: @ 81BBD1B +CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 81BBD0E + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle + goto CableClub_EventScript_WirelessBattleSelect end -EventScript_1BBD1C:: @ 81BBD1C - setvar VAR_0x8004, 2 - goto EventScript_1BBD6F - -EventScript_1BBD26:: @ 81BBD26 +CableClub_EventScript_WirelessMultiBattle:: @ 81BBD1C + setvar VAR_0x8004, LINK_GROUP_MULTI_BATTLE + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBD27:: @ 81BBD27 - msgbox gUnknown_81BD390 - goto EventScript_1BBC97 - -EventScript_1BBD34:: @ 81BBD34 +CableClub_EventScript_WirelessBattleInfo:: @ 81BBD27 + msgbox CableClub_Text_ExplainBattleModes + goto CableClub_EventScript_WirelessBattleSelect end -EventScript_1BBD35:: @ 81BBD35 - msgbox gUnknown_81BD362, MSGBOX_YESNO +CableClub_EventScript_WirelessBerryCrush:: @ 81BBD35 + msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink special CheckHasAtLeastOneBerry - compare VAR_RESULT, 0 - goto_if_eq EventScript_1BBD61 - setvar VAR_0x8004, 5 - goto EventScript_1BBD6F - -EventScript_1BBD60:: @ 81BBD60 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush + setvar VAR_0x8004, LINK_GROUP_BERRY_CRUSH + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBD61:: @ 81BBD61 - msgbox gUnknown_81BCB81 - goto EventScript_1BBBE7 - -EventScript_1BBD6E:: @ 81BBD6E +CableClub_EventScript_NeedBerryForBerryCrush:: @ 81BBD61 + msgbox CableClub_Text_NeedBerryForBerryCrush + goto CableClub_EventScript_DirectCornerSelectService end -EventScript_1BBD6F:: @ 81BBD6F +CableClub_EventScript_SaveAndChooseLinkLeader:: @ 81BBD6F call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink switch VAR_0x8004 - case 3, EventScript_1BBDBC - case 0, EventScript_1BBDBC - case 1, EventScript_1BBDBC - case 2, EventScript_1BBE50 - case 5, EventScript_1BBEE4 + case LINK_GROUP_TRADE, CableClub_EventScript_ChooseLinkLeaderFrom2 + case LINK_GROUP_SINGLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2 + case LINK_GROUP_DOUBLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2 + case LINK_GROUP_MULTI_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom4 + case LINK_GROUP_BERRY_CRUSH, CableClub_EventScript_ChooseLinkLeader end -EventScript_1BBDBC:: @ 81BBDBC +CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 81BBDBC textcolor 3 - message Text_1BD51B + message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage call EventScript_1A6675 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT - case 0, EventScript_1BBE28 - case 1, EventScript_1BBE00 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_TryJoinGroup2Players + case 1, CableClub_EventScript_TryLeadGroup2Players + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBE00:: @ 81BBE00 - call EventScript_1BBF78 +CableClub_EventScript_TryLeadGroup2Players:: @ 81BBE00 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBDBC + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBE00 + goto_if_eq CableClub_EventScript_TryLeadGroup2Players release return -EventScript_1BBE28:: @ 81BBE28 - call EventScript_1BBF80 +CableClub_EventScript_TryJoinGroup2Players:: @ 81BBE28 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBDBC + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBE28 + goto_if_eq CableClub_EventScript_TryJoinGroup2Players release return -EventScript_1BBE50:: @ 81BBE50 +CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 81BBE50 textcolor 3 - message Text_1BD582 + message CableClub_Text_ChooseGroupLeaderOfFour waitmessage call EventScript_1A6675 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT - case 0, EventScript_1BBEBC - case 1, EventScript_1BBE94 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_TryJoinGroup4Players + case 1, CableClub_EventScript_TryLeadGroup4Players + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBE94:: @ 81BBE94 - call EventScript_1BBF78 +CableClub_EventScript_TryLeadGroup4Players:: @ 81BBE94 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBE50 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBE94 + goto_if_eq CableClub_EventScript_TryLeadGroup4Players release return -EventScript_1BBEBC:: @ 81BBEBC - call EventScript_1BBF80 +CableClub_EventScript_TryJoinGroup4Players:: @ 81BBEBC + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBE50 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBEBC + goto_if_eq CableClub_EventScript_TryJoinGroup4Players release return -EventScript_1BBEE4:: @ 81BBEE4 +CableClub_EventScript_ChooseLinkLeader:: @ 81BBEE4 textcolor 3 - message Text_1BD5F1 + message CableClub_Text_ChooseGroupLeader waitmessage call EventScript_1A6675 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT - case 0, EventScript_1BBF50 - case 1, EventScript_1BBF28 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_TryJoinGroupXPlayers + case 1, CableClub_EventScript_TryLeadGroupXPlayers + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBF28:: @ 81BBF28 - call EventScript_1BBF78 +CableClub_EventScript_TryLeadGroupXPlayers:: @ 81BBF28 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBEE4 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBF28 + goto_if_eq CableClub_EventScript_TryLeadGroupXPlayers release return -EventScript_1BBF50:: @ 81BBF50 - call EventScript_1BBF80 +CableClub_EventScript_TryJoinGroupXPlayers:: @ 81BBF50 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBEE4 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBF50 + goto_if_eq CableClub_EventScript_TryJoinGroupXPlayers release return -EventScript_1BBF78:: @ 81BBF78 +CableClub_EventScript_TryBecomeLinkLeader:: @ 81BBF78 special HelpSystem_Disable - special sub_8115A24 + special TryBecomeLinkLeader waitstate return -EventScript_1BBF80:: @ 81BBF80 +CableClub_EventScript_TryJoinLinkGroup:: @ 81BBF80 special HelpSystem_Disable - special BerryBlenderLinkJoinGroup + special TryJoinLinkGroup waitstate return -EventScript_1BBF88:: @ 81BBF88 - messageautoscroll Text_1BC59E +CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88 + messageautoscroll CableClub_Text_DirectYouToYourRoom waitmessage delay 60 closemessage @@ -1168,42 +1133,42 @@ EventScript_1BBF88:: @ 81BBF88 special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release waitstate end -gUnknown_81BBFD8:: @ 81BBFD8 +CableClub_EventScript_81BBFD8:: @ 81BBFD8 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB881 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE - goto_if_eq EventScript_1BC016 + goto_if_eq CableClub_EventScript_AdapterNotConnected special HelpSystem_Disable fadescreen FADE_TO_BLACK special sub_814F1D4 waitstate - msgbox gUnknown_81BCA43 + msgbox CableClub_Text_ParticipantsStepUpToCounter special HelpSystem_Enable releaseall end -EventScript_1BC016:: @ 81BC016 - msgbox gUnknown_81BCA13 +CableClub_EventScript_AdapterNotConnected:: @ 81BC016 + msgbox CableClub_Text_AdapterNotConnected releaseall end @@ -1231,161 +1196,139 @@ CableClub_EventScript_CloseGameCornerBarrier:: @ 81BC052 setmetatile 5, 3, 759, 1 return -CeladonCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -FiveIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -FourIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -LavenderTown_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -OneIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -PewterCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -Route10_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -Route4_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -SaffronCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -SevenIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -SixIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -TwoIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -VermilionCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C - special sub_811999C +CableClub_OnResume:: @ 81BC05C + special InitUnionRoom end -EventScript_1BC060:: @ 81BC060 +JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - message Text_1BCCFF + message Text_DescribeWhichGame waitmessage multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE switch VAR_RESULT - case 0, EventScript_1BC0B0 - case 1, EventScript_1BC0BA - case 2, EventScript_1BC0C4 - case SCR_MENU_CANCEL, EventScript_1BC0C4 + case 0, CableClub_EventScript_PokemonJumpInfo + case 1, CableClub_EventScript_DodrioBerryPickingInfo + case 2, CableClub_EventScript_MinigameInfoExit + case SCR_MENU_CANCEL, CableClub_EventScript_MinigameInfoExit end -EventScript_1BC0B0:: @ 81BC0B0 - msgbox gUnknown_81BCD4D +CableClub_EventScript_PokemonJumpInfo:: @ 81BC0B0 + msgbox Text_PokemonJumpInfo release end -EventScript_1BC0BA:: @ 81BC0BA - msgbox gUnknown_81BCE73 +CableClub_EventScript_DodrioBerryPickingInfo:: @ 81BC0BA + msgbox Text_DodrioBerryPickingInfo release end -EventScript_1BC0C4:: @ 81BC0C4 - msgbox gUnknown_81BCF2E +CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4 + msgbox Text_TalkToManToPlay release end -EventScript_1BC0CE:: @ 81BC0CE +JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - message Text_1BCF69 + message Text_WelcomeCanYouWait waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE - goto_if_eq EventScript_1BC29C + goto_if_eq CableClub_EventScript_AdapterNotConnectedMinigame delay 60 special HelpSystem_Disable - message Text_1BD02D + message Text_PlayWhichGame waitmessage multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE switch VAR_RESULT - case 0, EventScript_1BC13A - case 1, EventScript_1BC184 - case 2, EventScript_1BB83F - case SCR_MENU_CANCEL, EventScript_1BB83F + case 0, CableClub_EventScript_PlayPokemonJump + case 1, CableClub_EventScript_PlayDodrioBerryPicking + case 2, CableClub_EventScript_AbortMinigame + case SCR_MENU_CANCEL, CableClub_EventScript_AbortMinigame end -EventScript_1BC13A:: @ 81BC13A +CableClub_EventScript_PlayPokemonJump:: @ 81BC13A setvar VAR_0x8005, 0 - special sub_8149A18 - compare VAR_RESULT, 0 - goto_if_eq EventScript_NoEligiblePkmn - msgbox gUnknown_81BD059 + special IsPokemonJumpSpeciesInParty + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_NoEligiblePkmn + msgbox Text_EnterWhichPokemon setvar VAR_0x8005, 0 special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge EventScript_1BB83F + compare VAR_0x8004, PARTY_SIZE + goto_if_ge CableClub_EventScript_AbortMinigame call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB83F - setvar VAR_0x8004, 4 - goto EventScript_1BC1CE - -EventScript_1BC183:: @ 81BC183 + goto_if_eq CableClub_EventScript_AbortMinigame + setvar VAR_0x8004, LINK_GROUP_POKEMON_JUMP + goto CableClub_EventScript_ChooseLinkLeaderMinigame end -EventScript_1BC184:: @ 81BC184 +CableClub_EventScript_PlayDodrioBerryPicking:: @ 81BC184 setvar VAR_0x8005, 1 - special sub_81537C0 + special IsDodrioInParty compare VAR_RESULT, 0 - goto_if_eq EventScript_NoEligiblePkmn - msgbox gUnknown_81BD059 + goto_if_eq CableClub_EventScript_NoEligiblePkmn + msgbox Text_EnterWhichPokemon setvar VAR_0x8005, 1 special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge EventScript_1BB83F + compare VAR_0x8004, PARTY_SIZE + goto_if_ge CableClub_EventScript_AbortMinigame call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB83F - setvar VAR_0x8004, 6 - goto EventScript_1BC1CE - -EventScript_1BC1CD:: @ 81BC1CD + goto_if_eq CableClub_EventScript_AbortMinigame + setvar VAR_0x8004, LINK_GROUP_BERRY_PICKING + goto CableClub_EventScript_ChooseLinkLeaderMinigame end -EventScript_1BC1CE:: @ 81BC1CE +CableClub_EventScript_ChooseLinkLeaderMinigame:: @ 81BC1CE textcolor 3 - message Text_1BD5F1 + message CableClub_Text_ChooseGroupLeader waitmessage call EventScript_1A6675 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT - case 0, EventScript_1BC23A - case 1, EventScript_1BC212 - case 2, EventScript_1BB83F - case SCR_MENU_CANCEL, EventScript_1BB83F + case 0, CableClub_EventScript_TryJoinMinigameLinkGroup + case 1, CableClub_EventScript_TryBecomeMinigameLinkLeader + case 2, CableClub_EventScript_AbortMinigame + case SCR_MENU_CANCEL, CableClub_EventScript_AbortMinigame end -EventScript_1BC212:: @ 81BC212 - call EventScript_1BBF78 +CableClub_EventScript_TryBecomeMinigameLinkLeader:: @ 81BC212 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq EventScript_1BC262 + goto_if_eq CableClub_EventScript_EnterMinigame compare VAR_RESULT, 5 - goto_if_eq EventScript_1BC1CE + goto_if_eq CableClub_EventScript_ChooseLinkLeaderMinigame compare VAR_RESULT, 8 - goto_if_eq EventScript_1BC212 + goto_if_eq CableClub_EventScript_TryBecomeMinigameLinkLeader release return -EventScript_1BC23A:: @ 81BC23A - call EventScript_1BBF80 +CableClub_EventScript_TryJoinMinigameLinkGroup:: @ 81BC23A + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq EventScript_1BC262 + goto_if_eq CableClub_EventScript_EnterMinigame compare VAR_RESULT, 5 - goto_if_eq EventScript_1BC1CE + goto_if_eq CableClub_EventScript_ChooseLinkLeaderMinigame compare VAR_RESULT, 8 - goto_if_eq EventScript_1BC23A + goto_if_eq CableClub_EventScript_TryJoinMinigameLinkGroup release return -EventScript_1BC262:: @ 81BC262 - messageautoscroll Text_1BD080 +CableClub_EventScript_EnterMinigame:: @ 81BC262 + messageautoscroll Text_AllGoodToGo waitmessage delay 120 closemessage @@ -1394,156 +1337,156 @@ EventScript_1BC262:: @ 81BC262 special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A2 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 release waitstate end -EventScript_1BC29C:: @ 81BC29C - msgbox gUnknown_81BCFE8 +CableClub_EventScript_AdapterNotConnectedMinigame:: @ 81BC29C + msgbox Text_AdapterNotConnectedMinigame release end -EventScript_NoEligiblePkmn:: @ 81BC2A6 - msgbox gUnknown_81BD0CF, MSGBOX_YESNO +CableClub_EventScript_NoEligiblePkmn:: @ 81BC2A6 + msgbox EventScript_ExplainPokemonJumpRequirements, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BB83F + goto_if_eq CableClub_EventScript_AbortMinigame compare VAR_0x8005, 0 - call_if_eq EventScript_1BC2D5 + call_if_eq CableClub_EventScript_ExplainPokemonJumpRequirements compare VAR_0x8005, 1 - call_if_eq EventScript_1BC2DE - goto EventScript_1BB83F - -EventScript_1BC2D4:: @ 81BC2D4 + call_if_eq CableClub_EventScript_ExplainDodrioBerryPickingRequirements + goto CableClub_EventScript_AbortMinigame end -EventScript_1BC2D5:: @ 81BC2D5 - msgbox gUnknown_81BD14B +CableClub_EventScript_ExplainPokemonJumpRequirements:: @ 81BC2D5 + msgbox Text_ShortJumpingPokemonAllowed return -EventScript_1BC2DE:: @ 81BC2DE - msgbox gUnknown_81BD213 +CableClub_EventScript_ExplainDodrioBerryPickingRequirements:: @ 81BC2DE + msgbox Text_OnlyDodrioAllowed return -TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 +TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - special sub_814B504 + special ShowPokemonJumpRecords waitstate releaseall end -TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC +TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords:: @ 81BC2FC special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - special sub_8153810 + special ShowDodrioBerryPickingRecords waitstate releaseall end -gUnknown_81BC311:: @ 81BC311 +CableClub_Text_WelcomeWhichCableClubService:: @ 81BC311 .string "Welcome to the POKéMON CABLE\n" .string "CLUB.\p" .string "Which of our services do you wish\n" .string "to use?$" -gUnknown_81BC35E:: @ 81BC35E +CableClub_Text_WhichService:: @ 81BC35E .string "Which of our services do you wish\n" .string "to use?$" -Text_1BC388:: @ 81BC388 +CableClub_Text_TradeMonsUsingLinkCable:: @ 81BC388 .string "Trade POKéMON with another player\n" .string "using a GBA Game Link cable.$" -Text_1BC3C7:: @ 81BC3C7 +CableClub_Text_BattleUsingLinkCable:: @ 81BC3C7 .string "You may battle another TRAINER\n" .string "using a GBA Game Link cable.$" -Text_1BC403:: @ 81BC403 +@ Unused, translated in Emerald +CableClub_Text_CloseThisMenu:: @ 81BC403 .string "おわります$" -gUnknown_81BC409:: @ 81BC409 +CableClub_Text_NeedTwoMonsForDoubleBattle:: @ 81BC409 .string "For a DOUBLE BATTLE, you must\n" .string "have at least two POKéMON.$" -gUnknown_81BC442:: @ 81BC442 +CableClub_Text_NeedTwoMonsToTrade:: @ 81BC442 .string "For trading, you must have at\n" .string "least two POKéMON with you.$" -gUnknown_81BC47C:: @ 81BC47C +CableClub_Text_CantTradeEnigmaBerry:: @ 81BC47C .string "A POKéMON holding the {STR_VAR_1}\n" .string "BERRY can't be traded.$" -gUnknown_81BC4AC:: @ 81BC4AC +CableClub_Text_PleaseWaitBCancel:: @ 81BC4AC .string "Please wait.\n" .string "… … B Button: Cancel$" -gUnknown_81BC4CE:: @ 81BC4CE +CableClub_Text_WhenAllPlayersReadyAConfirmBCancel:: @ 81BC4CE .string "When all players are ready…\n" .string "A Button: Confirm\l" .string "B Button: Cancel$" -gUnknown_81BC50D:: @ 81BC50D +CableClub_Text_StartLinkWithXPlayersAConfirmBCancel:: @ 81BC50D .string "Start link with {STR_VAR_1} players.\n" .string "A Button: Confirm\l" .string "B Button: Cancel$" -gUnknown_81BC54C:: @ 81BC54C +CableClub_Text_AwaitingLinkupBCancel:: @ 81BC54C .string "Awaiting linkup…\n" .string "… … B Button: Cancel$" -Text_1BC572:: @ 81BC572 +@ Unused, translated in Emerald +CableClub_Text_OkayToSaveProgress:: @ 81BC572 .string "はじめる　まえに　レポートを\n" .string "かきますが　よろしいですか？$" -Text_1BC590:: @ 81BC590 +CableClub_Text_PleaseEnter:: @ 81BC590 .string "Please enter.$" -Text_1BC59E:: @ 81BC59E +CableClub_Text_DirectYouToYourRoom:: @ 81BC59E .string "I'll direct you to your room now.$" -gUnknown_81BC5C0:: @ 81BC5C0 +CableClub_Text_SomeoneIsNotReadyToLink:: @ 81BC5C0 .string "Someone is not ready to link.\p" .string "Please come back after everyone\n" .string "has made preparations.$" -gUnknown_81BC615:: @ 81BC615 +CableClub_Text_LinkErrorPleaseReset:: @ 81BC615 .string "Sorry, we have a link error…\n" .string "Please reset and try again.$" -gUnknown_81BC64E:: @ 81BC64E +CableClub_Text_PlayersMadeDifferentSelections:: @ 81BC64E .string "The link partners appear to have\n" .string "made different selections.$" -gUnknown_81BC68A:: @ 81BC68A +CableClub_Text_PleaseVisitAgain:: @ 81BC68A .string "Please do visit again.$" -gUnknown_81BC6A1:: @ 81BC6A1 +CableClub_Text_IncorrectNumberOfParticipants:: @ 81BC6A1 .string "The number of participants is\n" .string "incorrect.$" -gUnknown_81BC6CA:: @ 81BC6CA +CableClub_Text_CantSingleBattleWithXPlayers:: @ 81BC6CA .string "The SINGLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -gUnknown_81BC700:: @ 81BC700 +CableClub_Text_CantDoubleBattleWithXPlayers:: @ 81BC700 .string "The DOUBLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -gUnknown_81BC736:: @ 81BC736 +CableClub_Text_NeedFourPlayers:: @ 81BC736 .string "There must be four players to play\n" .string "this Battle Mode.$" -gUnknown_81BC76B:: @ 81BC76B +CableClub_Text_PleaseConfirmNumberAndRestart:: @ 81BC76B .string "Please confirm the number of\n" .string "players and start again.$" @@ -1551,7 +1494,7 @@ Text_TerminateLinkIfYouLeaveRoom:: @ 81BC7A1 .string "The link will be terminated if you\n" .string "leave the room. Is that okay?$" -Text_1BC7E2:: @ 81BC7E2 +Text_TerminateLinkConfirmation:: @ 81BC7E2 .string "Terminating link…\n" .string "You will be escorted out of\l" .string "the room. Please wait.$" @@ -1577,88 +1520,95 @@ Text_TakeSeatStartTrade:: @ 81BC8DA .string "Please take your seat and start\n" .string "your trade.$" -Text_1BC906:: @ 81BC906 +@ Unused, leftover from RS +RecordCorner_Text_ThanksForComing:: @ 81BC906 .string "ごりよう　ありがとう　ございました$" -Text_1BC918:: @ 81BC918 +CableClub_Text_TrainerCardDataOverwritten:: @ 81BC918 .string "The TRAINER CARD data will\n" .string "be overwritten.$" -Text_1BC943:: @ 81BC943 +CableClub_Text_HopeToSeeYouAgain:: @ 81BC943 .string "I hope to see you again!$" -gUnknown_81BC95C:: @ 81BC95C +CableClub_Text_NotSetUpForFarAwayRegion:: @ 81BC95C .string "I'm awfully sorry.\p" .string "We're not set up to conduct trades\n" .string "with TRAINERS far away in another\l" .string "region yet…$" -gUnknown_81BC9C0:: @ 81BC9C0 +CableClub_Text_OtherTrainerNotReady:: @ 81BC9C0 .string "The other TRAINER is not ready.$" -gUnknown_81BC9E0:: @ 81BC9E0 +CableClub_Text_YouHaveAMonThatCantBeTaken:: @ 81BC9E0 .string "You have at least one POKéMON\n" .string "that can't be taken.$" -gUnknown_81BCA13:: @ 81BCA13 +CableClub_Text_AdapterNotConnected:: @ 81BCA13 .string "The Wireless Adapter is not\n" .string "connected properly.$" -gUnknown_81BCA43:: @ 81BCA43 +CableClub_Text_ParticipantsStepUpToCounter:: @ 81BCA43 .string "Participants are asked to step up\n" .string "to the reception counter.$" -Text_1BCA7F:: @ 81BCA7F +@ Unused, translated in Emerald +CableClub_Text_Hello:: @ 81BCA7F .string "こんにちは！$" -Text_1BCA86:: @ 81BCA86 +@ Unused, translated in Emerald +CableClub_Text_PleaseWait:: @ 81BCA86 .string "しょうしょう　おまちください$" -Text_1BCA95:: @ 81BCA95 +CableClub_Text_YouMayTradeHere:: @ 81BCA95 .string "You may trade your POKéMON here\n" .string "with another TRAINER.$" -Text_1BCACB:: @ 81BCACB +CableClub_Text_YouMayBattleHere:: @ 81BCACB .string "You may battle with your friends\n" .string "here.$" -Text_1BCAF2:: @ 81BCAF2 +CableClub_Text_CanMakeBerryPowder:: @ 81BCAF2 .string "Two to five TRAINERS can make\n" .string "BERRY POWDER together.$" -Text_1BCB27:: @ 81BCB27 +@ Unused, Record Mix nopped +CableClub_Text_CanMixRecords:: @ 81BCB27 .string "ワイヤレス　クラブでの\n" .string "あそびかたを　せつめいします$" -Text_1BCB42:: @ 81BCB42 +CableClub_Text_CancelSelectedItem:: @ 81BCB42 .string "Cancels the selected MENU item.$" -Text_1BCB62:: @ 81BCB62 +@ Unused, translated in Emerald +CableClub_Text_WhichBattleMode:: @ 81BCB62 .string "どちらの　しょうぶに　しますか？$" -Text_1BCB73:: @ 81BCB73 +@ Unused, translated in Emerald +CableClub_Text_ReturnsToPreviousStep:: @ 81BCB73 .string "ひとつ　まえに　もどります$" -gUnknown_81BCB81:: @ 81BCB81 +CableClub_Text_NeedBerryForBerryCrush:: @ 81BCB81 .string "To use the BERRY CRUSH service,\n" .string "you must have at least one BERRY.$" -gUnknown_81BCBC3:: @ 81BCBC3 +CableClub_Text_NeedTwoMonsForUnionRoom:: @ 81BCBC3 .string "To enter the UNION ROOM, you must\n" .string "have at least two POKéMON.$" -gUnknown_81BCC00:: @ 81BCC00 +CableClub_Text_NoEnigmaBerryInUnionRoom:: @ 81BCC00 .string "No POKéMON holding the {STR_VAR_1}\n" .string "BERRY may enter the UNION ROOM.$" -gUnknown_81BCC3A:: @ 81BCC3A +CableClub_Text_UnionRoomAdapterNotConnected:: @ 81BCC3A .string "This is the POKéMON WIRELESS CLUB\n" .string "UNION ROOM.\p" .string "Unfortunately, your Wireless\n" .string "Adapter is not connected properly.\p" .string "Please do come again.$" -Text_1BCCBE:: @ 81BCCBE +@ Unused, translated in Emerald +CableClub_Text_OhExcuseMe:: @ 81BCCBE .string "あ‥‥\n" .string "おきゃくさま！$" @@ -1667,12 +1617,12 @@ Text_PlayerIsPlayingRightNowGoForIt:: @ 81BCCCA .string "right now.\l" .string "Go for it!$" -Text_1BCCFF:: @ 81BCCFF +Text_DescribeWhichGame:: @ 81BCCFF .string "I can explain game rules to you,\n" .string "if you'd like.\p" .string "Which game should I describe?$" -gUnknown_81BCD4D:: @ 81BCD4D +Text_PokemonJumpInfo:: @ 81BCD4D .string "“POKéMON JUMP”\p" .string "Make your POKéMON skip the\n" .string "VINE WHIP rope with the A Button.\p" @@ -1685,7 +1635,7 @@ gUnknown_81BCD4D:: @ 81BCD4D .string "Good things happen if everyone\n" .string "jumps in time.$" -gUnknown_81BCE73:: @ 81BCE73 +Text_DodrioBerryPickingInfo:: @ 81BCE73 .string "“DODRIO BERRY-PICKING”\p" .string "Command DODRIO's three heads to\n" .string "catch falling BERRIES.\p" @@ -1694,47 +1644,48 @@ gUnknown_81BCE73:: @ 81BCE73 .string "To play this game, you must have\n" .string "a DODRIO.$" -gUnknown_81BCF2E:: @ 81BCF2E +Text_TalkToManToPlay:: @ 81BCF2E .string "If you want to play a game,\n" .string "please tell the man beside me.$" -Text_1BCF69:: @ 81BCF69 +Text_WelcomeCanYouWait:: @ 81BCF69 .string "Hi, welcome!\n" .string "You can play games over the\l" .string "Wireless Communication System.\p" .string "Can you wait just a little bit?$" -gUnknown_81BCFD1:: @ 81BCFD1 +CableClub_Text_ComeAgain:: @ 81BCFD1 .string "All right, come again!$" -gUnknown_81BCFE8:: @ 81BCFE8 +Text_AdapterNotConnectedMinigame:: @ 81BCFE8 .string "The Wireless Adapter isn't\n" .string "connected.\p" .string "Come back when it's hooked up!$" -Text_1BD02D:: @ 81BD02D +Text_PlayWhichGame:: @ 81BD02D .string "All right, which game did you want\n" .string "to play?$" -gUnknown_81BD059:: @ 81BD059 +Text_EnterWhichPokemon:: @ 81BD059 .string "Which POKéMON would you like to\n" .string "enter?$" -Text_1BD080:: @ 81BD080 +Text_AllGoodToGo:: @ 81BD080 .string "Okay, you're all good to go.\n" .string "Don't let the others beat you!$" -Text_1BD0BC:: @ 81BD0BC +@ Unused, translated in Emerald +Text_LeavingDoComeAgain:: @ 81BD0BC .string "きょうは　けえるのか？\n" .string "またこいよ！$" -gUnknown_81BD0CF:: @ 81BD0CF +EventScript_ExplainPokemonJumpRequirements:: @ 81BD0CF .string "It doesn't look like you have any\n" .string "POKéMON that you can enter…\p" .string "Would you like me to explain what\n" .string "kinds of POKéMON can enter?$" -gUnknown_81BD14B:: @ 81BD14B +Text_ShortJumpingPokemonAllowed:: @ 81BD14B .string "“POKéMON JUMP” is open to POKéMON\n" .string "around 28 inches or less.\p" .string "What you can't enter are those\n" @@ -1743,17 +1694,18 @@ gUnknown_81BD14B:: @ 81BD14B .string "swim, burrow, or fly.\p" .string "That's all you need to know.$" -gUnknown_81BD213:: @ 81BD213 +Text_OnlyDodrioAllowed:: @ 81BD213 .string "“DODRIO BERRY-PICKING”…\n" .string "Well, the name says it all.\p" .string "You have to have a DODRIO to play\n" .string "this game.$" -Text_1BD274:: @ 81BD274 +@ Unused, translated in Emerald +Text_RetryFromStartPlease:: @ 81BD274 .string "もういちど　はじめから\n" .string "やりなおして　みて　くれ$" -Text_1BD28D:: @ 81BD28D +CableClub_Text_WelcomeWhichDirectCornerRoom:: @ 81BD28D .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB DIRECT CORNER.\p" .string "You may interact directly with\n" @@ -1761,18 +1713,18 @@ Text_1BD28D:: @ 81BD28D .string "Which room would you like to\n" .string "enter?$" -gUnknown_81BD317:: @ 81BD317 +CableClub_Text_TradePokemon:: @ 81BD317 .string "Would you like to trade POKéMON?$" -Text_1BD338:: @ 81BD338 +CableClub_Text_PlayWhichBattleMode:: @ 81BD338 .string "Which Battle Mode would you like\n" .string "to play?$" -gUnknown_81BD362:: @ 81BD362 +CableClub_Text_UseBerryCrush:: @ 81BD362 .string "Would you like to use the\n" .string "BERRY CRUSH System?$" -gUnknown_81BD390:: @ 81BD390 +CableClub_Text_ExplainBattleModes:: @ 81BD390 .string "There are three Battle Modes.\p" .string "SINGLE BATTLE is for two TRAINERS\n" .string "with one or more POKéMON each.\p" @@ -1787,25 +1739,25 @@ gUnknown_81BD390:: @ 81BD390 .string "Each TRAINER can have one POKéMON\n" .string "in battle at a time.$" -Text_1BD51B:: @ 81BD51B +CableClub_Text_ChooseGroupLeaderOfTwo:: @ 81BD51B .string "Please decide which of you two\n" .string "will become the LEADER.\p" .string "The other player must then choose\n" .string "“JOIN GROUP.”$" -Text_1BD582:: @ 81BD582 +CableClub_Text_ChooseGroupLeaderOfFour:: @ 81BD582 .string "Please decide which of you four\n" .string "will become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -Text_1BD5F1:: @ 81BD5F1 +CableClub_Text_ChooseGroupLeader:: @ 81BD5F1 .string "Please decide which of you will\n" .string "become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -Text_1BD65B:: @ 81BD65B +CableClub_Text_WelcomeUnionRoomEnter:: @ 81BD65B .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB UNION ROOM.\p" .string "You may interact directly with\n" @@ -1813,7 +1765,7 @@ Text_1BD65B:: @ 81BD65B .string "whom you may not even know.\p" .string "Would you like to enter the ROOM?$" -Text_1BD706:: @ 81BD706 +CableClub_Text_UnionRoomInfo:: @ 81BD706 .string "The TRAINERS in the UNION ROOM\n" .string "will be those players around you\l" .string "who have also entered the ROOM.\p" @@ -1827,11 +1779,11 @@ Text_1BD706:: @ 81BD706 .string "trade.\p" .string "Would you like to enter the ROOM?$" -gUnknown_81BD86A:: @ 81BD86A +CableClub_Text_EnjoyUnionRoom:: @ 81BD86A .string "I hope you enjoy your time in\n" .string "the UNION ROOM.$" -gUnknown_81BD898:: @ 81BD898 +CableClub_Text_FirstTimeRightThisWay:: @ 81BD898 .string "Hello!\n" .string "My name is TEALA.\p" .string "This must be your first time\n" @@ -1842,7 +1794,7 @@ gUnknown_81BD898:: @ 81BD898 .string "floor of our POKéMON CENTER.\p" .string "Right this way, please.$" -gUnknown_81BD966:: @ 81BD966 +CableClub_Text_ExplainWirelessClubFirstTime:: @ 81BD966 .string "On the top floor, there are two\n" .string "rooms.\p" .string "First, the room on the left.\n" @@ -1864,14 +1816,14 @@ gUnknown_81BD966:: @ 81BD966 .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -gUnknown_81BDB85:: @ 81BDB85 +CableClub_Text_AskAboutLinking:: @ 81BDB85 .string "Hello, {PLAYER}!\p" .string "It's me, TEALA, the POKéMON\n" .string "CENTER 2F attendant.\p" .string "Is there something you needed to\n" .string "ask me about linking?$" -gUnknown_81BDBF8:: @ 81BDBF8 +CableClub_Text_ExplainWirelessClub:: @ 81BDBF8 .string "Let me explain how the POKéMON\n" .string "WIRELESS CLUB works.\p" .string "On this, the top floor, there are\n" @@ -1900,6 +1852,6 @@ gUnknown_81BDBF8:: @ 81BDBF8 .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -gUnknown_81BDEDF:: @ 81BDEDF +CableClub_Text_HopeYouEnjoyWirelessSystem:: @ 81BDEDF .string "I hope you enjoy the Wireless\n" .string "Communication System.$" diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index cd92dad8a..cfa96774d 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -27,7 +27,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE waitfieldeffect FLDEFF_POKECENTER_HEAL applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown waitmovement 0 - special sp000_heal_pokemon + special HealPlayerParty return EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 320776ae7..f16e30ada 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -27,8 +27,8 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare VAR_RESULT, 0 goto_if_ne EventScript_1A4F20 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_1A4F19 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -79,8 +79,8 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare VAR_RESULT, 0 goto_if_eq EventScript_1A4FB0 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_1A4FB1 special PlayTrainerEncounterMusic special SetUpTrainerMovement diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 7f7f985a2..dd85dc53a 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -241,7 +241,7 @@ EventScript_1C52D7: end EventScript_1C52E0:: @ 81C52E0 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 11 special sub_815D9E8 warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 diff --git a/data/specials.inc b/data/specials.inc index a12a1ee29..811844759 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -8,11 +8,11 @@ .set __special__, 0 .align 2 gSpecials:: @ 815FD60 - def_special sp000_heal_pokemon + def_special HealPlayerParty def_special SetCableClubWarp def_special DoCableClubWarp - def_special sub_807E704 - def_special sub_8081744 + def_special ReturnFromLinkRoom + def_special CleanupLinkRoomState def_special sub_8081770 def_special nullsub_75 def_special nullsub_75 @@ -36,12 +36,12 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_8081064 - def_special sub_80810CC + def_special TryBattleLinkup + def_special TryTradeLinkup def_special sub_80810F4 def_special CloseLink - def_special sub_80819C8 - def_special sub_8081978 + def_special EnterColosseumPlayerSpot + def_special EnterTradeSeat def_special sub_80819B8 def_special sub_808130C def_special nullsub_75 @@ -49,8 +49,8 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special SavePlayerParty def_special LoadPlayerParty - def_special sub_80A0334 - def_special sp02A_crash_sound + def_special ChooseHalfPartyForBattle + def_special Script_ShowLinkTrainerCard def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -69,7 +69,7 @@ gSpecials:: @ 815FD60 def_special ScrSpecial_GetTrainerEyeRematchFlag def_special ScrSpecial_StartTrainerEyeRematch def_special ShowPokemonStorageSystem - def_special CheckForAlivePartyMons + def_special HasEnoughMonsForDoubleBattle def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -303,8 +303,8 @@ gSpecials:: @ 815FD60 def_special LeadMonHasEffortRibbon def_special GiveLeadMonEffortRibbon def_special ScrSpecial_AreLeadMonEVsMaxedOut - def_special sub_8069740 - def_special sub_8069768 + def_special Script_FacePlayer + def_special Script_ClearHeldMovement def_special InitRoamer def_special nullsub_75 def_special Special_PlayerHasGrassPokemonInParty @@ -371,8 +371,8 @@ gSpecials:: @ 815FD60 def_special Special_StickerLadyGetBragFlags def_special sub_80CC524 def_special IsWirelessAdapterConnected - def_special sub_8115A24 - def_special BerryBlenderLinkJoinGroup + def_special TryBecomeLinkLeader + def_special TryJoinLinkGroup def_special UnionRoomSpecial def_special sub_814F1D4 def_special EnableNationalPokedex @@ -394,7 +394,7 @@ gSpecials:: @ 815FD60 def_special HelpSystem_RestoreSomeVariable def_special ValidateReceivedWonderCard def_special sub_810B810 - def_special sub_811999C + def_special InitUnionRoom def_special BufferUnionRoomPlayerName def_special sub_811390C def_special Special_GetMartClerkObjectId @@ -410,10 +410,10 @@ gSpecials:: @ 815FD60 def_special SetBattledTrainerFlag def_special sub_812B35C def_special Special_SSAnneDepartureCutscene - def_special sub_8149A18 + def_special IsPokemonJumpSpeciesInParty def_special IsNationalPokedexEnabled def_special sub_815D9E8 - def_special sub_814B504 + def_special ShowPokemonJumpRecords def_special Special_ItemIsTM_GetMoveName def_special Special_DaisyMassageServices def_special HelpSystem_Disable @@ -430,7 +430,7 @@ gSpecials:: @ 815FD60 def_special Special_CapeBrinkGetMoveToTeachLeadPokemon def_special Special_HasLearnedAllMovesFromCapeBrinkTutor def_special Special_Credits - def_special sub_8153810 + def_special ShowDodrioBerryPickingRecords def_special Special_DrawSeagallopDestinationMenu def_special Special_GetSelectedSeagallopDestination def_special sub_8147500 @@ -443,10 +443,10 @@ gSpecials:: @ 815FD60 def_special HasAllMons def_special Special_PlayerIsNotInTrainerTowerLobby def_special Special_BrailleCursorToggle - def_special sub_811B15C + def_special Script_ResetUnionRoomTrade def_special Special_PlayerPartyContainsSpeciesWithPlayerID def_special sub_809C4A8 - def_special sub_81537C0 + def_special IsDodrioInParty def_special sub_809C5FC def_special Special_InitElevatorFloorSelectMenuPos def_special Special_ComputeLoreleiDollCollection diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 24cdcec13..a9d40220f 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -36,10 +36,10 @@ #define LAYOUT_CINNABAR_ISLAND_GYM 36 #define LAYOUT_VIRIDIAN_CITY_GYM 37 #define LAYOUT_UNUSED_LAYOUT_82D88C8 46 -#define LAYOUT_UNKNOWN_MAP_00_00 47 -#define LAYOUT_UNKNOWN_MAP_00_01 48 -#define LAYOUT_UNKNOWN_MAP_00_02 49 -#define LAYOUT_UNKNOWN_MAP_00_03 50 +#define LAYOUT_BATTLE_COLOSSEUM_2P 47 +#define LAYOUT_TRADE_CENTER 48 +#define LAYOUT_RECORD_CENTER 49 +#define LAYOUT_BATTLE_COLOSSEUM_4P 50 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51 #define LAYOUT_UNUSED_LAYOUT_82D9B24 52 #define LAYOUT_UNUSED_LAYOUT_82DA7C8 53 @@ -244,7 +244,7 @@ #define LAYOUT_UNUSED_LAYOUT_83377F0 259 #define LAYOUT_UNUSED_LAYOUT_8338354 260 #define LAYOUT_UNUSED_LAYOUT_8338738 261 -#define LAYOUT_UNKNOWN_MAP_00_04 262 +#define LAYOUT_UNION_ROOM 262 #define LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 263 #define LAYOUT_UNUSED_LAYOUT_8338B4C 264 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2 265 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 13862d6c7..4d37b0dc8 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -2,11 +2,11 @@ #define GUARD_CONSTANTS_MAP_GROUPS_H // Map Group 0 -#define MAP_UNKNOWN_MAP_00_00 (0 | (0 << 8)) -#define MAP_UNKNOWN_MAP_00_01 (1 | (0 << 8)) -#define MAP_UNKNOWN_MAP_00_02 (2 | (0 << 8)) -#define MAP_UNKNOWN_MAP_00_03 (3 | (0 << 8)) -#define MAP_UNKNOWN_MAP_00_04 (4 | (0 << 8)) +#define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8)) +#define MAP_TRADE_CENTER (1 | (0 << 8)) +#define MAP_RECORD_CENTER (2 | (0 << 8)) +#define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8)) +#define MAP_UNION_ROOM (4 | (0 << 8)) // Map Group 1 #define MAP_VIRIDIAN_FOREST (0 | (1 << 8)) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index a2ad90776..c6fc55003 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -87,4 +87,8 @@ #define MON_ALREADY_KNOWS_MOVE 0xFFFE #define MON_HAS_MAX_MOVES 0xFFFF +#define PLAYER_HAS_TWO_USABLE_MONS 0x0 +#define PLAYER_HAS_ONE_MON 0x1 +#define PLAYER_HAS_ONE_USABLE_MON 0x2 + #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/constants/union_room.h b/include/constants/union_room.h new file mode 100644 index 000000000..2314f85a0 --- /dev/null +++ b/include/constants/union_room.h @@ -0,0 +1,28 @@ +#ifndef GUARD_CONSTANTS_UNION_ROOM_H +#define GUARD_CONSTANTS_UNION_ROOM_H + +#define LINK_GROUP_SINGLE_BATTLE 0 +#define LINK_GROUP_DOUBLE_BATTLE 1 +#define LINK_GROUP_MULTI_BATTLE 2 +#define LINK_GROUP_TRADE 3 +#define LINK_GROUP_POKEMON_JUMP 4 +#define LINK_GROUP_BERRY_CRUSH 5 +#define LINK_GROUP_BERRY_PICKING 6 +#define LINK_GROUP_WONDER_CARD 7 +#define LINK_GROUP_WONDER_NEWS 8 +#define LINK_GROUP_UNK_9 9 +#define LINK_GROUP_UNK_10 10 +#define LINK_GROUP_UNK_11 11 +#define LINK_GROUP_RECORD_CORNER 12 +#define LINK_GROUP_BERRY_BLENDER 13 +#define LINK_GROUP_UNK_14 14 +#define LINK_GROUP_COOL_CONTEST 15 +#define LINK_GROUP_BEAUTY_CONTEST 16 +#define LINK_GROUP_CUTE_CONTEST 17 +#define LINK_GROUP_SMART_CONTEST 18 +#define LINK_GROUP_TOUGH_CONTEST 19 +#define LINK_GROUP_BATTLE_TOWER 20 +#define LINK_GROUP_BATTLE_TOWER_OPEN 21 +#define NUM_LINK_GROUP_TYPES 22 + +#endif //GUARD_CONSTANTS_UNION_ROOM_H diff --git a/include/event_scripts.h b/include/event_scripts.h index 08b5b8c01..2fc045a37 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1178,12 +1178,12 @@ extern const u8 gText_DifferentGameFile[]; // script_menu extern const u8 EventScript_1A7AE0[]; -extern const u8 Text_1BC388[]; -extern const u8 Text_1BC3C7[]; -extern const u8 Text_1BCB42[]; -extern const u8 Text_1BCA95[]; -extern const u8 Text_1BCACB[]; -extern const u8 Text_1BCAF2[]; +extern const u8 CableClub_Text_TradeMonsUsingLinkCable[]; +extern const u8 CableClub_Text_BattleUsingLinkCable[]; +extern const u8 CableClub_Text_CancelSelectedItem[]; +extern const u8 CableClub_Text_YouMayTradeHere[]; +extern const u8 CableClub_Text_YouMayBattleHere[]; +extern const u8 CableClub_Text_CanMakeBerryPowder[]; extern const u8 EventScript_PC[]; extern const u8 EventScript_RepelWoreOff[]; diff --git a/include/pokemon.h b/include/pokemon.h index 7bc1239f1..aa75a27fd 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -104,10 +104,6 @@ #define MON_GIVEN_TO_PC 0x1 #define MON_CANT_GIVE 0x2 -#define PLAYER_HAS_TWO_USABLE_MONS 0x0 -#define PLAYER_HAS_ONE_MON 0x1 -#define PLAYER_HAS_ONE_USABLE_MON 0x2 - #define MON_MALE 0x00 #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h index b63a7b0ef..d0b8949e4 100644 --- a/include/script_pokemon_util_80A0058.h +++ b/include/script_pokemon_util_80A0058.h @@ -4,7 +4,7 @@ bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3); bool8 ScriptGiveEgg(u16 species); void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot); -void sp000_heal_pokemon(void); +void HealPlayerParty(void); void ReducePlayerPartyToThree(void); #endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H diff --git a/src/battle_records.c b/src/battle_records.c index 38889ca67..07ff665d9 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -450,7 +450,7 @@ static void UpdateBattleOutcomeOnTrainerCards(s32 battlerId) void TryRecordLinkBattleOutcome(s32 battlerId) { - if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNKNOWN_MAP_00_04) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNKNOWN_MAP_00_04)) + if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNION_ROOM) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNION_ROOM)) { UpdateBattleOutcomeOnTrainerCards(battlerId); AddOpponentLinkBattleRecord(&gSaveBlock2Ptr->linkBattleRecords, gTrainerCards[battlerId].playerName, gTrainerCards[battlerId].trainerId, gBattleOutcome, gLinkPlayers[battlerId].language); diff --git a/src/battle_setup.c b/src/battle_setup.c index 17da53083..dee0c492b 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -901,7 +901,7 @@ static void CB2_EndTrainerBattle(void) gSpecialVar_Result = 1; if (gUnknown_20386CC & 1) { - sp000_heal_pokemon(); + HealPlayerParty(); } else { diff --git a/src/event_object_lock.c b/src/event_object_lock.c index 17ec57b20..ea4fa00b9 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -104,12 +104,12 @@ void sub_80696F0(void) UnfreezeObjectEvents(); } -void sub_8069740(void) +void Script_FacePlayer(void) { ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); } -void sub_8069768(void) +void Script_ClearHeldMovement(void) { ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[gSelectedObjectEvent]); } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index e2da82de2..dbc5f23b5 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -677,7 +677,7 @@ static void sub_807E678(u8 taskId) } } -void sub_807E704(void) +void ReturnFromLinkRoom(void) { CreateTask(sub_807E678, 10); } diff --git a/src/field_specials.c b/src/field_specials.c index 55f3bcce5..6f42ba764 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1985,7 +1985,7 @@ const u16 sPokeCenter1FMaps[] = { MAP_FIVE_ISLAND_POKEMON_CENTER_1F, MAP_SEVEN_ISLAND_POKEMON_CENTER_1F, MAP_SIX_ISLAND_POKEMON_CENTER_1F, - MAP_UNKNOWN_MAP_00_04, + MAP_UNION_ROOM, MAP_UNDEFINED }; diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index 6d4652f35..1e61b9b77 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -14,7 +14,7 @@ bool8 Special_HallOfFame(void) bool8 *r7; int i; bool8 gaveAtLeastOneRibbon; - sp000_heal_pokemon(); + HealPlayerParty(); if (FlagGet(FLAG_SYS_GAME_CLEAR) == TRUE) { gHasHallOfFameRecords = TRUE; diff --git a/src/save_location.c b/src/save_location.c index 9b679c7ee..561fd2ff2 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -36,8 +36,10 @@ static const u16 sSaveLocationPokeCenterList[] = MAP_FIVE_ISLAND_POKEMON_CENTER_1F, MAP_FIVE_ISLAND_POKEMON_CENTER_2F, MAP_SEVEN_ISLAND_POKEMON_CENTER_1F, MAP_SEVEN_ISLAND_POKEMON_CENTER_2F, MAP_SIX_ISLAND_POKEMON_CENTER_1F, MAP_SIX_ISLAND_POKEMON_CENTER_2F, - MAP_UNKNOWN_MAP_00_00, MAP_UNKNOWN_MAP_00_01, - MAP_UNKNOWN_MAP_00_03, MAP_UNKNOWN_MAP_00_04, + MAP_BATTLE_COLOSSEUM_2P, + MAP_TRADE_CENTER, + MAP_BATTLE_COLOSSEUM_4P, + MAP_UNION_ROOM, 0xFFFF, }; diff --git a/src/script_menu.c b/src/script_menu.c index 827f79fa6..2a81a7bce 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -598,22 +598,22 @@ const u8 *const gStdStringPtrs[] = { }; static const u8 *const sDescriptionPtrs_CableClub_TradeBattleCancel[] = { - Text_1BC388, - Text_1BC3C7, - Text_1BCB42 + CableClub_Text_TradeMonsUsingLinkCable, + CableClub_Text_BattleUsingLinkCable, + CableClub_Text_CancelSelectedItem }; static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[] = { - Text_1BCA95, - Text_1BCACB, - Text_1BCAF2, - Text_1BCB42 + CableClub_Text_YouMayTradeHere, + CableClub_Text_YouMayBattleHere, + CableClub_Text_CanMakeBerryPowder, + CableClub_Text_CancelSelectedItem }; static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCancel[] = { - Text_1BCA95, - Text_1BCACB, - Text_1BCB42 + CableClub_Text_YouMayTradeHere, + CableClub_Text_YouMayBattleHere, + CableClub_Text_CancelSelectedItem }; static const union AnimCmd sMuseumFossilAnim0[] = { From 6bcb508c3fd576bccbe589fee5bae31fb803841c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 11 Jan 2020 01:00:50 -0500 Subject: [PATCH 18/20] Update some movement cmds --- asm/macros/movement.inc | 38 +++++++++++++-------------- include/constants/movement_commands.h | 34 ++++++++++++------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index c5178be3a..c4ca78010 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -10,10 +10,10 @@ create_movement face_up create_movement face_left create_movement face_right - create_movement face_down_2 @ TODO: distinction between this and above set - create_movement face_up_2 - create_movement face_left_2 - create_movement face_right_2 + create_movement face_down_fast + create_movement face_up_fast + create_movement face_left_fast + create_movement face_right_fast create_movement walk_slowest_down create_movement walk_slowest_up create_movement walk_slowest_left @@ -55,10 +55,10 @@ create_movement walk_in_place_fastest_up create_movement walk_in_place_fastest_left create_movement walk_in_place_fastest_right - create_movement ride_water_current_down - create_movement ride_water_current_up - create_movement ride_water_current_left - create_movement ride_water_current_right + create_movement face_down_slow + create_movement face_up_slow + create_movement face_left_slow + create_movement face_right_slow create_movement walk_fastest_down create_movement walk_fastest_up create_movement walk_fastest_left @@ -71,15 +71,15 @@ create_movement player_run_up create_movement player_run_left create_movement player_run_right - create_movement step_41 - create_movement step_42 - create_movement step_43 - create_movement step_44 + create_movement player_run_down_slow + create_movement player_run_up_slow + create_movement player_run_left_slow + create_movement player_run_right_slow create_movement step_45 - create_movement step_46 - create_movement step_47 - create_movement step_48 - create_movement step_49 + create_movement jump_down_run + create_movement jump_up_run + create_movement jump_left_run + create_movement jump_right_run create_movement face_player create_movement face_away_player create_movement lock_facing_direction @@ -98,8 +98,8 @@ create_movement jump_in_place_right_left create_movement face_original_direction create_movement nurse_joy_bow - create_movement step_5c - create_movement step_5d + create_movement enable_jump_landing_ground_effect + create_movement disable_jump_landing_ground_effect create_movement disable_anim create_movement restore_anim create_movement set_invisible @@ -108,7 +108,7 @@ create_movement emote_question_mark create_movement emote_x create_movement emote_double_exclamation_mark - create_movement step_66 + create_movement emote_smile create_movement step_67 create_movement rock_smash_break create_movement cut_tree diff --git a/include/constants/movement_commands.h b/include/constants/movement_commands.h index 0f90405dd..8556ba951 100644 --- a/include/constants/movement_commands.h +++ b/include/constants/movement_commands.h @@ -7,10 +7,10 @@ enum face_up, face_left, face_right, - face_down_2, - face_up_2, - face_left_2, - face_right_2, + face_down_fast, + face_up_fast, + face_left_fast, + face_right_fast, walk_slowest_down, walk_slowest_up, walk_slowest_left, @@ -52,10 +52,10 @@ enum walk_in_place_fastest_up, walk_in_place_fastest_left, walk_in_place_fastest_right, - ride_water_current_down, - ride_water_current_up, - ride_water_current_left, - ride_water_current_right, + face_down_slow, + face_up_slow, + face_left_slow, + face_right_slow, walk_fastest_down, walk_fastest_up, walk_fastest_left, @@ -68,15 +68,15 @@ enum player_run_up, player_run_left, player_run_right, - step_41, - step_42, - step_43, - step_44, + player_run_down_slow, + player_run_up_slow, + player_run_left_slow, + player_run_right_slow, step_45, - step_46, - step_47, - step_48, - step_49, + jump_down_run, + jump_up_run, + jump_left_run, + jump_right_run, face_player, face_away_player, lock_facing_direction, @@ -105,7 +105,7 @@ enum emote_question_mark, emote_x, emote_double_exclamation_mark, - step_66, + emote_smile, step_67, rock_smash_break, cut_tree, From aa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 11 Jan 2020 01:29:57 -0500 Subject: [PATCH 19/20] Name item ball scripts --- data/maps/CeladonCity/map.json | 2 +- data/maps/CeruleanCave_1F/map.json | 6 +- data/maps/CeruleanCave_2F/map.json | 6 +- data/maps/CeruleanCave_B1F/map.json | 4 +- data/maps/FiveIsland_LostCave_Room10/map.json | 2 +- data/maps/FiveIsland_LostCave_Room11/map.json | 2 +- data/maps/FiveIsland_LostCave_Room12/map.json | 2 +- data/maps/FiveIsland_LostCave_Room13/map.json | 2 +- data/maps/FiveIsland_LostCave_Room14/map.json | 2 +- data/maps/FiveIsland_Meadow/map.json | 4 +- data/maps/FiveIsland_MemorialPillar/map.json | 2 +- data/maps/FiveIsland_RocketWarehouse/map.json | 8 +- data/maps/FourIsland/map.json | 4 +- data/maps/FourIsland_IcefallCave_1F/map.json | 4 +- data/maps/FourIsland_IcefallCave_B1F/map.json | 4 +- data/maps/FuchsiaCity_Building1/map.json | 2 +- data/maps/MtEmber_Exterior/map.json | 6 +- data/maps/MtMoon_1F/map.json | 12 +- data/maps/MtMoon_B2F/map.json | 8 +- data/maps/OneIsland_KindleRoad/map.json | 6 +- data/maps/PokemonMansion_1F/map.json | 6 +- data/maps/PokemonMansion_2F/map.json | 6 +- data/maps/PokemonMansion_3F/map.json | 4 +- data/maps/PokemonMansion_B1F/map.json | 8 +- data/maps/PokemonTower_3F/map.json | 2 +- data/maps/PokemonTower_4F/map.json | 6 +- data/maps/PokemonTower_5F/map.json | 4 +- data/maps/PokemonTower_6F/map.json | 4 +- data/maps/PowerPlant/map.json | 10 +- data/maps/RockTunnel_1F/map.json | 6 +- data/maps/RockTunnel_B1F/map.json | 4 +- data/maps/RocketHideout_B1F/map.json | 4 +- data/maps/RocketHideout_B2F/map.json | 8 +- data/maps/RocketHideout_B3F/map.json | 6 +- data/maps/RocketHideout_B4F/map.json | 10 +- data/maps/RocketHideout_B4F/scripts.inc | 4 +- data/maps/Route11/map.json | 6 +- data/maps/Route12/map.json | 4 +- data/maps/Route15/map.json | 2 +- data/maps/Route2/map.json | 4 +- data/maps/Route24/map.json | 2 +- data/maps/Route25/map.json | 2 +- data/maps/Route4/map.json | 2 +- data/maps/Route9/map.json | 4 +- data/maps/SSAnne_1F_Room2/map.json | 2 +- data/maps/SSAnne_2F_Room2/map.json | 2 +- data/maps/SSAnne_2F_Room4/map.json | 2 +- data/maps/SSAnne_B1F_Room2/map.json | 2 +- data/maps/SSAnne_B1F_Room3/map.json | 2 +- data/maps/SSAnne_B1F_Room5/map.json | 2 +- data/maps/SSAnne_Kitchen/map.json | 2 +- data/maps/SafariZone_Center/map.json | 2 +- data/maps/SafariZone_East/map.json | 8 +- data/maps/SafariZone_North/map.json | 6 +- data/maps/SafariZone_West/map.json | 8 +- data/maps/SeafoamIslands_1F/map.json | 2 +- data/maps/SeafoamIslands_B1F/map.json | 4 +- data/maps/SeafoamIslands_B2F/map.json | 2 +- data/maps/SeafoamIslands_B4F/map.json | 2 +- data/maps/SevenIsland_SevaultCanyon/map.json | 6 +- .../SevenIsland_SevaultCanyon_House/map.json | 2 +- data/maps/SilphCo_10F/map.json | 6 +- data/maps/SilphCo_11F/map.json | 2 +- data/maps/SilphCo_3F/map.json | 2 +- data/maps/SilphCo_4F/map.json | 8 +- data/maps/SilphCo_5F/map.json | 6 +- data/maps/SilphCo_6F/map.json | 4 +- data/maps/SilphCo_7F/map.json | 4 +- data/maps/SilphCo_8F/map.json | 2 +- data/maps/SixIsland_OutcastIsland/map.json | 2 +- data/maps/SixIsland_RuinValley/map.json | 6 +- data/maps/SixIsland_WaterPath/map.json | 4 +- data/maps/ThreeIsland/map.json | 2 +- data/maps/ThreeIsland_BerryForest/map.json | 6 +- data/maps/TwoIsland/map.json | 2 +- data/maps/VictoryRoad_1F/map.json | 4 +- data/maps/VictoryRoad_2F/map.json | 8 +- data/maps/VictoryRoad_3F/map.json | 4 +- data/maps/ViridianCity/map.json | 2 +- data/maps/ViridianForest/map.json | 8 +- data/scripts/item_ball_scripts.inc | 336 +++++++++--------- 81 files changed, 340 insertions(+), 340 deletions(-) diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 75f6760d1..efca328f8 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -203,7 +203,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_1BEBC0", + "script": "CeladonCity_EventScript_ItemEther", "flag": "FLAG_HIDE_CELADON_CITY_ETHER" }, { diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 8914af7e7..65e99c9d2 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BEA47", + "script": "CeruleanCave_1F_EventScript_ItemNugget", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BEA54", + "script": "CeruleanCave_1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BEA3A", + "script": "CeruleanCave_1F_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" }, { diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 89438c4fb..e3fe97b91 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BEA6E", + "script": "CeruleanCave_2F_EventScript_ItemPPUp", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BEA7B", + "script": "CeruleanCave_2F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BEA61", + "script": "CeruleanCave_2F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" }, { diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 87b278438..4245e8a07 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BEA95", + "script": "CeruleanCave_B1F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BEA88", + "script": "CeruleanCave_B1F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" }, { diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 606513822..980df7a4b 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB", + "script": "FiveIsland_LostCave_Room10_EventScript_ItemSilkScarf", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM10_SILK_SCARF" } ], diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 52b658dcb..3b08bf303 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8", + "script": "FiveIsland_LostCave_Room11_EventScript_ItemLaxIncense", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM11_LAX_INCENSE" } ], diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 09392a2ca..67626feb7 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5", + "script": "FiveIsland_LostCave_Room12_EventScript_ItemSeaIncense", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM12_SEA_INCENSE" } ], diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 028c7cea6..41b48cce9 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2", + "script": "FiveIsland_LostCave_Room13_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM13_MAX_REVIVE" } ], diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index f25b7ee72..17b9542f4 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF", + "script": "FiveIsland_LostCave_Room14_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM14_RARE_CANDY" } ], diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 66ac71058..2b4630ca3 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BEC69", + "script": "FiveIsland_Meadow_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BEC76", + "script": "FiveIsland_Meadow_EventScript_ItemPPUp", "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_PP_UP" } ], diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 2054a0159..7aac310dc 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -81,7 +81,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_MemorialPillar_EventScript_1BEC83", + "script": "FiveIsland_MemorialPillar_EventScript_ItemMetalCoat", "flag": "FLAG_HIDE_FIVE_ISLAND_MEMORIAL_PILLAR_METAL_COAT" } ], diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index a89fe7b45..3bc0ee2c9 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BED87", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemBigPearl", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BED94", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemTM36", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BEDA1", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemPearl", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BEDAE", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemUpGrade", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_UP_GRADE" } ], diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 0e7b31ad7..4e8aab27c 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_1BEC28", + "script": "FourIsland_EventScript_ItemStarPiece", "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_1BEC35", + "script": "FourIsland_EventScript_ItemStardust", "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 575294c84..39aaec8e8 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_1F_EventScript_1BED53", + "script": "FourIsland_IcefallCave_1F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_1F_EventScript_1BED60", + "script": "FourIsland_IcefallCave_1F_EventScript_ItemHM07", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07" } ], diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index c6b9e866e..d8ba2545e 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_B1F_EventScript_1BED6D", + "script": "FourIsland_IcefallCave_B1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_B1F_EventScript_1BED7A", + "script": "FourIsland_IcefallCave_B1F_EventScript_ItemNeverMeltIce", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_NEVER_MELT_ICE" } ], diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 8b91a19fa..b018a2b1e 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_Building1_EventScript_1BEAA2", + "script": "FuchsiaCity_Building1_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_FUCHSIA_CITY_BUILDING1_RARE_CANDY" }, { diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 29d5f1af8..7e0cb8dad 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -244,7 +244,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BED2C", + "script": "MtEmber_Exterior_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" }, { @@ -257,7 +257,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BED39", + "script": "MtEmber_Exterior_EventScript_ItemFireStone", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" }, { @@ -270,7 +270,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BED46", + "script": "MtEmber_Exterior_EventScript_ItemDireHit", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_DIRE_HIT" } ], diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 432699237..1a1de5162 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5CF", + "script": "MtMoon_1F_EventScript_ItemParalyzeHeal", "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5DC", + "script": "MtMoon_1F_EventScript_ItemTM09", "flag": "FLAG_HIDE_MT_MOON_1F_TM09" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5E9", + "script": "MtMoon_1F_EventScript_ItemPotion", "flag": "FLAG_HIDE_MT_MOON_1F_POTION" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5F6", + "script": "MtMoon_1F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE603", + "script": "MtMoon_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE610", + "script": "MtMoon_1F_EventScript_ItemMoonStone", "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" }, { diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 478a00f7d..deb0a6c79 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BE61D", + "script": "MtMoon_B2F_EventScript_ItemStarPiece", "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BE62A", + "script": "MtMoon_B2F_EventScript_ItemTM46", "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BEAD6", + "script": "MtMoon_B2F_EventScript_ItemRevive", "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BEAE3", + "script": "MtMoon_B2F_EventScript_ItemAntidote", "flag": "FLAG_HIDE_MT_MOON_B2F_ANTIDOTE" } ], diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 3520eaac0..7e12d3946 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -367,7 +367,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BEC42", + "script": "OneIsland_KindleRoad_EventScript_ItemEther", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" }, { @@ -380,7 +380,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BEC4F", + "script": "OneIsland_KindleRoad_EventScript_ItemMaxRepel", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" }, { @@ -393,7 +393,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BEC5C", + "script": "OneIsland_KindleRoad_EventScript_ItemCarbos", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_CARBOS" } ], diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 8f26c3d11..31b5155c4 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_1F_EventScript_1BE95D", + "script": "PokemonMansion_1F_EventScript_ItemCarbos", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_1F_EventScript_1BE96A", + "script": "PokemonMansion_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_1F_EventScript_1BEB65", + "script": "PokemonMansion_1F_EventScript_ItemProtein", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" }, { diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index b5bf6d6d3..e3d543e08 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_2F_EventScript_1BE977", + "script": "PokemonMansion_2F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_2F_EventScript_1BEB72", + "script": "PokemonMansion_2F_EventScript_ItemZinc", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_2F_EventScript_1BEB7F", + "script": "PokemonMansion_2F_EventScript_ItemHPUp", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_HP_UP" } ], diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 47ef76894..07bcf2dc3 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_3F_EventScript_1BE984", + "script": "PokemonMansion_3F_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_3F_EventScript_1BE991", + "script": "PokemonMansion_3F_EventScript_ItemIron", "flag": "FLAG_HIDE_POKEMON_MANSION_3F_IRON" } ], diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 5a6b105ab..e72ff2a96 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE9B8", + "script": "PokemonMansion_B1F_EventScript_ItemTM22", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE99E", + "script": "PokemonMansion_B1F_EventScript_ItemTM14", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE9AB", + "script": "PokemonMansion_B1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE9C5", + "script": "PokemonMansion_B1F_EventScript_ItemSecretKey", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY" } ], diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 668f87e73..c71b75937 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_3F_EventScript_1BE755", + "script": "PokemonTower_3F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_POKEMON_TOWER_3F_ESCAPE_ROPE" } ], diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index e24927018..82088704a 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_4F_EventScript_1BE762", + "script": "PokemonTower_4F_EventScript_ItemElixir", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_4F_EventScript_1BE76F", + "script": "PokemonTower_4F_EventScript_ItemAwakening", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_4F_EventScript_1BE77C", + "script": "PokemonTower_4F_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_GREAT_BALL" } ], diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index 37b0653e6..ec66551ae 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_5F_EventScript_1BE789", + "script": "PokemonTower_5F_EventScript_ItemNugget", "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_5F_EventScript_1BEBB3", + "script": "PokemonTower_5F_EventScript_ItemCleanseTag", "flag": "FLAG_HIDE_POKEMON_TOWER_5F_CLEANSE_TAG" } ], diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 6c9e9aefb..f03a04402 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_6F_EventScript_1BE796", + "script": "PokemonTower_6F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_6F_EventScript_1BE7A3", + "script": "PokemonTower_6F_EventScript_ItemXAccuracy", "flag": "FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY" } ], diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 751b0448a..8fb90e3c7 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE91C", + "script": "PowerPlant_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE929", + "script": "PowerPlant_EventScript_ItemTM17", "flag": "FLAG_HIDE_POWER_PLANT_TM17" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE936", + "script": "PowerPlant_EventScript_ItemTM25", "flag": "FLAG_HIDE_POWER_PLANT_TM25" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE943", + "script": "PowerPlant_EventScript_ItemThunderStone", "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE950", + "script": "PowerPlant_EventScript_ItemElixir", "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" }, { diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 381dc663b..2c16ae2df 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_1F_EventScript_1BEB0A", + "script": "RockTunnel_1F_EventScript_ItemRepel", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_1F_EventScript_1BEB17", + "script": "RockTunnel_1F_EventScript_ItemPearl", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_1F_EventScript_1BEB24", + "script": "RockTunnel_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_ESCAPE_ROPE" } ], diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 3c1144c42..d95126744 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BEB31", + "script": "RockTunnel_B1F_EventScript_ItemRevive", "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BEB3E", + "script": "RockTunnel_B1F_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" }, { diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 1ae6a2b49..b761f7d2d 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B1F_EventScript_1BE6C6", + "script": "RocketHideout_B1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B1F_EventScript_1BE6D3", + "script": "RocketHideout_B1F_EventScript_ItemHyperPotion", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_HYPER_POTION" } ], diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 4bdde29e9..63a051e5d 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6E0", + "script": "RocketHideout_B2F_EventScript_ItemXSpeed", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6ED", + "script": "RocketHideout_B2F_EventScript_ItemMoonStone", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6FA", + "script": "RocketHideout_B2F_EventScript_ItemTM12", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE707", + "script": "RocketHideout_B2F_EventScript_ItemSuperPotion", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION" } ], diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 40f6c205f..7be2fae4f 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B3F_EventScript_1BE714", + "script": "RocketHideout_B3F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B3F_EventScript_1BE721", + "script": "RocketHideout_B3F_EventScript_ItemTM21", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B3F_EventScript_1BEBCD", + "script": "RocketHideout_B3F_EventScript_ItemBlackGlasses", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_BLACK_GLASSES" } ], diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 85113e7c6..06533ad54 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_161363", + "script": "RocketHideout_B4F_EventScript_SilphScope", "flag": "FLAG_HIDE_SILPH_SCOPE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1613AD", + "script": "RocketHideout_B4F_EventScript_LiftKey", "flag": "FLAG_HIDE_LIFT_KEY" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1BE72E", + "script": "RocketHideout_B4F_EventScript_ItemTM49", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1BE73B", + "script": "RocketHideout_B4F_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1BE748", + "script": "RocketHideout_B4F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_CALCIUM" } ], diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 4f75320b3..68671a7a8 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -35,7 +35,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 release end -RocketHideout_B4F_EventScript_161363:: @ 8161363 +RocketHideout_B4F_EventScript_SilphScope:: @ 8161363 lock faceplayer removeobject 2 @@ -58,7 +58,7 @@ EventScript_16139D:: @ 816139D release end -RocketHideout_B4F_EventScript_1613AD:: @ 81613AD +RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD lock faceplayer setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 854692035..7882673d1 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EventScript_1BEAF0", + "script": "Route11_EventScript_ItemXDefend", "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EventScript_1BEB99", + "script": "Route11_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" }, { @@ -190,7 +190,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EventScript_1BEBA6", + "script": "Route11_EventScript_ItemAwakening", "flag": "FLAG_HIDE_ROUTE11_AWAKENING" } ], diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index cfc684de8..75c992abe 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -156,7 +156,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BE7B0", + "script": "Route12_EventScript_ItemTM48", "flag": "FLAG_HIDE_ROUTE12_TM48" }, { @@ -169,7 +169,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BE7BD", + "script": "Route12_EventScript_ItemIron", "flag": "FLAG_HIDE_ROUTE12_IRON" }, { diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 4c6fa5d47..19a33a867 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route15_EventScript_1BE7CA", + "script": "Route15_EventScript_ItemTM18", "flag": "FLAG_HIDE_ROUTE15_TM18" }, { diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index aecf7a7de..d7cd6f16b 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BE58E", + "script": "Route2_EventScript_ItemEther", "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BE59B", + "script": "Route2_EventScript_ItemParalyzeHeal", "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 9cf6bf74d..56edad166 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route24_EventScript_1BE644", + "script": "Route24_EventScript_ItemTM45", "flag": "FLAG_HIDE_ROUTE24_TM45" } ], diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index d369225d3..c3f1520d5 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -146,7 +146,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_EventScript_1BE651", + "script": "Route25_EventScript_ItemTM43", "flag": "FLAG_HIDE_ROUTE25_TM43" }, { diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index e7392969c..1e1dba0c7 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1BE637", + "script": "Route4_EventScript_ItemTM05", "flag": "FLAG_HIDE_ROUTE4_TM05" }, { diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index b8e4aef83..c130136b9 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BE6B9", + "script": "Route9_EventScript_ItemTM40", "flag": "FLAG_HIDE_ROUTE9_TM40" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BEAFD", + "script": "Route9_EventScript_ItemBurnHeal", "flag": "FLAG_HIDE_ROUTE9_BURN_HEAL" } ], diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index a9ec320be..05b54f33b 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Room2_EventScript_1BE65E", + "script": "SSAnne_1F_Room2_EventScript_ItemTM31", "flag": "FLAG_HIDE_SSANNE_1F_ROOM2_TM31" } ], diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 1aeabe4d5..6875842e4 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room2_EventScript_1BE66B", + "script": "SSAnne_2F_Room2_EventScript_ItemStardust", "flag": "FLAG_HIDE_SSANNE_2F_ROOM2_STARDUST" } ], diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 8cba587e6..422d02458 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room4_EventScript_1BE678", + "script": "SSAnne_2F_Room4_EventScript_ItemXAttack", "flag": "FLAG_HIDE_SSANNE_2F_ROOM4_X_ATTACK" } ], diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 173d2149e..629043f6f 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room2_EventScript_1BE685", + "script": "SSAnne_B1F_Room2_EventScript_ItemTM44", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM2_TM44" } ], diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index f1acb1d5a..0d4141a48 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room3_EventScript_1BE692", + "script": "SSAnne_B1F_Room3_EventScript_ItemEther", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM3_ETHER" } ], diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 6313e108a..835107344 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room5_EventScript_1BE69F", + "script": "SSAnne_B1F_Room5_EventScript_ItemSuperPotion", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM5_SUPER_POTION" } ], diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 968d87938..cb062a8fd 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_1BE6AC", + "script": "SSAnne_Kitchen_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL" } ], diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index e40c94cee..5e592724f 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_Center_EventScript_1BE7D7", + "script": "SafariZone_Center_EventScript_ItemNugget", "flag": "FLAG_HIDE_SAFARI_ZONE_CENTER_NUGGET" } ], diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 17f951070..59e9da99c 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE7E4", + "script": "SafariZone_East_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE7F1", + "script": "SafariZone_East_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE7FE", + "script": "SafariZone_East_EventScript_ItemTM11", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE80B", + "script": "SafariZone_East_EventScript_ItemLeafStone", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_LEAF_STONE" } ], diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 0e47573f6..df7ce163a 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_North_EventScript_1BE818", + "script": "SafariZone_North_EventScript_ItemProtein", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_North_EventScript_1BE825", + "script": "SafariZone_North_EventScript_ItemTM47", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_North_EventScript_1BEBDA", + "script": "SafariZone_North_EventScript_ItemQuickClaw", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_QUICK_CLAW" } ], diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index cdccbbe45..02c576e4b 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE83F", + "script": "SafariZone_West_EventScript_ItemGoldTeeth", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE832", + "script": "SafariZone_West_EventScript_ItemTM32", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE84C", + "script": "SafariZone_West_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE859", + "script": "SafariZone_West_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_REVIVE" } ], diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index ac46adf1f..49986cd0f 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_1F_EventScript_1BEBE7", + "script": "SeafoamIslands_1F_EventScript_ItemIceHeal", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_1F_ICE_HEAL" } ], diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 113bfe865..1444996be 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BEBF4", + "script": "SeafoamIslands_B1F_EventScript_ItemWaterStone", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BEC01", + "script": "SeafoamIslands_B1F_EventScript_ItemRevive", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_REVIVE" } ], diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index f1a234d05..b24e1ae17 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B2F_EventScript_1BEC0E", + "script": "SeafoamIslands_B2F_EventScript_ItemBigPearl", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B2F_BIG_PEARL" } ], diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index edd644634..08001aa58 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B4F_EventScript_1BEC1B", + "script": "SeafoamIslands_B4F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B4F_ULTRA_BALL" } ], diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 350cb0060..50884dd2a 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -242,7 +242,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BECDE", + "script": "SevenIsland_SevaultCanyon_EventScript_ItemKingsRock", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" }, { @@ -255,7 +255,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BECEB", + "script": "SevenIsland_SevaultCanyon_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" }, { @@ -268,7 +268,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BECF8", + "script": "SevenIsland_SevaultCanyon_EventScript_ItemNugget", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" }, { diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 09447abbf..3803d3200 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_House_EventScript_1BEDFC", + "script": "SevenIsland_SevaultCanyon_House_EventScript_ItemLuckyPunch", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE_LUCKY_PUNCH" } ], diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 7176da07c..da9f835e2 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_1BE8F5", + "script": "SilphCo_10F_EventScript_ItemCarbos", "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_1BE902", + "script": "SilphCo_10F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_1BE90F", + "script": "SilphCo_10F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_SILPH_CO_10F_RARE_CANDY" } ], diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 8d34641e8..ec99fdfe9 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_11F_EventScript_1BEB58", + "script": "SilphCo_11F_EventScript_ItemZinc", "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index e4daa7636..3f7e3590b 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_3F_EventScript_1BE866", + "script": "SilphCo_3F_EventScript_ItemHyperPotion", "flag": "FLAG_HIDE_SILPH_CO_3F_HYPER_POTION" } ], diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 813b7cfb6..6390f880b 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BE873", + "script": "SilphCo_4F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BE880", + "script": "SilphCo_4F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BE88D", + "script": "SilphCo_4F_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BEE09", + "script": "SilphCo_4F_EventScript_ItemTM41", "flag": "FLAG_HIDE_SILPH_CO_4F_TM41" } ], diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 656894ec2..be2d202e8 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1BE89A", + "script": "SilphCo_5F_EventScript_ItemProtein", "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1BE8A7", + "script": "SilphCo_5F_EventScript_ItemTM01", "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1BE8B4", + "script": "SilphCo_5F_EventScript_ItemCardKey", "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" }, { diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 4cc812918..d1a65f4f3 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1BE8C1", + "script": "SilphCo_6F_EventScript_ItemHPUp", "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1BE8CE", + "script": "SilphCo_6F_EventScript_ItemXSpecial", "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" }, { diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index e470111f8..b0f6a8e12 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_1BE8DB", + "script": "SilphCo_7F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_1BE8E8", + "script": "SilphCo_7F_EventScript_ItemTM08", "flag": "FLAG_HIDE_SILPH_CO_7F_TM08" } ], diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 629519c25..aba6cfb3f 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_8F_EventScript_1BEB4B", + "script": "SilphCo_8F_EventScript_ItemIron", "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" }, { diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 0997aafc7..bc785bd6b 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -107,7 +107,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_OutcastIsland_EventScript_1BEC90", + "script": "SixIsland_OutcastIsland_EventScript_ItemPPUp", "flag": "FLAG_HIDE_SIX_ISLAND_OUTCAST_ISLAND_PP_UP" } ], diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index c3be304c9..26f0ccdf5 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -211,7 +211,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BECC4", + "script": "SixIsland_RuinValley_EventScript_ItemHPUp", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" }, { @@ -224,7 +224,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BECB7", + "script": "SixIsland_RuinValley_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" }, { @@ -237,7 +237,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BECD1", + "script": "SixIsland_RuinValley_EventScript_ItemSunStone", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_SUN_STONE" } ], diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index f1bd689c9..5a0f111c8 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -130,7 +130,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_WaterPath_EventScript_1BEC9D", + "script": "SixIsland_WaterPath_EventScript_ItemElixir", "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" }, { @@ -143,7 +143,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_WaterPath_EventScript_1BECAA", + "script": "SixIsland_WaterPath_EventScript_ItemDragonScale", "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_DRAGON_SCALE" } ], diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index fc30c5a41..9607ba491 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1BEABC", + "script": "ThreeIsland_EventScript_ItemZinc", "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" }, { diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index a9a72b4ae..502289c81 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BED05", + "script": "ThreeIsland_BerryForest_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BED12", + "script": "ThreeIsland_BerryForest_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BED1F", + "script": "ThreeIsland_BerryForest_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ELIXIR" } ], diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 24db68596..34f5bbfce 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -107,7 +107,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_1BEAAF", + "script": "TwoIsland_EventScript_ItemRevive", "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 2f1147e86..906c2a3d7 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE9D2", + "script": "VictoryRoad_1F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE9DF", + "script": "VictoryRoad_1F_EventScript_ItemTM02", "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index f52d46e71..454659d7e 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE9EC", + "script": "VictoryRoad_2F_EventScript_ItemGuardSpec", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE9F9", + "script": "VictoryRoad_2F_EventScript_ItemTM07", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BEA06", + "script": "VictoryRoad_2F_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BEA13", + "script": "VictoryRoad_2F_EventScript_ItemTM37", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index f9bbe5bc2..f98654fe8 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BEA20", + "script": "VictoryRoad_3F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BEA2D", + "script": "VictoryRoad_3F_EventScript_ItemTM50", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 4f5b1e9f5..b984008d5 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -143,7 +143,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1BEB8C", + "script": "ViridianCity_EventScript_ItemPotion", "flag": "FLAG_HIDE_VIRIDIAN_CITY_POTION" } ], diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index af19f7f56..8dbe5c5a5 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BE5A8", + "script": "ViridianForest_EventScript_ItemPokeBall", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BE5B5", + "script": "ViridianForest_EventScript_ItemAntidote", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BE5C2", + "script": "ViridianForest_EventScript_ItemPotion", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BEAC9", + "script": "ViridianForest_EventScript_ItemPotion2", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION_2" } ], diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index c268f4dcd..ed8aef9d4 100644 --- a/data/scripts/item_ball_scripts.inc +++ b/data/scripts/item_ball_scripts.inc @@ -1,671 +1,671 @@ -Route2_EventScript_1BE58E:: @ 81BE58E +Route2_EventScript_ItemEther:: @ 81BE58E finditem ITEM_ETHER end -Route2_EventScript_1BE59B:: @ 81BE59B +Route2_EventScript_ItemParalyzeHeal:: @ 81BE59B finditem ITEM_PARALYZE_HEAL end -ViridianForest_EventScript_1BE5A8:: @ 81BE5A8 +ViridianForest_EventScript_ItemPokeBall:: @ 81BE5A8 finditem ITEM_POKE_BALL end -ViridianForest_EventScript_1BE5B5:: @ 81BE5B5 +ViridianForest_EventScript_ItemAntidote:: @ 81BE5B5 finditem ITEM_ANTIDOTE end -ViridianForest_EventScript_1BE5C2:: @ 81BE5C2 +ViridianForest_EventScript_ItemPotion:: @ 81BE5C2 finditem ITEM_POTION end -MtMoon_1F_EventScript_1BE5CF:: @ 81BE5CF +MtMoon_1F_EventScript_ItemParalyzeHeal:: @ 81BE5CF finditem ITEM_PARALYZE_HEAL end -MtMoon_1F_EventScript_1BE5DC:: @ 81BE5DC +MtMoon_1F_EventScript_ItemTM09:: @ 81BE5DC finditem ITEM_TM09 end -MtMoon_1F_EventScript_1BE5E9:: @ 81BE5E9 +MtMoon_1F_EventScript_ItemPotion:: @ 81BE5E9 finditem ITEM_POTION end -MtMoon_1F_EventScript_1BE5F6:: @ 81BE5F6 +MtMoon_1F_EventScript_ItemRareCandy:: @ 81BE5F6 finditem ITEM_RARE_CANDY end -MtMoon_1F_EventScript_1BE603:: @ 81BE603 +MtMoon_1F_EventScript_ItemEscapeRope:: @ 81BE603 finditem ITEM_ESCAPE_ROPE end -MtMoon_1F_EventScript_1BE610:: @ 81BE610 +MtMoon_1F_EventScript_ItemMoonStone:: @ 81BE610 finditem ITEM_MOON_STONE end -MtMoon_B2F_EventScript_1BE61D:: @ 81BE61D +MtMoon_B2F_EventScript_ItemStarPiece:: @ 81BE61D finditem ITEM_STAR_PIECE end -MtMoon_B2F_EventScript_1BE62A:: @ 81BE62A +MtMoon_B2F_EventScript_ItemTM46:: @ 81BE62A finditem ITEM_TM46 end -Route4_EventScript_1BE637:: @ 81BE637 +Route4_EventScript_ItemTM05:: @ 81BE637 finditem ITEM_TM05 end -Route24_EventScript_1BE644:: @ 81BE644 +Route24_EventScript_ItemTM45:: @ 81BE644 finditem ITEM_TM45 end -Route25_EventScript_1BE651:: @ 81BE651 +Route25_EventScript_ItemTM43:: @ 81BE651 finditem ITEM_TM43 end -SSAnne_1F_Room2_EventScript_1BE65E:: @ 81BE65E +SSAnne_1F_Room2_EventScript_ItemTM31:: @ 81BE65E finditem ITEM_TM31 end -SSAnne_2F_Room2_EventScript_1BE66B:: @ 81BE66B +SSAnne_2F_Room2_EventScript_ItemStardust:: @ 81BE66B finditem ITEM_STARDUST end -SSAnne_2F_Room4_EventScript_1BE678:: @ 81BE678 +SSAnne_2F_Room4_EventScript_ItemXAttack:: @ 81BE678 finditem ITEM_X_ATTACK end -SSAnne_B1F_Room2_EventScript_1BE685:: @ 81BE685 +SSAnne_B1F_Room2_EventScript_ItemTM44:: @ 81BE685 finditem ITEM_TM44 end -SSAnne_B1F_Room3_EventScript_1BE692:: @ 81BE692 +SSAnne_B1F_Room3_EventScript_ItemEther:: @ 81BE692 finditem ITEM_ETHER end -SSAnne_B1F_Room5_EventScript_1BE69F:: @ 81BE69F +SSAnne_B1F_Room5_EventScript_ItemSuperPotion:: @ 81BE69F finditem ITEM_SUPER_POTION end -SSAnne_Kitchen_EventScript_1BE6AC:: @ 81BE6AC +SSAnne_Kitchen_EventScript_ItemGreatBall:: @ 81BE6AC finditem ITEM_GREAT_BALL end -Route9_EventScript_1BE6B9:: @ 81BE6B9 +Route9_EventScript_ItemTM40:: @ 81BE6B9 finditem ITEM_TM40 end -RocketHideout_B1F_EventScript_1BE6C6:: @ 81BE6C6 +RocketHideout_B1F_EventScript_ItemEscapeRope:: @ 81BE6C6 finditem ITEM_ESCAPE_ROPE end -RocketHideout_B1F_EventScript_1BE6D3:: @ 81BE6D3 +RocketHideout_B1F_EventScript_ItemHyperPotion:: @ 81BE6D3 finditem ITEM_HYPER_POTION end -RocketHideout_B2F_EventScript_1BE6E0:: @ 81BE6E0 +RocketHideout_B2F_EventScript_ItemXSpeed:: @ 81BE6E0 finditem ITEM_X_SPEED end -RocketHideout_B2F_EventScript_1BE6ED:: @ 81BE6ED +RocketHideout_B2F_EventScript_ItemMoonStone:: @ 81BE6ED finditem ITEM_MOON_STONE end -RocketHideout_B2F_EventScript_1BE6FA:: @ 81BE6FA +RocketHideout_B2F_EventScript_ItemTM12:: @ 81BE6FA finditem ITEM_TM12 end -RocketHideout_B2F_EventScript_1BE707:: @ 81BE707 +RocketHideout_B2F_EventScript_ItemSuperPotion:: @ 81BE707 finditem ITEM_SUPER_POTION end -RocketHideout_B3F_EventScript_1BE714:: @ 81BE714 +RocketHideout_B3F_EventScript_ItemRareCandy:: @ 81BE714 finditem ITEM_RARE_CANDY end -RocketHideout_B3F_EventScript_1BE721:: @ 81BE721 +RocketHideout_B3F_EventScript_ItemTM21:: @ 81BE721 finditem ITEM_TM21 end -RocketHideout_B4F_EventScript_1BE72E:: @ 81BE72E +RocketHideout_B4F_EventScript_ItemTM49:: @ 81BE72E finditem ITEM_TM49 end -RocketHideout_B4F_EventScript_1BE73B:: @ 81BE73B +RocketHideout_B4F_EventScript_ItemMaxEther:: @ 81BE73B finditem ITEM_MAX_ETHER end -RocketHideout_B4F_EventScript_1BE748:: @ 81BE748 +RocketHideout_B4F_EventScript_ItemCalcium:: @ 81BE748 finditem ITEM_CALCIUM end -PokemonTower_3F_EventScript_1BE755:: @ 81BE755 +PokemonTower_3F_EventScript_ItemEscapeRope:: @ 81BE755 finditem ITEM_ESCAPE_ROPE end -PokemonTower_4F_EventScript_1BE762:: @ 81BE762 +PokemonTower_4F_EventScript_ItemElixir:: @ 81BE762 finditem ITEM_ELIXIR end -PokemonTower_4F_EventScript_1BE76F:: @ 81BE76F +PokemonTower_4F_EventScript_ItemAwakening:: @ 81BE76F finditem ITEM_AWAKENING end -PokemonTower_4F_EventScript_1BE77C:: @ 81BE77C +PokemonTower_4F_EventScript_ItemGreatBall:: @ 81BE77C finditem ITEM_GREAT_BALL end -PokemonTower_5F_EventScript_1BE789:: @ 81BE789 +PokemonTower_5F_EventScript_ItemNugget:: @ 81BE789 finditem ITEM_NUGGET end -PokemonTower_6F_EventScript_1BE796:: @ 81BE796 +PokemonTower_6F_EventScript_ItemRareCandy:: @ 81BE796 finditem ITEM_RARE_CANDY end -PokemonTower_6F_EventScript_1BE7A3:: @ 81BE7A3 +PokemonTower_6F_EventScript_ItemXAccuracy:: @ 81BE7A3 finditem ITEM_X_ACCURACY end -Route12_EventScript_1BE7B0:: @ 81BE7B0 +Route12_EventScript_ItemTM48:: @ 81BE7B0 finditem ITEM_TM48 end -Route12_EventScript_1BE7BD:: @ 81BE7BD +Route12_EventScript_ItemIron:: @ 81BE7BD finditem ITEM_IRON end -Route15_EventScript_1BE7CA:: @ 81BE7CA +Route15_EventScript_ItemTM18:: @ 81BE7CA finditem ITEM_TM18 end -SafariZone_Center_EventScript_1BE7D7:: @ 81BE7D7 +SafariZone_Center_EventScript_ItemNugget:: @ 81BE7D7 finditem ITEM_NUGGET end -SafariZone_East_EventScript_1BE7E4:: @ 81BE7E4 +SafariZone_East_EventScript_ItemMaxPotion:: @ 81BE7E4 finditem ITEM_MAX_POTION end -SafariZone_East_EventScript_1BE7F1:: @ 81BE7F1 +SafariZone_East_EventScript_ItemFullRestore:: @ 81BE7F1 finditem ITEM_FULL_RESTORE end -SafariZone_East_EventScript_1BE7FE:: @ 81BE7FE +SafariZone_East_EventScript_ItemTM11:: @ 81BE7FE finditem ITEM_TM11 end -SafariZone_East_EventScript_1BE80B:: @ 81BE80B +SafariZone_East_EventScript_ItemLeafStone:: @ 81BE80B finditem ITEM_LEAF_STONE end -SafariZone_North_EventScript_1BE818:: @ 81BE818 +SafariZone_North_EventScript_ItemProtein:: @ 81BE818 finditem ITEM_PROTEIN end -SafariZone_North_EventScript_1BE825:: @ 81BE825 +SafariZone_North_EventScript_ItemTM47:: @ 81BE825 finditem ITEM_TM47 end -SafariZone_West_EventScript_1BE832:: @ 81BE832 +SafariZone_West_EventScript_ItemTM32:: @ 81BE832 finditem ITEM_TM32 end -SafariZone_West_EventScript_1BE83F:: @ 81BE83F +SafariZone_West_EventScript_ItemGoldTeeth:: @ 81BE83F finditem ITEM_GOLD_TEETH end -SafariZone_West_EventScript_1BE84C:: @ 81BE84C +SafariZone_West_EventScript_ItemMaxPotion:: @ 81BE84C finditem ITEM_MAX_POTION end -SafariZone_West_EventScript_1BE859:: @ 81BE859 +SafariZone_West_EventScript_ItemMaxRevive:: @ 81BE859 finditem ITEM_MAX_REVIVE end -SilphCo_3F_EventScript_1BE866:: @ 81BE866 +SilphCo_3F_EventScript_ItemHyperPotion:: @ 81BE866 finditem ITEM_HYPER_POTION end -SilphCo_4F_EventScript_1BE873:: @ 81BE873 +SilphCo_4F_EventScript_ItemMaxRevive:: @ 81BE873 finditem ITEM_MAX_REVIVE end -SilphCo_4F_EventScript_1BE880:: @ 81BE880 +SilphCo_4F_EventScript_ItemEscapeRope:: @ 81BE880 finditem ITEM_ESCAPE_ROPE end -SilphCo_4F_EventScript_1BE88D:: @ 81BE88D +SilphCo_4F_EventScript_ItemFullHeal:: @ 81BE88D finditem ITEM_FULL_HEAL end -SilphCo_5F_EventScript_1BE89A:: @ 81BE89A +SilphCo_5F_EventScript_ItemProtein:: @ 81BE89A finditem ITEM_PROTEIN end -SilphCo_5F_EventScript_1BE8A7:: @ 81BE8A7 +SilphCo_5F_EventScript_ItemTM01:: @ 81BE8A7 finditem ITEM_TM01 end -SilphCo_5F_EventScript_1BE8B4:: @ 81BE8B4 +SilphCo_5F_EventScript_ItemCardKey:: @ 81BE8B4 finditem ITEM_CARD_KEY end -SilphCo_6F_EventScript_1BE8C1:: @ 81BE8C1 +SilphCo_6F_EventScript_ItemHPUp:: @ 81BE8C1 finditem ITEM_HP_UP end -SilphCo_6F_EventScript_1BE8CE:: @ 81BE8CE +SilphCo_6F_EventScript_ItemXSpecial:: @ 81BE8CE finditem ITEM_X_SPECIAL end -SilphCo_7F_EventScript_1BE8DB:: @ 81BE8DB +SilphCo_7F_EventScript_ItemCalcium:: @ 81BE8DB finditem ITEM_CALCIUM end -SilphCo_7F_EventScript_1BE8E8:: @ 81BE8E8 +SilphCo_7F_EventScript_ItemTM08:: @ 81BE8E8 finditem ITEM_TM08 end -SilphCo_10F_EventScript_1BE8F5:: @ 81BE8F5 +SilphCo_10F_EventScript_ItemCarbos:: @ 81BE8F5 finditem ITEM_CARBOS end -SilphCo_10F_EventScript_1BE902:: @ 81BE902 +SilphCo_10F_EventScript_ItemUltraBall:: @ 81BE902 finditem ITEM_ULTRA_BALL end -SilphCo_10F_EventScript_1BE90F:: @ 81BE90F +SilphCo_10F_EventScript_ItemRareCandy:: @ 81BE90F finditem ITEM_RARE_CANDY end -PowerPlant_EventScript_1BE91C:: @ 81BE91C +PowerPlant_EventScript_ItemMaxPotion:: @ 81BE91C finditem ITEM_MAX_POTION end -PowerPlant_EventScript_1BE929:: @ 81BE929 +PowerPlant_EventScript_ItemTM17:: @ 81BE929 finditem ITEM_TM17 end -PowerPlant_EventScript_1BE936:: @ 81BE936 +PowerPlant_EventScript_ItemTM25:: @ 81BE936 finditem ITEM_TM25 end -PowerPlant_EventScript_1BE943:: @ 81BE943 +PowerPlant_EventScript_ItemThunderStone:: @ 81BE943 finditem ITEM_THUNDER_STONE end -PowerPlant_EventScript_1BE950:: @ 81BE950 +PowerPlant_EventScript_ItemElixir:: @ 81BE950 finditem ITEM_ELIXIR end -PokemonMansion_1F_EventScript_1BE95D:: @ 81BE95D +PokemonMansion_1F_EventScript_ItemCarbos:: @ 81BE95D finditem ITEM_CARBOS end -PokemonMansion_1F_EventScript_1BE96A:: @ 81BE96A +PokemonMansion_1F_EventScript_ItemEscapeRope:: @ 81BE96A finditem ITEM_ESCAPE_ROPE end -PokemonMansion_2F_EventScript_1BE977:: @ 81BE977 +PokemonMansion_2F_EventScript_ItemCalcium:: @ 81BE977 finditem ITEM_CALCIUM end -PokemonMansion_3F_EventScript_1BE984:: @ 81BE984 +PokemonMansion_3F_EventScript_ItemMaxPotion:: @ 81BE984 finditem ITEM_MAX_POTION end -PokemonMansion_3F_EventScript_1BE991:: @ 81BE991 +PokemonMansion_3F_EventScript_ItemIron:: @ 81BE991 finditem ITEM_IRON end -PokemonMansion_B1F_EventScript_1BE99E:: @ 81BE99E +PokemonMansion_B1F_EventScript_ItemTM14:: @ 81BE99E finditem ITEM_TM14 end -PokemonMansion_B1F_EventScript_1BE9AB:: @ 81BE9AB +PokemonMansion_B1F_EventScript_ItemFullRestore:: @ 81BE9AB finditem ITEM_FULL_RESTORE end -PokemonMansion_B1F_EventScript_1BE9B8:: @ 81BE9B8 +PokemonMansion_B1F_EventScript_ItemTM22:: @ 81BE9B8 finditem ITEM_TM22 end -PokemonMansion_B1F_EventScript_1BE9C5:: @ 81BE9C5 +PokemonMansion_B1F_EventScript_ItemSecretKey:: @ 81BE9C5 finditem ITEM_SECRET_KEY end -VictoryRoad_1F_EventScript_1BE9D2:: @ 81BE9D2 +VictoryRoad_1F_EventScript_ItemRareCandy:: @ 81BE9D2 finditem ITEM_RARE_CANDY end -VictoryRoad_1F_EventScript_1BE9DF:: @ 81BE9DF +VictoryRoad_1F_EventScript_ItemTM02:: @ 81BE9DF finditem ITEM_TM02 end -VictoryRoad_2F_EventScript_1BE9EC:: @ 81BE9EC +VictoryRoad_2F_EventScript_ItemGuardSpec:: @ 81BE9EC finditem ITEM_GUARD_SPEC end -VictoryRoad_2F_EventScript_1BE9F9:: @ 81BE9F9 +VictoryRoad_2F_EventScript_ItemTM07:: @ 81BE9F9 finditem ITEM_TM07 end -VictoryRoad_2F_EventScript_1BEA06:: @ 81BEA06 +VictoryRoad_2F_EventScript_ItemFullHeal:: @ 81BEA06 finditem ITEM_FULL_HEAL end -VictoryRoad_2F_EventScript_1BEA13:: @ 81BEA13 +VictoryRoad_2F_EventScript_ItemTM37:: @ 81BEA13 finditem ITEM_TM37 end -VictoryRoad_3F_EventScript_1BEA20:: @ 81BEA20 +VictoryRoad_3F_EventScript_ItemMaxRevive:: @ 81BEA20 finditem ITEM_MAX_REVIVE end -VictoryRoad_3F_EventScript_1BEA2D:: @ 81BEA2D +VictoryRoad_3F_EventScript_ItemTM50:: @ 81BEA2D finditem ITEM_TM50 end -CeruleanCave_1F_EventScript_1BEA3A:: @ 81BEA3A +CeruleanCave_1F_EventScript_ItemMaxElixir:: @ 81BEA3A finditem ITEM_MAX_ELIXIR end -CeruleanCave_1F_EventScript_1BEA47:: @ 81BEA47 +CeruleanCave_1F_EventScript_ItemNugget:: @ 81BEA47 finditem ITEM_NUGGET end -CeruleanCave_1F_EventScript_1BEA54:: @ 81BEA54 +CeruleanCave_1F_EventScript_ItemFullRestore:: @ 81BEA54 finditem ITEM_FULL_RESTORE end -CeruleanCave_2F_EventScript_1BEA61:: @ 81BEA61 +CeruleanCave_2F_EventScript_ItemFullRestore:: @ 81BEA61 finditem ITEM_FULL_RESTORE end -CeruleanCave_2F_EventScript_1BEA6E:: @ 81BEA6E +CeruleanCave_2F_EventScript_ItemPPUp:: @ 81BEA6E finditem ITEM_PP_UP end -CeruleanCave_2F_EventScript_1BEA7B:: @ 81BEA7B +CeruleanCave_2F_EventScript_ItemUltraBall:: @ 81BEA7B finditem ITEM_ULTRA_BALL end -CeruleanCave_B1F_EventScript_1BEA88:: @ 81BEA88 +CeruleanCave_B1F_EventScript_ItemMaxRevive:: @ 81BEA88 finditem ITEM_MAX_REVIVE end -CeruleanCave_B1F_EventScript_1BEA95:: @ 81BEA95 +CeruleanCave_B1F_EventScript_ItemUltraBall:: @ 81BEA95 finditem ITEM_ULTRA_BALL end -FuchsiaCity_Building1_EventScript_1BEAA2:: @ 81BEAA2 +FuchsiaCity_Building1_EventScript_ItemRareCandy:: @ 81BEAA2 finditem ITEM_RARE_CANDY end -TwoIsland_EventScript_1BEAAF:: @ 81BEAAF +TwoIsland_EventScript_ItemRevive:: @ 81BEAAF finditem ITEM_REVIVE end -ThreeIsland_EventScript_1BEABC:: @ 81BEABC +ThreeIsland_EventScript_ItemZinc:: @ 81BEABC finditem ITEM_ZINC end -ViridianForest_EventScript_1BEAC9:: @ 81BEAC9 +ViridianForest_EventScript_ItemPotion2:: @ 81BEAC9 finditem ITEM_POTION end -MtMoon_B2F_EventScript_1BEAD6:: @ 81BEAD6 +MtMoon_B2F_EventScript_ItemRevive:: @ 81BEAD6 finditem ITEM_REVIVE end -MtMoon_B2F_EventScript_1BEAE3:: @ 81BEAE3 +MtMoon_B2F_EventScript_ItemAntidote:: @ 81BEAE3 finditem ITEM_ANTIDOTE end -Route11_EventScript_1BEAF0:: @ 81BEAF0 +Route11_EventScript_ItemXDefend:: @ 81BEAF0 finditem ITEM_X_DEFEND end -Route9_EventScript_1BEAFD:: @ 81BEAFD +Route9_EventScript_ItemBurnHeal:: @ 81BEAFD finditem ITEM_BURN_HEAL end -RockTunnel_1F_EventScript_1BEB0A:: @ 81BEB0A +RockTunnel_1F_EventScript_ItemRepel:: @ 81BEB0A finditem ITEM_REPEL end -RockTunnel_1F_EventScript_1BEB17:: @ 81BEB17 +RockTunnel_1F_EventScript_ItemPearl:: @ 81BEB17 finditem ITEM_PEARL end -RockTunnel_1F_EventScript_1BEB24:: @ 81BEB24 +RockTunnel_1F_EventScript_ItemEscapeRope:: @ 81BEB24 finditem ITEM_ESCAPE_ROPE end -RockTunnel_B1F_EventScript_1BEB31:: @ 81BEB31 +RockTunnel_B1F_EventScript_ItemRevive:: @ 81BEB31 finditem ITEM_REVIVE end -RockTunnel_B1F_EventScript_1BEB3E:: @ 81BEB3E +RockTunnel_B1F_EventScript_ItemMaxEther:: @ 81BEB3E finditem ITEM_MAX_ETHER end -SilphCo_8F_EventScript_1BEB4B:: @ 81BEB4B +SilphCo_8F_EventScript_ItemIron:: @ 81BEB4B finditem ITEM_IRON end -SilphCo_11F_EventScript_1BEB58:: @ 81BEB58 +SilphCo_11F_EventScript_ItemZinc:: @ 81BEB58 finditem ITEM_ZINC end -PokemonMansion_1F_EventScript_1BEB65:: @ 81BEB65 +PokemonMansion_1F_EventScript_ItemProtein:: @ 81BEB65 finditem ITEM_PROTEIN end -PokemonMansion_2F_EventScript_1BEB72:: @ 81BEB72 +PokemonMansion_2F_EventScript_ItemZinc:: @ 81BEB72 finditem ITEM_ZINC end -PokemonMansion_2F_EventScript_1BEB7F:: @ 81BEB7F +PokemonMansion_2F_EventScript_ItemHPUp:: @ 81BEB7F finditem ITEM_HP_UP end -ViridianCity_EventScript_1BEB8C:: @ 81BEB8C +ViridianCity_EventScript_ItemPotion:: @ 81BEB8C finditem ITEM_POTION end -Route11_EventScript_1BEB99:: @ 81BEB99 +Route11_EventScript_ItemGreatBall:: @ 81BEB99 finditem ITEM_GREAT_BALL end -Route11_EventScript_1BEBA6:: @ 81BEBA6 +Route11_EventScript_ItemAwakening:: @ 81BEBA6 finditem ITEM_AWAKENING end -PokemonTower_5F_EventScript_1BEBB3:: @ 81BEBB3 +PokemonTower_5F_EventScript_ItemCleanseTag:: @ 81BEBB3 finditem ITEM_CLEANSE_TAG end -CeladonCity_EventScript_1BEBC0:: @ 81BEBC0 +CeladonCity_EventScript_ItemEther:: @ 81BEBC0 finditem ITEM_ETHER end -RocketHideout_B3F_EventScript_1BEBCD:: @ 81BEBCD +RocketHideout_B3F_EventScript_ItemBlackGlasses:: @ 81BEBCD finditem ITEM_BLACK_GLASSES end -SafariZone_North_EventScript_1BEBDA:: @ 81BEBDA +SafariZone_North_EventScript_ItemQuickClaw:: @ 81BEBDA finditem ITEM_QUICK_CLAW end -SeafoamIslands_1F_EventScript_1BEBE7:: @ 81BEBE7 +SeafoamIslands_1F_EventScript_ItemIceHeal:: @ 81BEBE7 finditem ITEM_ICE_HEAL end -SeafoamIslands_B1F_EventScript_1BEBF4:: @ 81BEBF4 +SeafoamIslands_B1F_EventScript_ItemWaterStone:: @ 81BEBF4 finditem ITEM_WATER_STONE end -SeafoamIslands_B1F_EventScript_1BEC01:: @ 81BEC01 +SeafoamIslands_B1F_EventScript_ItemRevive:: @ 81BEC01 finditem ITEM_REVIVE end -SeafoamIslands_B2F_EventScript_1BEC0E:: @ 81BEC0E +SeafoamIslands_B2F_EventScript_ItemBigPearl:: @ 81BEC0E finditem ITEM_BIG_PEARL end -SeafoamIslands_B4F_EventScript_1BEC1B:: @ 81BEC1B +SeafoamIslands_B4F_EventScript_ItemUltraBall:: @ 81BEC1B finditem ITEM_ULTRA_BALL end -FourIsland_EventScript_1BEC28:: @ 81BEC28 +FourIsland_EventScript_ItemStarPiece:: @ 81BEC28 finditem ITEM_STAR_PIECE end -FourIsland_EventScript_1BEC35:: @ 81BEC35 +FourIsland_EventScript_ItemStardust:: @ 81BEC35 finditem ITEM_STARDUST end -OneIsland_KindleRoad_EventScript_1BEC42:: @ 81BEC42 +OneIsland_KindleRoad_EventScript_ItemEther:: @ 81BEC42 finditem ITEM_ETHER end -OneIsland_KindleRoad_EventScript_1BEC4F:: @ 81BEC4F +OneIsland_KindleRoad_EventScript_ItemMaxRepel:: @ 81BEC4F finditem ITEM_MAX_REPEL end -OneIsland_KindleRoad_EventScript_1BEC5C:: @ 81BEC5C +OneIsland_KindleRoad_EventScript_ItemCarbos:: @ 81BEC5C finditem ITEM_CARBOS end -FiveIsland_Meadow_EventScript_1BEC69:: @ 81BEC69 +FiveIsland_Meadow_EventScript_ItemMaxPotion:: @ 81BEC69 finditem ITEM_MAX_POTION end -FiveIsland_Meadow_EventScript_1BEC76:: @ 81BEC76 +FiveIsland_Meadow_EventScript_ItemPPUp:: @ 81BEC76 finditem ITEM_PP_UP end -FiveIsland_MemorialPillar_EventScript_1BEC83:: @ 81BEC83 +FiveIsland_MemorialPillar_EventScript_ItemMetalCoat:: @ 81BEC83 finditem ITEM_METAL_COAT end -SixIsland_OutcastIsland_EventScript_1BEC90:: @ 81BEC90 +SixIsland_OutcastIsland_EventScript_ItemPPUp:: @ 81BEC90 finditem ITEM_PP_UP end -SixIsland_WaterPath_EventScript_1BEC9D:: @ 81BEC9D +SixIsland_WaterPath_EventScript_ItemElixir:: @ 81BEC9D finditem ITEM_ELIXIR end -SixIsland_WaterPath_EventScript_1BECAA:: @ 81BECAA +SixIsland_WaterPath_EventScript_ItemDragonScale:: @ 81BECAA finditem ITEM_DRAGON_SCALE end -SixIsland_RuinValley_EventScript_1BECB7:: @ 81BECB7 +SixIsland_RuinValley_EventScript_ItemFullRestore:: @ 81BECB7 finditem ITEM_FULL_RESTORE end -SixIsland_RuinValley_EventScript_1BECC4:: @ 81BECC4 +SixIsland_RuinValley_EventScript_ItemHPUp:: @ 81BECC4 finditem ITEM_HP_UP end -SixIsland_RuinValley_EventScript_1BECD1:: @ 81BECD1 +SixIsland_RuinValley_EventScript_ItemSunStone:: @ 81BECD1 finditem ITEM_SUN_STONE end -SevenIsland_SevaultCanyon_EventScript_1BECDE:: @ 81BECDE +SevenIsland_SevaultCanyon_EventScript_ItemKingsRock:: @ 81BECDE finditem ITEM_KINGS_ROCK end -SevenIsland_SevaultCanyon_EventScript_1BECEB:: @ 81BECEB +SevenIsland_SevaultCanyon_EventScript_ItemMaxElixir:: @ 81BECEB finditem ITEM_MAX_ELIXIR end -SevenIsland_SevaultCanyon_EventScript_1BECF8:: @ 81BECF8 +SevenIsland_SevaultCanyon_EventScript_ItemNugget:: @ 81BECF8 finditem ITEM_NUGGET end -ThreeIsland_BerryForest_EventScript_1BED05:: @ 81BED05 +ThreeIsland_BerryForest_EventScript_ItemMaxEther:: @ 81BED05 finditem ITEM_MAX_ETHER end -ThreeIsland_BerryForest_EventScript_1BED12:: @ 81BED12 +ThreeIsland_BerryForest_EventScript_ItemFullHeal:: @ 81BED12 finditem ITEM_FULL_HEAL end -ThreeIsland_BerryForest_EventScript_1BED1F:: @ 81BED1F +ThreeIsland_BerryForest_EventScript_ItemMaxElixir:: @ 81BED1F finditem ITEM_MAX_ELIXIR end -MtEmber_Exterior_EventScript_1BED2C:: @ 81BED2C +MtEmber_Exterior_EventScript_ItemUltraBall:: @ 81BED2C finditem ITEM_ULTRA_BALL end -MtEmber_Exterior_EventScript_1BED39:: @ 81BED39 +MtEmber_Exterior_EventScript_ItemFireStone:: @ 81BED39 finditem ITEM_FIRE_STONE end -MtEmber_Exterior_EventScript_1BED46:: @ 81BED46 +MtEmber_Exterior_EventScript_ItemDireHit:: @ 81BED46 finditem ITEM_DIRE_HIT end -FourIsland_IcefallCave_1F_EventScript_1BED53:: @ 81BED53 +FourIsland_IcefallCave_1F_EventScript_ItemUltraBall:: @ 81BED53 finditem ITEM_ULTRA_BALL end -FourIsland_IcefallCave_1F_EventScript_1BED60:: @ 81BED60 +FourIsland_IcefallCave_1F_EventScript_ItemHM07:: @ 81BED60 finditem ITEM_HM07 end -FourIsland_IcefallCave_B1F_EventScript_1BED6D:: @ 81BED6D +FourIsland_IcefallCave_B1F_EventScript_ItemFullRestore:: @ 81BED6D finditem ITEM_FULL_RESTORE end -FourIsland_IcefallCave_B1F_EventScript_1BED7A:: @ 81BED7A +FourIsland_IcefallCave_B1F_EventScript_ItemNeverMeltIce:: @ 81BED7A finditem ITEM_NEVER_MELT_ICE end -FiveIsland_RocketWarehouse_EventScript_1BED87:: @ 81BED87 +FiveIsland_RocketWarehouse_EventScript_ItemBigPearl:: @ 81BED87 finditem ITEM_BIG_PEARL end -FiveIsland_RocketWarehouse_EventScript_1BED94:: @ 81BED94 +FiveIsland_RocketWarehouse_EventScript_ItemTM36:: @ 81BED94 finditem ITEM_TM36 end -FiveIsland_RocketWarehouse_EventScript_1BEDA1:: @ 81BEDA1 +FiveIsland_RocketWarehouse_EventScript_ItemPearl:: @ 81BEDA1 finditem ITEM_PEARL end -FiveIsland_RocketWarehouse_EventScript_1BEDAE:: @ 81BEDAE +FiveIsland_RocketWarehouse_EventScript_ItemUpGrade:: @ 81BEDAE finditem ITEM_UP_GRADE end -FiveIsland_LostCave_Room10_EventScript_1BEDBB:: @ 81BEDBB +FiveIsland_LostCave_Room10_EventScript_ItemSilkScarf:: @ 81BEDBB finditem ITEM_SILK_SCARF end -FiveIsland_LostCave_Room11_EventScript_1BEDC8:: @ 81BEDC8 +FiveIsland_LostCave_Room11_EventScript_ItemLaxIncense:: @ 81BEDC8 finditem ITEM_LAX_INCENSE end -FiveIsland_LostCave_Room12_EventScript_1BEDD5:: @ 81BEDD5 +FiveIsland_LostCave_Room12_EventScript_ItemSeaIncense:: @ 81BEDD5 finditem ITEM_SEA_INCENSE end -FiveIsland_LostCave_Room13_EventScript_1BEDE2:: @ 81BEDE2 +FiveIsland_LostCave_Room13_EventScript_ItemMaxRevive:: @ 81BEDE2 finditem ITEM_MAX_REVIVE end -FiveIsland_LostCave_Room14_EventScript_1BEDEF:: @ 81BEDEF +FiveIsland_LostCave_Room14_EventScript_ItemRareCandy:: @ 81BEDEF finditem ITEM_RARE_CANDY end -SevenIsland_SevaultCanyon_House_EventScript_1BEDFC:: @ 81BEDFC +SevenIsland_SevaultCanyon_House_EventScript_ItemLuckyPunch:: @ 81BEDFC finditem ITEM_LUCKY_PUNCH end -SilphCo_4F_EventScript_1BEE09:: @ 81BEE09 +SilphCo_4F_EventScript_ItemTM41:: @ 81BEE09 finditem ITEM_TM41 end From 0676e732869d0e62322b001cbab57b8500361005 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 12 Jan 2020 16:53:55 -0500 Subject: [PATCH 20/20] Remove unused link groups, dead label --- data/scripts/cable_club.inc | 1 - include/constants/union_room.h | 15 +-------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index abbd37e06..f4d0ed6e1 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -675,7 +675,6 @@ BattleColosseum4P_EventScript_PlayerSpot3:: @ 81BB932 BattleColosseum4P_EventScript_CancelSpotTrigger:: @ 81BB94F end -gUnknown_81BB950:: @ 81BB950 TradeCenter_EventScript_Chair0:: @ 81BB950 setvar VAR_0x8005, 0 textcolor 3 diff --git a/include/constants/union_room.h b/include/constants/union_room.h index 2314f85a0..021424773 100644 --- a/include/constants/union_room.h +++ b/include/constants/union_room.h @@ -10,19 +10,6 @@ #define LINK_GROUP_BERRY_PICKING 6 #define LINK_GROUP_WONDER_CARD 7 #define LINK_GROUP_WONDER_NEWS 8 -#define LINK_GROUP_UNK_9 9 -#define LINK_GROUP_UNK_10 10 -#define LINK_GROUP_UNK_11 11 -#define LINK_GROUP_RECORD_CORNER 12 -#define LINK_GROUP_BERRY_BLENDER 13 -#define LINK_GROUP_UNK_14 14 -#define LINK_GROUP_COOL_CONTEST 15 -#define LINK_GROUP_BEAUTY_CONTEST 16 -#define LINK_GROUP_CUTE_CONTEST 17 -#define LINK_GROUP_SMART_CONTEST 18 -#define LINK_GROUP_TOUGH_CONTEST 19 -#define LINK_GROUP_BATTLE_TOWER 20 -#define LINK_GROUP_BATTLE_TOWER_OPEN 21 -#define NUM_LINK_GROUP_TYPES 22 +#define NUM_LINK_GROUP_TYPES 9 #endif //GUARD_CONSTANTS_UNION_ROOM_H