From bef24a45f0249ba867a5a11f34e04c35c64cd9fa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 02:03:45 -0500 Subject: [PATCH] Document Littleroot scripts --- data/event_scripts.s | 4 +- data/maps/InsideOfTruck/map.json | 22 +- data/maps/InsideOfTruck/scripts.inc | 28 +- data/maps/LittlerootTown/map.json | 34 +- data/maps/LittlerootTown/scripts.inc | 576 +++++++++--------- .../scripts.inc | 7 +- .../LittlerootTown_MaysHouse_1F/scripts.inc | 6 +- .../map.json | 42 +- .../scripts.inc | 574 ++++++++--------- data/scripts/players_house.inc | 8 +- data/text/match_call.inc | 5 +- include/constants/vars.h | 4 +- include/event_scripts.h | 2 +- src/field_control_avatar.c | 2 +- src/save_location.c | 2 + 15 files changed, 685 insertions(+), 631 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index b1e637bf00..213784708a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -692,8 +692,8 @@ EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F return EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 - setvar VAR_LITTLEROOT_HOUSES_STATE, 3 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3 clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD return diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index ff76eb7748..256c7c1a59 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "InsideOfTruck_EventScript_23BF6C", + "script": "InsideOfTruck_EventScript_MovingBox", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "InsideOfTruck_EventScript_23BF6C", + "script": "InsideOfTruck_EventScript_MovingBox", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "InsideOfTruck_EventScript_23BF6C", + "script": "InsideOfTruck_EventScript_MovingBox", "flag": "0" } ], @@ -85,7 +85,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", - "script": "InsideOfTruck_EventScript_23BF04" + "script": "InsideOfTruck_EventScript_SetIntroFlags" }, { "type": "trigger", @@ -94,7 +94,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", - "script": "InsideOfTruck_EventScript_23BF04" + "script": "InsideOfTruck_EventScript_SetIntroFlags" }, { "type": "trigger", @@ -103,7 +103,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", - "script": "InsideOfTruck_EventScript_23BF04" + "script": "InsideOfTruck_EventScript_SetIntroFlags" } ], "bg_events": [ @@ -113,7 +113,7 @@ "y": 0, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" }, { "type": "sign", @@ -121,7 +121,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" }, { "type": "sign", @@ -129,7 +129,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" }, { "type": "sign", @@ -137,7 +137,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" }, { "type": "sign", @@ -145,7 +145,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" } ] } \ No newline at end of file diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 9573fe745f..fb75273cc4 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -1,29 +1,29 @@ InsideOfTruck_MapScripts:: @ 823BEDA - map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_23BEE5 - map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_23BF01 + map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_OnLoad + map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_OnResume .byte 0 -InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 +InsideOfTruck_OnLoad: @ 823BEE5 setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0 setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0 setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0 end -InsideOfTruck_MapScript1_23BF01: @ 823BF01 +InsideOfTruck_OnResume: @ 823BF01 setstepcallback STEP_CB_TRUCK end -InsideOfTruck_EventScript_23BF04:: @ 823BF04 +InsideOfTruck_EventScript_SetIntroFlags:: @ 823BF04 lockall setflag FLAG_HIDE_MAP_NAME_POPUP checkplayergender compare VAR_RESULT, MALE - goto_if_eq InsideOfTruck_EventScript_23BF20 + goto_if_eq InsideOfTruck_EventScript_SetIntroFlagsMale compare VAR_RESULT, FEMALE - goto_if_eq InsideOfTruck_EventScript_23BF46 + goto_if_eq InsideOfTruck_EventScript_SetIntroFlagsFemale end -InsideOfTruck_EventScript_23BF20:: @ 823BF20 +InsideOfTruck_EventScript_SetIntroFlagsMale:: @ 823BF20 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM @@ -31,12 +31,12 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end -InsideOfTruck_EventScript_23BF46:: @ 823BF46 +InsideOfTruck_EventScript_SetIntroFlagsFemale:: @ 823BF46 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM @@ -44,16 +44,16 @@ InsideOfTruck_EventScript_23BF46:: @ 823BF46 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL - setvar VAR_LITTLEROOT_HOUSES_STATE, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end -InsideOfTruck_EventScript_23BF6C:: @ 823BF6C - msgbox InsideOfTruck_Text_23BF75, MSGBOX_SIGN +InsideOfTruck_EventScript_MovingBox:: @ 823BF6C + msgbox InsideOfTruck_Text_BoxPrintedWithMonLogo, MSGBOX_SIGN end -InsideOfTruck_Text_23BF75: @ 823BF75 +InsideOfTruck_Text_BoxPrintedWithMonLogo: @ 823BF75 .string "The box is printed with a POKéMON logo.\p" .string "It's a POKéMON brand moving and\n" .string "delivery service.$" diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index eaa17a5df8..56249cb509 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -30,7 +30,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_1E8034", + "script": "LittlerootTown_EventScript_Twin", "flag": "0" }, { @@ -43,7 +43,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_1E8022", + "script": "LittlerootTown_EventScript_FatMan", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" }, { @@ -56,7 +56,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_1E802B", + "script": "LittlerootTown_EventScript_Boy", "flag": "0" }, { @@ -69,7 +69,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_1E863D", + "script": "LittlerootTown_EventScript_Mom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" }, { @@ -156,7 +156,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "0", - "script": "LittlerootTown_EventScript_1E8091" + "script": "LittlerootTown_EventScript_NeedPokemonTriggerLeft" }, { "type": "trigger", @@ -165,7 +165,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "0", - "script": "LittlerootTown_EventScript_1E80EF" + "script": "LittlerootTown_EventScript_NeedPokemonTriggerRight" }, { "type": "trigger", @@ -174,7 +174,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "1", - "script": "LittlerootTown_EventScript_1E811F" + "script": "LittlerootTown_EventScript_GoSaveBirchTrigger" }, { "type": "trigger", @@ -183,7 +183,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81F9" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger4" }, { "type": "trigger", @@ -192,7 +192,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E8205" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger5" }, { "type": "trigger", @@ -201,7 +201,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81E1" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger2" }, { "type": "trigger", @@ -210,7 +210,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81ED" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger3" }, { "type": "trigger", @@ -219,7 +219,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81BB" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger0" }, { "type": "trigger", @@ -228,7 +228,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81CE" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger1" } ], "bg_events": [ @@ -238,7 +238,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_1E8151" + "script": "LittlerootTown_EventScript_TownSign" }, { "type": "sign", @@ -246,7 +246,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_1E815A" + "script": "LittlerootTown_EventScript_BirchsLabSign" }, { "type": "sign", @@ -254,7 +254,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_1E8163" + "script": "LittlerootTown_EventScript_BrendansHouseSign" }, { "type": "sign", @@ -262,7 +262,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_1E818F" + "script": "LittlerootTown_EventScript_MaysHouseSign" } ] } diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 8825d18991..cb2589ed25 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -1,139 +1,169 @@ LittlerootTown_MapScripts:: @ 81E7DCB - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_1E7DDB - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_1E7EC1 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MapScript2_1E7FE2 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_OnWarp .byte 0 -LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB + @ State descriptions for VAR_LITTLEROOT_TOWN_STATE + @ 1: Met Rival + @ 2: Saving Birch + @ 3: Received Pokedex + @ 4: Received Running Shoes + + @ State descriptions for VAR_LITTLEROOT_INTRO_STATE + @ 1: In truck male + @ 2: In truck female + @ 3: Entered house + @ 4: Told to go set clock + @ 5: Entered 2F to set clock + @ 6: Set clock + @ 7: Told to go meet rival + + @ State descriptions for VAR_LITTLEROOT_HOUSES_STATE_MAY + @ and VAR_LITTLEROOT_HOUSES_STATE_BRENDAN + @ 1: On Truck (and is corresponding gender) + @ 2: Met Rival's Mom (and is corresponding gender) + @ 3: Entered Hall of Fame + @ 4: Completed Lati TV / SS Ticket event + @ 5: Exited house after above event + + @ State descriptions for VAR_LITTLEROOT_RIVAL_STATE + @ 1: Never occurs + @ 2: Entered Rival's bedroom + @ 3: Met Rival + @ 4: Received Pokedex + + +LittlerootTown_OnTransition: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN call Common_EventScript_SetupRivalGfxId compare VAR_LITTLEROOT_INTRO_STATE, 2 - call_if_eq LittlerootTown_EventScript_1E7E67 - call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F + call_if_eq LittlerootTown_EventScript_MoveMomToMaysDoor + call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_SetTwinPos compare VAR_LITTLEROOT_TOWN_STATE, 3 - call_if_eq LittlerootTown_EventScript_1E7E92 - compare VAR_LITTLEROOT_HOUSES_STATE, 4 - call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 - call_if_eq LittlerootTown_EventScript_1E7E5C + call_if_eq LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos + compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 + call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent + compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 + call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent compare VAR_OLDALE_RIVAL_STATE, 1 - call_if_eq LittlerootTown_EventScript_1E7E53 + call_if_eq LittlerootTown_EventScript_MoveRivalFromOldale compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if_eq LittlerootTown_EventScript_1E7E4F + call_if_eq LittlerootTown_EventScript_SetRivalLeftForRoute103 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 - call_if_eq LittlerootTown_EventScript_1E7E4B + call_if_eq LittlerootTown_EventScript_HideMapNamePopup compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - call_if_eq LittlerootTown_EventScript_1E7E45 + call_if_eq LittlerootTown_EventScript_LeftLabAfterDexUpgrade end -LittlerootTown_EventScript_1E7E45:: @ 81E7E45 +LittlerootTown_EventScript_LeftLabAfterDexUpgrade:: @ 81E7E45 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3 return -LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B +LittlerootTown_EventScript_HideMapNamePopup:: @ 81E7E4B setflag FLAG_HIDE_MAP_NAME_POPUP return -LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F +LittlerootTown_EventScript_SetRivalLeftForRoute103:: @ 81E7E4F setflag FLAG_RIVAL_LEFT_FOR_ROUTE103 return -LittlerootTown_EventScript_1E7E53:: @ 81E7E53 +LittlerootTown_EventScript_MoveRivalFromOldale:: @ 81E7E53 setvar VAR_OLDALE_RIVAL_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL return -LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C - setvar VAR_LITTLEROOT_HOUSES_STATE, 5 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 +LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent:: @ 81E7E5C + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 5 return -LittlerootTown_EventScript_1E7E67:: @ 81E7E67 +LittlerootTown_EventScript_MoveMomToMaysDoor:: @ 81E7E67 setobjectxyperm 4, 14, 8 return -LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F +LittlerootTown_EventScript_SetTwinPos:: @ 81E7E6F compare VAR_LITTLEROOT_TOWN_STATE, 0 - goto_if_eq LittlerootTown_EventScript_1E7E86 + goto_if_eq LittlerootTown_EventScript_SetTwinGuardingRoutePos setobjectxyperm 1, 10, 1 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_EventScript_1E7E86:: @ 81E7E86 +LittlerootTown_EventScript_SetTwinGuardingRoutePos:: @ 81E7E86 setobjectxyperm 1, 7, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return -LittlerootTown_EventScript_1E7E92:: @ 81E7E92 +LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos:: @ 81E7E92 clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E7EB1 + call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E7EB9 + call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorFemale return -LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1 +LittlerootTown_EventScript_SetMomInFrontOfDoorMale:: @ 81E7EB1 setobjectxyperm 4, 5, 9 return -LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9 +LittlerootTown_EventScript_SetMomInFrontOfDoorFemale:: @ 81E7EB9 setobjectxyperm 4, 14, 9 return -LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_1E7FB1 +LittlerootTown_OnFrame: @ 81E7EC1 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_StepOffTruckMale + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_StepOffTruckFemale + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_BeginDexUpgradeScene .2byte 0 -LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB +LittlerootTown_EventScript_StepOffTruckMale:: @ 81E7EDB lockall setvar VAR_0x8004, 5 setvar VAR_0x8005, 8 - call LittlerootTown_EventScript_1E7F17 + call LittlerootTown_EventScript_GoInsideWithMom setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end -LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 +LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9 lockall setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 - call LittlerootTown_EventScript_1E7F17 + call LittlerootTown_EventScript_GoInsideWithMom setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end -LittlerootTown_EventScript_1E7F17:: @ 81E7F17 +LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17 delay 15 playse SE_DANSA - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FAC + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim addobject 4 - applymovement 4, LittlerootTown_Movement_1E7F98 + applymovement 4, LittlerootTown_Movement_MomExitHouse waitmovement 0 closedoor VAR_0x8004, VAR_0x8005 waitdooranim delay 10 - applymovement 4, LittlerootTown_Movement_1E7F9A + applymovement 4, LittlerootTown_Movement_MomApproachPlayerAtTruck waitmovement 0 - msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_OurNewHomeLetsGoInside, MSGBOX_DEFAULT closemessage - applymovement 4, LittlerootTown_Movement_1E7F9D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA4 + applymovement 4, LittlerootTown_Movement_MomApproachDoor + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerApproachDoor waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim - applymovement 4, LittlerootTown_Movement_1E7FA1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9 + applymovement 4, LittlerootTown_Movement_MomEnterHouse + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerEnterHouse waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_LITTLEROOT_INTRO_STATE, 3 @@ -144,52 +174,52 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 clearflag FLAG_HIDE_MAP_NAME_POPUP return -LittlerootTown_Movement_1E7F98: @ 81E7F98 +LittlerootTown_Movement_MomExitHouse: @ 81E7F98 walk_down step_end -LittlerootTown_Movement_1E7F9A: @ 81E7F9A +LittlerootTown_Movement_MomApproachPlayerAtTruck: @ 81E7F9A walk_down walk_in_place_fastest_left step_end -LittlerootTown_Movement_1E7F9D: @ 81E7F9D +LittlerootTown_Movement_MomApproachDoor: @ 81E7F9D delay_16 delay_8 walk_up step_end -LittlerootTown_Movement_1E7FA1: @ 81E7FA1 +LittlerootTown_Movement_MomEnterHouse: @ 81E7FA1 walk_up set_invisible step_end -LittlerootTown_Movement_1E7FA4: @ 81E7FA4 +LittlerootTown_Movement_PlayerApproachDoor: @ 81E7FA4 delay_16 delay_8 walk_right walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E7FA9: @ 81E7FA9 +LittlerootTown_Movement_PlayerEnterHouse: @ 81E7FA9 walk_up walk_up step_end -LittlerootTown_Movement_1E7FAC: @ 81E7FAC +LittlerootTown_Movement_PlayerStepOffTruck: @ 81E7FAC jump_right delay_16 delay_16 delay_16 step_end -LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 +LittlerootTown_EventScript_BeginDexUpgradeScene:: @ 81E7FB1 lockall playse SE_PIN applymovement 8, Common_Movement_ExclamationMark waitmovement 0 delay 80 - msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_BirchSomethingToShowYouAtLab, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH @@ -200,51 +230,51 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 releaseall end -LittlerootTown_MapScript2_1E7FE2: @ 81E7FE2 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_1E7FEC +LittlerootTown_OnWarp: @ 81E7FE2 + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade .2byte 0 -LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC +LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade:: @ 81E7FEC addobject 8 addobject 7 checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_EventScript_1E8004 - goto LittlerootTown_EventScript_1E8013 + goto_if_eq LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale + goto LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale end -LittlerootTown_EventScript_1E8004:: @ 81E8004 +LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale:: @ 81E8004 setobjectxy 7, 6, 10 setobjectxy 8, 5, 10 end -LittlerootTown_EventScript_1E8013:: @ 81E8013 +LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale:: @ 81E8013 setobjectxy 7, 13, 10 setobjectxy 8, 14, 10 end -LittlerootTown_EventScript_1E8022:: @ 81E8022 - msgbox LittlerootTown_Text_1E8ACF, MSGBOX_NPC +LittlerootTown_EventScript_FatMan:: @ 81E8022 + msgbox LittlerootTown_Text_CanUsePCToStoreItems, MSGBOX_NPC end -LittlerootTown_EventScript_1E802B:: @ 81E802B - msgbox LittlerootTown_Text_1E8B25, MSGBOX_NPC +LittlerootTown_EventScript_Boy:: @ 81E802B + msgbox LittlerootTown_Text_BirchSpendsDaysInLab, MSGBOX_NPC end -LittlerootTown_EventScript_1E8034:: @ 81E8034 +LittlerootTown_EventScript_Twin:: @ 81E8034 lock faceplayer - goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_1E8087 - goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E807A + goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_YouSavedBirch compare VAR_LITTLEROOT_TOWN_STATE, 0 - goto_if_ne LittlerootTown_EventScript_1E805D - msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT + goto_if_ne LittlerootTown_EventScript_GoSaveBirch + msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT release end -LittlerootTown_EventScript_1E805D:: @ 81E805D +LittlerootTown_EventScript_GoSaveBirch:: @ 81E805D special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -252,38 +282,38 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D release end -LittlerootTown_EventScript_1E807A:: @ 81E807A +LittlerootTown_EventScript_YouSavedBirch:: @ 81E807A special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8CE3, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_YouSavedBirch, MSGBOX_DEFAULT release end -LittlerootTown_EventScript_1E8087:: @ 81E8087 - msgbox LittlerootTown_Text_1E8D07, MSGBOX_DEFAULT +LittlerootTown_EventScript_GoodLuck:: @ 81E8087 + msgbox LittlerootTown_Text_GoodLuckCatchingPokemon, MSGBOX_DEFAULT release end -LittlerootTown_EventScript_1E8091:: @ 81E8091 +LittlerootTown_EventScript_NeedPokemonTriggerLeft:: @ 81E8091 lockall - applymovement 1, LittlerootTown_Movement_1E80D1 + applymovement 1, LittlerootTown_Movement_TwinApproachPlayerLeft waitmovement 0 - call LittlerootTown_EventScript_1E80AD - applymovement 1, LittlerootTown_Movement_1E80E1 + call LittlerootTown_EventScript_DangerousWithoutPokemon + applymovement 1, LittlerootTown_Movement_TwinReturnLeft waitmovement 0 releaseall end -LittlerootTown_EventScript_1E80AD:: @ 81E80AD - msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT +LittlerootTown_EventScript_DangerousWithoutPokemon:: @ 81E80AD + msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_1E80DF - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E80EB + applymovement 1, LittlerootTown_Movement_TwinPushPlayerFromRoute + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PushPlayerBackFromRoute waitmovement 0 - msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_DangerousIfYouDontHavePokemon, MSGBOX_DEFAULT closemessage return -LittlerootTown_Movement_1E80D1: @ 81E80D1 +LittlerootTown_Movement_TwinApproachPlayerLeft: @ 81E80D1 face_right delay_8 disable_jump_landing_ground_effect @@ -299,11 +329,11 @@ LittlerootTown_Movement_1E80D1: @ 81E80D1 face_down step_end -LittlerootTown_Movement_1E80DF: @ 81E80DF +LittlerootTown_Movement_TwinPushPlayerFromRoute: @ 81E80DF walk_down step_end -LittlerootTown_Movement_1E80E1: @ 81E80E1 +LittlerootTown_Movement_TwinReturnLeft: @ 81E80E1 walk_right walk_down walk_down @@ -315,23 +345,23 @@ LittlerootTown_Movement_1E80E1: @ 81E80E1 walk_in_place_fastest_down step_end -LittlerootTown_Movement_1E80EB: @ 81E80EB +LittlerootTown_Movement_PushPlayerBackFromRoute: @ 81E80EB lock_facing_direction walk_down unlock_facing_direction step_end -LittlerootTown_EventScript_1E80EF:: @ 81E80EF +LittlerootTown_EventScript_NeedPokemonTriggerRight:: @ 81E80EF lockall - applymovement 1, LittlerootTown_Movement_1E810B + applymovement 1, LittlerootTown_Movement_TwinApproachPlayerRight waitmovement 0 - call LittlerootTown_EventScript_1E80AD - applymovement 1, LittlerootTown_Movement_1E8118 + call LittlerootTown_EventScript_DangerousWithoutPokemon + applymovement 1, LittlerootTown_Movement_TwinReturnRight waitmovement 0 releaseall end -LittlerootTown_Movement_1E810B: @ 81E810B +LittlerootTown_Movement_TwinApproachPlayerRight: @ 81E810B face_right delay_8 disable_jump_landing_ground_effect @@ -346,7 +376,7 @@ LittlerootTown_Movement_1E810B: @ 81E810B face_down step_end -LittlerootTown_Movement_1E8118: @ 81E8118 +LittlerootTown_Movement_TwinReturnRight: @ 81E8118 walk_left walk_down walk_left @@ -355,14 +385,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118 walk_in_place_fastest_down step_end -LittlerootTown_EventScript_1E811F:: @ 81E811F +LittlerootTown_EventScript_GoSaveBirchTrigger:: @ 81E811F lockall applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -370,372 +400,372 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F releaseall end -LittlerootTown_EventScript_1E8151:: @ 81E8151 - msgbox LittlerootTown_Text_1E8D32, MSGBOX_SIGN +LittlerootTown_EventScript_TownSign:: @ 81E8151 + msgbox LittlerootTown_Text_TownSign, MSGBOX_SIGN end -LittlerootTown_EventScript_1E815A:: @ 81E815A - msgbox LittlerootTown_Text_1E8D69, MSGBOX_SIGN +LittlerootTown_EventScript_BirchsLabSign:: @ 81E815A + msgbox LittlerootTown_Text_ProfBirchsLab, MSGBOX_SIGN end -LittlerootTown_EventScript_1E8163:: @ 81E8163 +LittlerootTown_EventScript_BrendansHouseSign:: @ 81E8163 lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E817D + call_if_eq LittlerootTown_EventScript_PlayersHouseSignMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E8186 + call_if_eq LittlerootTown_EventScript_BirchsHouseSignFemale releaseall end -LittlerootTown_EventScript_1E817D:: @ 81E817D - msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT +LittlerootTown_EventScript_PlayersHouseSignMale:: @ 81E817D + msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_1E8186:: @ 81E8186 - msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT +LittlerootTown_EventScript_BirchsHouseSignFemale:: @ 81E8186 + msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_1E818F:: @ 81E818F +LittlerootTown_EventScript_MaysHouseSign:: @ 81E818F lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E81A9 + call_if_eq LittlerootTown_EventScript_BirchsHouseSignMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E81B2 + call_if_eq LittlerootTown_EventScript_PlayersHouseSignFemale releaseall end -LittlerootTown_EventScript_1E81A9:: @ 81E81A9 - msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT +LittlerootTown_EventScript_BirchsHouseSignMale:: @ 81E81A9 + msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_1E81B2:: @ 81E81B2 - msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT +LittlerootTown_EventScript_PlayersHouseSignFemale:: @ 81E81B2 + msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_1E81BB:: @ 81E81BB +LittlerootTown_EventScript_GiveRunningShoesTrigger0:: @ 81E81BB lockall setvar VAR_0x8008, 0 setobjectxy 4, 10, 9 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E81CE:: @ 81E81CE +LittlerootTown_EventScript_GiveRunningShoesTrigger1:: @ 81E81CE lockall setvar VAR_0x8008, 1 setobjectxy 4, 11, 9 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E81E1:: @ 81E81E1 +LittlerootTown_EventScript_GiveRunningShoesTrigger2:: @ 81E81E1 lockall setvar VAR_0x8008, 2 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E81ED:: @ 81E81ED +LittlerootTown_EventScript_GiveRunningShoesTrigger3:: @ 81E81ED lockall setvar VAR_0x8008, 3 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E81F9:: @ 81E81F9 +LittlerootTown_EventScript_GiveRunningShoesTrigger4:: @ 81E81F9 lockall setvar VAR_0x8008, 4 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E8205:: @ 81E8205 +LittlerootTown_EventScript_GiveRunningShoesTrigger5:: @ 81E8205 lockall setvar VAR_0x8008, 5 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E8211:: @ 81E8211 +LittlerootTown_EventScript_GiveRunningShoesTrigger:: @ 81E8211 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E8297 + call_if_eq LittlerootTown_EventScript_MomNoticePlayerMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E82A2 + call_if_eq LittlerootTown_EventScript_MomNoticePlayerFemale checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E828C - msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale + msgbox LittlerootTown_Text_WaitPlayer, MSGBOX_DEFAULT closemessage checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E82AD + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E82F0 - call LittlerootTown_EventScript_1E8693 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale + call LittlerootTown_EventScript_GiveRunningShoes checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E8405 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E8448 - goto LittlerootTown_EventScript_1E8686 + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale + goto LittlerootTown_EventScript_SetReceivedRunningShoes end -LittlerootTown_EventScript_1E8281:: @ 81E8281 +LittlerootTown_EventScript_SetHomeDoorCoordsMale:: @ 81E8281 setvar VAR_0x8009, 5 setvar VAR_0x800A, 8 return -LittlerootTown_EventScript_1E828C:: @ 81E828C +LittlerootTown_EventScript_SetHomeDoorCoordsFemale:: @ 81E828C setvar VAR_0x8009, 14 setvar VAR_0x800A, 8 return -LittlerootTown_EventScript_1E8297:: @ 81E8297 +LittlerootTown_EventScript_MomNoticePlayerMale:: @ 81E8297 applymovement 4, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_EventScript_1E82A2:: @ 81E82A2 +LittlerootTown_EventScript_MomNoticePlayerFemale:: @ 81E82A2 applymovement 4, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_EventScript_1E82AD:: @ 81E82AD +LittlerootTown_EventScript_MomApproachPlayerMale:: @ 81E82AD compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_1E835D + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_1E8372 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_1E8387 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_1E839C + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale5 return -LittlerootTown_EventScript_1E82F0:: @ 81E82F0 +LittlerootTown_EventScript_MomApproachPlayerFemale:: @ 81E82F0 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_1E83B1 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_1E83C6 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_1E83DB + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_1E83F0 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale5 return -LittlerootTown_EventScript_1E8333:: @ 81E8333 +LittlerootTown_EventScript_MomApproachPlayer0:: @ 81E8333 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85D1 + applymovement 4, LittlerootTown_Movement_MomApproachPlayer0 waitmovement 0 return -LittlerootTown_EventScript_1E8348:: @ 81E8348 +LittlerootTown_EventScript_MomApproachPlayer1:: @ 81E8348 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85D8 + applymovement 4, LittlerootTown_Movement_MomApproachPlayer1 waitmovement 0 return -LittlerootTown_EventScript_1E835D:: @ 81E835D +LittlerootTown_EventScript_MomApproachPlayerMale2:: @ 81E835D applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85DF + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale2 waitmovement 0 return -LittlerootTown_EventScript_1E8372:: @ 81E8372 +LittlerootTown_EventScript_MomApproachPlayerMale3:: @ 81E8372 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85E4 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale3 waitmovement 0 return -LittlerootTown_EventScript_1E8387:: @ 81E8387 +LittlerootTown_EventScript_MomApproachPlayerMale4:: @ 81E8387 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85EA + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale4 waitmovement 0 return -LittlerootTown_EventScript_1E839C:: @ 81E839C +LittlerootTown_EventScript_MomApproachPlayerMale5:: @ 81E839C applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85ED + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale5 waitmovement 0 return -LittlerootTown_EventScript_1E83B1:: @ 81E83B1 +LittlerootTown_EventScript_MomApproachPlayerFemale2:: @ 81E83B1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85F1 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale2 waitmovement 0 return -LittlerootTown_EventScript_1E83C6:: @ 81E83C6 +LittlerootTown_EventScript_MomApproachPlayerFemale3:: @ 81E83C6 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85F5 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale3 waitmovement 0 return -LittlerootTown_EventScript_1E83DB:: @ 81E83DB +LittlerootTown_EventScript_MomApproachPlayerFemale4:: @ 81E83DB applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85F8 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale4 waitmovement 0 return -LittlerootTown_EventScript_1E83F0:: @ 81E83F0 +LittlerootTown_EventScript_MomApproachPlayerFemale5:: @ 81E83F0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85FE + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale5 waitmovement 0 return -LittlerootTown_EventScript_1E8405:: @ 81E8405 +LittlerootTown_EventScript_MomReturnHomeMale:: @ 81E8405 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_MomReturnHome0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_MomReturnHome1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_1E84A1 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_1E84C7 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_1E84ED + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_1E8513 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale5 return -LittlerootTown_EventScript_1E8448:: @ 81E8448 +LittlerootTown_EventScript_MomReturnHomeFemale:: @ 81E8448 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_MomReturnHome0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_MomReturnHome1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_1E8539 + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_1E855F + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_1E8585 + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_1E85AB + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale5 return -LittlerootTown_EventScript_1E848B:: @ 81E848B - applymovement 4, LittlerootTown_Movement_1E8603 +LittlerootTown_EventScript_MomReturnHome0:: @ 81E848B + applymovement 4, LittlerootTown_Movement_MomReturnHome0 waitmovement 0 return -LittlerootTown_EventScript_1E8496:: @ 81E8496 - applymovement 4, LittlerootTown_Movement_1E8609 +LittlerootTown_EventScript_MomReturnHome1:: @ 81E8496 + applymovement 4, LittlerootTown_Movement_MomReturnHome1 waitmovement 0 return -LittlerootTown_EventScript_1E84A1:: @ 81E84A1 - applymovement 4, LittlerootTown_Movement_1E860F +LittlerootTown_EventScript_MomReturnHomeMale2:: @ 81E84A1 + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale2 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E84C7:: @ 81E84C7 - applymovement 4, LittlerootTown_Movement_1E8615 +LittlerootTown_EventScript_MomReturnHomeMale3:: @ 81E84C7 + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale3 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E84ED:: @ 81E84ED - applymovement 4, LittlerootTown_Movement_1E861C +LittlerootTown_EventScript_MomReturnHomeMale4:: @ 81E84ED + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale4 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E8513:: @ 81E8513 - applymovement 4, LittlerootTown_Movement_1E8620 +LittlerootTown_EventScript_MomReturnHomeMale5:: @ 81E8513 + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale5 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E8539:: @ 81E8539 - applymovement 4, LittlerootTown_Movement_1E8625 +LittlerootTown_EventScript_MomReturnHomeFemale2:: @ 81E8539 + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale2 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E855F:: @ 81E855F - applymovement 4, LittlerootTown_Movement_1E862A +LittlerootTown_EventScript_MomReturnHomeFemale3:: @ 81E855F + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale3 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E8585:: @ 81E8585 - applymovement 4, LittlerootTown_Movement_1E862E +LittlerootTown_EventScript_MomReturnHomeFemale4:: @ 81E8585 + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale4 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E85AB:: @ 81E85AB - applymovement 4, LittlerootTown_Movement_1E8635 +LittlerootTown_EventScript_MomReturnHomeFemale5:: @ 81E85AB + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale5 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_Movement_1E85D1: @ 81E85D1 +LittlerootTown_Movement_MomApproachPlayer0: @ 81E85D1 walk_up walk_up walk_up @@ -744,7 +774,7 @@ LittlerootTown_Movement_1E85D1: @ 81E85D1 walk_up step_end -LittlerootTown_Movement_1E85D8: @ 81E85D8 +LittlerootTown_Movement_MomApproachPlayer1: @ 81E85D8 walk_up walk_up walk_up @@ -753,14 +783,14 @@ LittlerootTown_Movement_1E85D8: @ 81E85D8 walk_up step_end -LittlerootTown_Movement_1E85DF: @ 81E85DF +LittlerootTown_Movement_MomApproachPlayerMale2: @ 81E85DF walk_right walk_right walk_right walk_right step_end -LittlerootTown_Movement_1E85E4: @ 81E85E4 +LittlerootTown_Movement_MomApproachPlayerMale3: @ 81E85E4 walk_right walk_right walk_right @@ -768,29 +798,29 @@ LittlerootTown_Movement_1E85E4: @ 81E85E4 walk_right step_end -LittlerootTown_Movement_1E85EA: @ 81E85EA +LittlerootTown_Movement_MomApproachPlayerMale4: @ 81E85EA walk_right walk_right step_end -LittlerootTown_Movement_1E85ED: @ 81E85ED +LittlerootTown_Movement_MomApproachPlayerMale5: @ 81E85ED walk_right walk_right walk_right step_end -LittlerootTown_Movement_1E85F1: @ 81E85F1 +LittlerootTown_Movement_MomApproachPlayerFemale2: @ 81E85F1 walk_left walk_left walk_left step_end -LittlerootTown_Movement_1E85F5: @ 81E85F5 +LittlerootTown_Movement_MomApproachPlayerFemale3: @ 81E85F5 walk_left walk_left step_end -LittlerootTown_Movement_1E85F8: @ 81E85F8 +LittlerootTown_Movement_MomApproachPlayerFemale4: @ 81E85F8 walk_left walk_left walk_left @@ -798,14 +828,14 @@ LittlerootTown_Movement_1E85F8: @ 81E85F8 walk_left step_end -LittlerootTown_Movement_1E85FE: @ 81E85FE +LittlerootTown_Movement_MomApproachPlayerFemale5: @ 81E85FE walk_left walk_left walk_left walk_left step_end -LittlerootTown_Movement_1E8603: @ 81E8603 +LittlerootTown_Movement_MomReturnHome0: @ 81E8603 walk_down walk_down walk_down @@ -813,7 +843,7 @@ LittlerootTown_Movement_1E8603: @ 81E8603 walk_down step_end -LittlerootTown_Movement_1E8609: @ 81E8609 +LittlerootTown_Movement_MomReturnHome1: @ 81E8609 walk_down walk_down walk_down @@ -821,7 +851,7 @@ LittlerootTown_Movement_1E8609: @ 81E8609 walk_down step_end -LittlerootTown_Movement_1E860F: @ 81E860F +LittlerootTown_Movement_MomReturnHomeMale2: @ 81E860F walk_left walk_left walk_left @@ -829,7 +859,7 @@ LittlerootTown_Movement_1E860F: @ 81E860F walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E8615: @ 81E8615 +LittlerootTown_Movement_MomReturnHomeMale3: @ 81E8615 walk_left walk_left walk_left @@ -838,33 +868,33 @@ LittlerootTown_Movement_1E8615: @ 81E8615 walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E861C: @ 81E861C +LittlerootTown_Movement_MomReturnHomeMale4: @ 81E861C walk_left walk_left walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E8620: @ 81E8620 +LittlerootTown_Movement_MomReturnHomeMale5: @ 81E8620 walk_left walk_left walk_left walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E8625: @ 81E8625 +LittlerootTown_Movement_MomReturnHomeFemale2: @ 81E8625 walk_right walk_right walk_right walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E862A: @ 81E862A +LittlerootTown_Movement_MomReturnHomeFemale3: @ 81E862A walk_right walk_right walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E862E: @ 81E862E +LittlerootTown_Movement_MomReturnHomeFemale4: @ 81E862E walk_right walk_right walk_right @@ -873,7 +903,7 @@ LittlerootTown_Movement_1E862E: @ 81E862E walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E8635: @ 81E8635 +LittlerootTown_Movement_MomReturnHomeFemale5: @ 81E8635 walk_right walk_right walk_right @@ -881,51 +911,51 @@ LittlerootTown_Movement_1E8635: @ 81E8635 walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E863B: @ 81E863B +LittlerootTown_Movement_MomExitThroughDoor: @ 81E863B walk_up step_end -LittlerootTown_EventScript_1E863D:: @ 81E863D +LittlerootTown_EventScript_Mom:: @ 81E863D lock faceplayer checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E828C - call LittlerootTown_EventScript_1E8693 + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale + call LittlerootTown_EventScript_GiveRunningShoes applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim - goto LittlerootTown_EventScript_1E8686 + goto LittlerootTown_EventScript_SetReceivedRunningShoes end -LittlerootTown_EventScript_1E8686:: @ 81E8686 +LittlerootTown_EventScript_SetReceivedRunningShoes:: @ 81E8686 removeobject 4 setflag FLAG_SYS_B_DASH setvar VAR_LITTLEROOT_TOWN_STATE, 4 release end -LittlerootTown_EventScript_1E8693:: @ 81E8693 - msgbox LittlerootTown_Text_1E87F0, MSGBOX_DEFAULT +LittlerootTown_EventScript_GiveRunningShoes:: @ 81E8693 + msgbox LittlerootTown_Text_WearTheseRunningShoes, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - message LittlerootTown_Text_1E8925 + message LittlerootTown_Text_SwitchShoesWithRunningShoes waitfanfare setflag FLAG_RECEIVED_RUNNING_SHOES - msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT - msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_ExplainRunningShoes, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_ComeHomeIfAnythingHappens, MSGBOX_DEFAULT closemessage delay 30 return -LittlerootTown_Text_1E86BC: @ 81E86BC +LittlerootTown_Text_OurNewHomeLetsGoInside: @ 81E86BC .string "MOM: {PLAYER}, we're here, honey!\p" .string "It must be tiring riding with our things\n" .string "in the moving truck.\p" @@ -937,10 +967,10 @@ LittlerootTown_Text_1E86BC: @ 81E86BC .string "And, you get your own room, {PLAYER}!\n" .string "Let's go inside.$" -LittlerootTown_Text_1E87E1: @ 81E87E1 +LittlerootTown_Text_WaitPlayer: @ 81E87E1 .string "MOM: Wait, {PLAYER}!$" -LittlerootTown_Text_1E87F0: @ 81E87F0 +LittlerootTown_Text_WearTheseRunningShoes: @ 81E87F0 .string "MOM: {PLAYER}! {PLAYER}! Did you\n" .string "introduce yourself to PROF. BIRCH?\p" .string "Oh! What an adorable POKéMON!\n" @@ -951,11 +981,11 @@ LittlerootTown_Text_1E87F0: @ 81E87F0 .string "adventure, wear these RUNNING SHOES.\p" .string "They'll put a zip in your step!$" -LittlerootTown_Text_1E8925: @ 81E8925 +LittlerootTown_Text_SwitchShoesWithRunningShoes: @ 81E8925 .string "{PLAYER} switched shoes with the\n" .string "RUNNING SHOES.$" -LittlerootTown_Text_1E894F: @ 81E894F +LittlerootTown_Text_ExplainRunningShoes: @ 81E894F .string "MOM: {PLAYER}, those shoes came with\n" .string "instructions.\p" .string "“Press the B Button while wearing these\n" @@ -963,7 +993,7 @@ LittlerootTown_Text_1E894F: @ 81E894F .string "“Slip on these RUNNING SHOES and race\n" .string "in the great outdoors!”$" -LittlerootTown_Text_1E8A03: @ 81E8A03 +LittlerootTown_Text_ComeHomeIfAnythingHappens: @ 81E8A03 .string "… … … … … … … …\n" .string "… … … … … … … …\p" .string "To think that you have your very own\n" @@ -973,28 +1003,28 @@ LittlerootTown_Text_1E8A03: @ 81E8A03 .string "If anything happens, you can come home.\p" .string "Go on, go get them, honey!$" -LittlerootTown_Text_1E8ACF: @ 81E8ACF +LittlerootTown_Text_CanUsePCToStoreItems: @ 81E8ACF .string "If you use a PC, you can store items\n" .string "and POKéMON.\p" .string "The power of science is staggering!$" -LittlerootTown_Text_1E8B25: @ 81E8B25 +LittlerootTown_Text_BirchSpendsDaysInLab: @ 81E8B25 .string "PROF. BIRCH spends days in his LAB\n" .string "studying, then he'll suddenly go out in\l" .string "the wild to do more research…\p" .string "When does PROF. BIRCH spend time\n" .string "at home?$" -LittlerootTown_Text_1E8BB8: @ 81E8BB8 +LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut: @ 81E8BB8 .string "Um, um, um!\p" .string "If you go outside and go in the grass,\n" .string "wild POKéMON will jump out!$" -LittlerootTown_Text_1E8C07: @ 81E8C07 +LittlerootTown_Text_DangerousIfYouDontHavePokemon: @ 81E8C07 .string "It's dangerous if you don't have\n" .string "your own POKéMON.$" -LittlerootTown_Text_1E8C3A: @ 81E8C3A +LittlerootTown_Text_CanYouGoSeeWhatsHappening: @ 81E8C3A .string "Um, hi!\p" .string "There are scary POKéMON outside!\n" .string "I can hear their cries!\p" @@ -1003,28 +1033,28 @@ LittlerootTown_Text_1E8C3A: @ 81E8C3A .string "Can you go see what's happening\n" .string "for me?$" -LittlerootTown_Text_1E8CE3: @ 81E8CE3 +LittlerootTown_Text_YouSavedBirch: @ 81E8CE3 .string "You saved PROF. BIRCH!\n" .string "I'm so glad!$" -LittlerootTown_Text_1E8D07: @ 81E8D07 +LittlerootTown_Text_GoodLuckCatchingPokemon: @ 81E8D07 .string "Are you going to catch POKéMON?\n" .string "Good luck!$" -LittlerootTown_Text_1E8D32: @ 81E8D32 +LittlerootTown_Text_TownSign: @ 81E8D32 .string "LITTLEROOT TOWN\n" .string "“A town that can't be shaded any hue.”$" -LittlerootTown_Text_1E8D69: @ 81E8D69 +LittlerootTown_Text_ProfBirchsLab: @ 81E8D69 .string "PROF. BIRCH'S POKéMON LAB$" -LittlerootTown_Text_1E8D83: @ 81E8D83 +LittlerootTown_Text_PlayersHouse: @ 81E8D83 .string "{PLAYER}'s HOUSE$" -LittlerootTown_Text_1E8D8E: @ 81E8D8E +LittlerootTown_Text_ProfBirchsHouse: @ 81E8D8E .string "PROF. BIRCH'S HOUSE$" -LittlerootTown_Text_1E8DA2: @ 81E8DA2 +LittlerootTown_Text_BirchSomethingToShowYouAtLab: @ 81E8DA2 .string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n" .string "That was good work out there!\p" .string "I knew there was something special\n" diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 59c173cf97..ee8d67cd99 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -50,12 +50,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor:: @ 81F77DE return @ Many of the below scripts have no gender check because they assume youre in the correct house +@ The below SS Ticket script uses Mays house state by accident(?), but theyre both set identically after the intro LittlerootTown_BrendansHouse_1F_OnFrame: @ 81F77EA map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814 @@ -101,7 +102,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E special GetRivalSonDaughterString msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_LITTLEROOT_HOUSES_STATE, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 2 releaseall end diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 55736f652c..f016031df5 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -54,8 +54,8 @@ LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport - map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964 @@ -101,7 +101,7 @@ LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE special GetRivalSonDaughterString msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 2 releaseall end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 25ec2e745d..7aadfe03a8 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Aide", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Birch", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Rival", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Totodile", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA" } ], @@ -117,7 +117,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine" }, { "type": "sign", @@ -125,7 +125,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine" }, { "type": "sign", @@ -133,7 +133,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book" }, { "type": "sign", @@ -141,7 +141,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book" }, { "type": "sign", @@ -149,7 +149,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -157,7 +157,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -165,7 +165,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -173,7 +173,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -181,7 +181,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -189,7 +189,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -197,7 +197,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -205,7 +205,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -213,7 +213,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -221,7 +221,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -229,7 +229,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" } ] } \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index bdf05dd923..ce7ebf3b68 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -1,57 +1,72 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_OnFrame .byte 0 -LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 + @ State descriptions for VAR_DEX_UPGRADE_JOHTO_STARTER_STATE + @ 1: Beat Elite Four, Dex upgrade ready + @ 2: Received National Dex + @ 3: Left lab after receiving National Dex + @ 4: Entered lab after catching all Hoenn mons + @ 5: Birch told player to choose Johto starter + @ 6: Chose Johto starter + + @ State descriptions for VAR_BIRCH_LAB_STATE + @ 1: Never occurs + @ 2: Chose starter + @ 3: Received starter in lab + @ 4: Defeated rival on Route 103 + @ 5: Received pokedex + +LittlerootTown_ProfessorBirchsLab_OnTransition: @ 81F9CA1 call Common_EventScript_SetupRivalGfxId call ProfBirch_EventScript_UpdateLocation compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD +LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter:: @ 81F9CCD specialvar VAR_RESULT, HasAllHoennMons - compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 + compare VAR_RESULT, TRUE + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 +LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter:: @ 81F9CE9 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 + goto LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 +LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout:: @ 81F9CF3 setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 +LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout:: @ 81F9CF7 setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end -LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06 - map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75 +LittlerootTown_ProfessorBirchsLab_OnWarp: @ 81F9D06 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters .2byte 0 -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40 +LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter:: @ 81F9D40 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45 +LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade:: @ 81F9D45 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH addobject 2 addobject 3 @@ -63,11 +78,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45 setobjectxy 1, 10, 10 end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71:: @ 81F9D71 +LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject:: @ 81F9D71 addobject 3 end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75 +LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters:: @ 81F9D75 addobject 4 addobject 5 addobject 6 @@ -84,64 +99,66 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75 setobjectxy 3, 5, 5 end -LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9 - map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB - map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62 +LittlerootTown_ProfessorBirchsLab_OnFrame: @ 81F9DB9 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter .2byte 0 -LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB +@ The starter is technically given prior to this on Route 101 by special ChooseStarter +@ This is just where the game tells you its yours and lets you nickname it +LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent:: @ 81F9DDB lockall bufferleadmonspeciesname 0 - message LittlerootTown_ProfessorBirchsLab_Text_1FA74D + message LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO + msgbox LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 +LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter:: @ 81F9E07 setvar VAR_0x8004, 0 call Common_EventScript_NameReceivedPartyMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 + goto LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO +LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival:: @ 81F9E17 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival:: @ 81F9E36 + msgbox LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou, MSGBOX_DEFAULT clearflag FLAG_HIDE_ROUTE_101_BOY setvar VAR_BIRCH_LAB_STATE, 3 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO +LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: @ 81F9E48 + msgbox LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 +LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent:: @ 81F9E67 lockall - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex waitmovement 0 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8 + goto LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex end -LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 +LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex: @ 81F9E78 walk_up walk_up walk_up @@ -151,12 +168,12 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 walk_up step_end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 +LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 lockall delay 30 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational, MSGBOX_DEFAULT closemessage - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46 + applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes waitmovement 0 delay 20 playse SE_TK_KASYA @@ -172,25 +189,25 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 waitmovement 0 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment playse SE_PC_ON waitse delay 20 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 + applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex waitmovement 0 applymovement 3, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - message LittlerootTown_ProfessorBirchsLab_Text_1FB436 + message LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational waitmessage waitfanfare setflag FLAG_SYS_NATIONAL_DEX special EnableNationalPokedex - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL @@ -200,17 +217,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment:: @ 81F9F32 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayUpgradeSoCool, MSGBOX_DEFAULT closemessage return -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment:: @ 81F9F3C + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanYouCanThankMe, MSGBOX_DEFAULT closemessage return -LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46 +LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes: @ 81F9F46 walk_left walk_in_place_fastest_down delay_16 @@ -230,7 +247,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46 walk_in_place_fastest_up step_end -LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58 +LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: @ 81F9F58 walk_left walk_left walk_left @@ -242,16 +259,16 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58 walk_in_place_fastest_down step_end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 +LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: @ 81F9F62 lockall - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5 releaseall end -LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C +LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter: @ 81F9F7C walk_up walk_up walk_up @@ -261,259 +278,259 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C walk_up step_end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 +LittlerootTown_ProfessorBirchsLab_EventScript_Aide:: @ 81F9F84 lock faceplayer compare VAR_BIRCH_LAB_STATE, 3 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 - goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter + goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork, MSGBOX_DEFAULT setflag FLAG_BIRCH_AIDE_MET release end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet:: @ 81F9FA7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter:: @ 81F9FB1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB +LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil:: @ 81F9FBB release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 showmonpic SPECIES_CYNDAQUIL, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO + msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime + goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF +LittlerootTown_ProfessorBirchsLab_EventScript_Totodile:: @ 81F9FEF release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 showmonpic SPECIES_TOTODILE, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO + msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime + goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 +LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita:: @ 81FA023 release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 showmonpic SPECIES_CHIKORITA, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO + msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime + goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter:: @ 81FA057 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BetterLeaveOthersAlone, MSGBOX_DEFAULT releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 +LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime:: @ 81FA061 hidemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_TakeYourTimeAllInvaluable, MSGBOX_DEFAULT releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C +LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil:: @ 81FA06C bufferspeciesname 0, SPECIES_CYNDAQUIL setvar VAR_TEMP_1, SPECIES_CYNDAQUIL givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC hidemonpic goto Common_EventScript_NoMoreRoomForPokemon end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty:: @ 81FA0A1 + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 4 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC:: @ 81FA0CC + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 4 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC call Common_EventScript_NameReceivedBoxMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 + goto LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 +LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC:: @ 81FA0F2 call Common_EventScript_TransferredToPC - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil:: @ 81FA0FD hidemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D +LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile:: @ 81FA10D bufferspeciesname 0, SPECIES_TOTODILE setvar VAR_TEMP_1, SPECIES_TOTODILE givemon SPECIES_TOTODILE, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC hidemonpic goto Common_EventScript_NoMoreRoomForPokemon end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty:: @ 81FA142 + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 5 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC:: @ 81FA16D + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 5 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC call Common_EventScript_NameReceivedBoxMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 + goto LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 +LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC:: @ 81FA193 call Common_EventScript_TransferredToPC - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile:: @ 81FA19E hidemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE +LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita:: @ 81FA1AE bufferspeciesname 0, SPECIES_CHIKORITA setvar VAR_TEMP_1, SPECIES_CHIKORITA givemon SPECIES_CHIKORITA, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC hidemonpic goto Common_EventScript_NoMoreRoomForPokemon end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty:: @ 81FA1E3 + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 6 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC:: @ 81FA20E + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 6 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC call Common_EventScript_NameReceivedBoxMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 + goto LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 +LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC:: @ 81FA234 call Common_EventScript_TransferredToPC - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita:: @ 81FA23F hidemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter:: @ 81FA24F playfanfare MUS_FANFA4 - message LittlerootTown_ProfessorBirchsLab_Text_1FB9D7 + message LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter waitmessage waitfanfare return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A +LittlerootTown_ProfessorBirchsLab_EventScript_Birch:: @ 81FA25A lock faceplayer compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 - goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting + goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E + goto LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon:: @ 81FA28A + msgbox LittlerootTown_ProfessorBirchsLab_Text_CanHaveAnyOneOfRarePokemon, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting:: @ 81FA294 + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E +LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister:: @ 81FA29E goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3 goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister compare VAR_BIRCH_LAB_STATE, 5 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome, MSGBOX_DEFAULT release end EventScript_RegisterProfBirch:: @ 81FA2D2 - msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT + msgbox MatchCall_Text_BirchRegisterCall, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route101_Text_2B603A, MSGBOX_DEFAULT + msgbox MatchCall_Text_RegisteredBirch, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -522,20 +539,20 @@ EventScript_RegisterProfBirch:: @ 81FA2D2 release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, MSGBOX_DEFAULT - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8 + msgbox LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex, MSGBOX_DEFAULT + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex + msgbox LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex, MSGBOX_DEFAULT closemessage - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 + applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED setvar VAR_OLDALE_TOWN_STATE, 1 @@ -544,153 +561,153 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 81FA352 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 - compare VAR_RESULT, 0 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls + msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 - compare VAR_RESULT, 0 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls + msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC playfanfare MUS_FANFA4 - message LittlerootTown_ProfessorBirchsLab_Text_1FAC32 + message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex waitfanfare setflag FLAG_SYS_POKEDEX_GET - special sub_81AFDA0 + special sub_81AFDA0 @ sets flags that are never read setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1 return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait:: @ 81FA3C4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls:: @ 81FA3CE + msgbox LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls:: @ 81FA3D7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 +LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer: @ 81FA3E0 walk_down walk_in_place_fastest_left step_end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_Machine:: @ 81FA3E3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC +LittlerootTown_ProfessorBirchsLab_EventScript_Rival:: @ 81FA3EC lock faceplayer compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext:: @ 81FA428 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext:: @ 81FA431 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A +LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans:: @ 81FA43A checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere:: @ 81FA453 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly: @ 81FA45C + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanPreferCollectingSlowly, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 +LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier:: @ 81FA465 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier:: @ 81FA47E + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayHaveYouGoneToBattleFrontier, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier:: @ 81FA487 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanHaveYouGoneToBattleFrontier, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 +LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork:: @ 81FA490 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork:: @ 81FA4A9 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayTakeBreakFromFieldwork, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork:: @ 81FA4B2 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanTakeBreakFromFieldwork, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_PC:: @ 81FA4BB + msgbox LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf:: @ 81FA4C4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_Book:: @ 81FA4CD + msgbox LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 +LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall:: @ 81FA4D6 lockall - pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A + pokenavcall LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall waitmessage clearflag FLAG_SCOTT_CALL_NATIONAL_DEX releaseall end -LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2 +LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork: @ 81FA4E2 .string "Hunh? PROF. BIRCH?\p" .string "The PROF's away on fieldwork.\n" .string "Ergo, he isn't here.\p" @@ -703,19 +720,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2 .string "rather go outside and experience\l" .string "things than read about them here.$" -LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641 +LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork: @ 81FA641 .string "The PROF isn't one for doing desk work.\n" .string "He's the type of person who would\l" .string "rather go outside and experience\l" .string "things than read about them here.$" -LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE +LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo: @ 81FA6CE .string "PROF. BIRCH is studying the habitats\n" .string "and distribution of POKéMON.\p" .string "The PROF enjoys {RIVAL}'s help, too.\n" .string "There's a lot of love there.$" -LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D +LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon: @ 81FA74D .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" .string "I've heard so much about you from\n" .string "your father.\p" @@ -730,11 +747,11 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D .string "used earlier.\p" .string "{PLAYER} received the {STR_VAR_1}!$" -LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1 +LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon: @ 81FA8B1 .string "PROF. BIRCH: While you're at it, why not\n" .string "give a nickname to that {STR_VAR_1}?$" -LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6 +LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival: @ 81FA8F6 .string "PROF. BIRCH: If you work at POKéMON\n" .string "and gain experience, I think you'll make\l" .string "an extremely good TRAINER.\p" @@ -743,17 +760,17 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6 .string "{PLAYER}{KUN}, don't you think it might be\n" .string "a good idea to go see {RIVAL}?$" -LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5 +LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou: @ 81FA9D5 .string "PROF. BIRCH: Great!\n" .string "{RIVAL} should be happy, too.\p" .string "Get {RIVAL} to teach you what it\n" .string "means to be a TRAINER.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35 +LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay: @ 81FAA35 .string "PROF. BIRCH: Oh, don't be that way.\n" .string "You should go meet my kid.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 +LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome: @ 81FAA74 .string "PROF. BIRCH: {RIVAL}?\n" .string "Gone home, I think.\p" .string "Or maybe that kid's scrabbling around\n" @@ -761,7 +778,7 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 .string "If you or your POKéMON get tired,\n" .string "you should get some rest at home.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22 +LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex: @ 81FAB22 .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" .string "I heard you beat {RIVAL} on\n" .string "your first try. That's excellent!\p" @@ -773,10 +790,10 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22 .string "research, but I think you should have\l" .string "this POKéDEX.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAC32: @ 81FAC32 +LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex: @ 81FAC32 .string "{PLAYER} received the POKéDEX!$" -LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B +LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex: @ 81FAC4B .string "PROF. BIRCH: The POKéDEX is a high-tech\n" .string "tool that automatically makes a record\l" .string "of any POKéMON you meet or catch.\p" @@ -787,19 +804,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B .string "why, {RIVAL} looks for me while I'm out\l" .string "doing fieldwork, and shows me.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F +LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait: @ 81FAD6F .string "PROF. BIRCH: Countless POKéMON\n" .string "await you!\p" .string "Argh, I'm getting the itch to get out\n" .string "and do fieldwork again!$" -LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7 +LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese: @ 81FADD7 .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" .string "You got a POKéDEX, too!\p" .string "That's great! Just like me!\n" .string "I've got something for you, too!$" -LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40 +LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls: @ 81FAE40 .string "MAY: It's fun if you can get a lot of\n" .string "POKéMON!\p" .string "I'm going to look all over the place\n" @@ -807,20 +824,20 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40 .string "If I find any cute POKéMON, I'll catch\n" .string "them with POKé BALLS!$" -LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3 +LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull: @ 81FAEF3 .string "Oh? Your BAG's full.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08 +LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext: @ 81FAF08 .string "MAY: I wonder where I should go look\n" .string "for POKéMON next?$" -LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F +LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese: @ 81FAF3F .string "BRENDAN: Huh…\n" .string "So you got a POKéDEX, too.\p" .string "Well then, here.\n" .string "I'll give you these.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E +LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls: @ 81FAF8E .string "BRENDAN: You know it's more fun to\n" .string "have a whole bunch of POKéMON.\p" .string "I'm going to explore all over the place\n" @@ -828,28 +845,28 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E .string "If I find any cool POKéMON, you bet\n" .string "I'll try to get them with POKé BALLS.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D +LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull: @ 81FB05D .string "Hey, your BAG's full.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073 +LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext: @ 81FB073 .string "BRENDAN: Where should I look for\n" .string "POKéMON next…$" -LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2 +LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine: @ 81FB0A2 .string "It's a serious-looking machine.\n" .string "The PROF must use this for research.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7 +LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch: @ 81FB0E7 .string "It's a PC used for research.\n" .string "Better not mess around with it.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124 +LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon: @ 81FB124 .string "It's crammed with books on POKéMON.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148 +LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead: @ 81FB148 .string "It's a book that's too hard to read.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D +LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational: @ 81FB16D .string "PROF. BIRCH: Now…\p" .string "{PLAYER}{KUN} and {RIVAL}, I've had the two\n" .string "of you help me study POKéMON.\p" @@ -866,28 +883,28 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D .string "the NATIONAL Mode.\p" .string "Here, let me see your POKéDEX units.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F +LittlerootTown_ProfessorBirchsLab_Text_MayUpgradeSoCool: @ 81FB30F .string "MAY: Eheheh!\p" .string "It's so cool that even my POKéDEX\n" .string "is getting updated!\p" .string "It's because you went out and caught\n" .string "so many POKéMON, {PLAYER}{KUN}!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E +LittlerootTown_ProfessorBirchsLab_Text_BrendanYouCanThankMe: @ 81FB38E .string "BRENDAN: I went out all over HOENN\n" .string "and checked out POKéMON.\p" .string "You can thank me for getting\n" .string "the NATIONAL Mode POKéDEX.\p" .string "Yep, you're lucky, {PLAYER}!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419 +LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone: @ 81FB419 .string "PROF. BIRCH: Okay, all done!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436 +LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational: @ 81FB436 .string "{PLAYER}'s POKéDEX was upgraded\n" .string "to the NATIONAL Mode!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466 +LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2: @ 81FB466 .string "PROF. BIRCH: But listen.\n" .string "You've become the CHAMPION,\l" .string "but your POKéMON journey isn't over.\p" @@ -896,19 +913,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466 .string "Somewhere, there is a grassy patch\n" .string "that's waiting for you!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528 +LittlerootTown_ProfessorBirchsLab_Text_MayTakeBreakFromFieldwork: @ 81FB528 .string "MAY: I think I'll take a short break\n" .string "from fieldwork.\p" .string "I think I'll help the PROF here for\n" .string "a while.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A +LittlerootTown_ProfessorBirchsLab_Text_BrendanTakeBreakFromFieldwork: @ 81FB58A .string "BRENDAN: For the time being,\n" .string "I'm taking a break from fieldwork.\p" .string "I'll be helping out the PROF here\n" .string "for a while.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9 +LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon: @ 81FB5F9 .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" .string "Let's have a look at your POKéDEX.\p" .string "… … … … … …\n" @@ -925,48 +942,50 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9 .string "You can have any one of these\n" .string "three POKéMON!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787 +LittlerootTown_ProfessorBirchsLab_Text_CanHaveAnyOneOfRarePokemon: @ 81FB787 .string "PROF. BIRCH: These are rare POKéMON\n" .string "only found in another region!\p" .string "You can have any one of these\n" .string "three POKéMON!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6 +LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil: @ 81FB7F6 .string "PROF. BIRCH: The FIRE POKéMON\n" .string "CYNDAQUIL caught your eye!\p" .string "You're as sharp as ever!\p" .string "So the CYNDAQUIL is your choice?$" -LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869 +LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile: @ 81FB869 .string "PROF. BIRCH: The WATER POKéMON\n" .string "TOTODILE is your choice!\p" .string "You know how to pick a good one.\p" .string "So, you'll take the TOTODILE?$" -LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0 +LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita: @ 81FB8E0 .string "PROF. BIRCH: The GRASS POKéMON\n" .string "CHIKORITA is your choice!\p" .string "You sure know what you're doing.\p" .string "So, you'll take the CHIKORITA?$" -LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959 +LittlerootTown_ProfessorBirchsLab_Text_TakeYourTimeAllInvaluable: @ 81FB959 .string "PROF. BIRCH: Take your time before\n" .string "you decide.\p" .string "They're all invaluable POKéMON.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8 +@ Unused +LittlerootTown_ProfessorBirchsLab_Text_PickedFinePokemon: @ 81FB9A8 .string "PROF. BIRCH: I see!\n" .string "You picked a fine POKéMON!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB9D7: @ 81FB9D7 +LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter: @ 81FB9D7 .string "{PLAYER} received the {STR_VAR_1}\n" .string "from PROF. BIRCH!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC +@ Unused +LittlerootTown_ProfessorBirchsLab_Text_NicknameJohtoStarter: @ 81FB9FC .string "Want to give a nickname to\n" .string "the {STR_VAR_1} you received?$" -LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C +LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting: @ 81FBA2C .string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n" .string "You've completed the HOENN POKéDEX,\l" .string "but your POKéMON journey isn't over.\p" @@ -975,15 +994,16 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C .string "Somewhere, there is a grassy patch\n" .string "that's waiting for you!$" -LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8 +LittlerootTown_ProfessorBirchsLab_Text_BetterLeaveOthersAlone: @ 81FBAF8 .string "You received the promised POKéMON.\n" .string "Better leave the others alone.$" -LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A +@ Unused +LittlerootTown_ProfessorBirchsLab_Text_DontHaveAnyRoomForPokemon: @ 81FBB3A .string "Oh, you don't have any room for\n" .string "this POKéMON.$" -LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 +LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere: @ 81FBB68 .string "MAY: {PLAYER}{KUN}, after this…\n" .string "What are you going to do?\p" .string "Are you going to keep battling\n" @@ -992,22 +1012,22 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 .string "the NATIONAL POKéDEX?\p" .string "I'm staying here to help the PROF.$" -LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D +LittlerootTown_ProfessorBirchsLab_Text_BrendanPreferCollectingSlowly: @ 81FBC2D .string "BRENDAN: Rather than collecting\n" .string "POKéMON, I prefer slowly and \l" .string "steadily raising the one I chose.$" -LittlerootTown_ProfessorBirchsLab_Text_1FBC8D: @ 81FBC8D +LittlerootTown_ProfessorBirchsLab_Text_MayHaveYouGoneToBattleFrontier: @ 81FBC8D .string "MAY: Oh, hi, {PLAYER}{KUN}!\n" .string "Have you gone to that place,\l" .string "the BATTLE FRONTIER?$" -LittlerootTown_ProfessorBirchsLab_Text_1FBCD2: @ 81FBCD2 +LittlerootTown_ProfessorBirchsLab_Text_BrendanHaveYouGoneToBattleFrontier: @ 81FBCD2 .string "BRENDAN: Hey, {PLAYER}!\n" .string "Have you gone out to that place,\l" .string "the BATTLE FRONTIER?$" -LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A +LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall: @ 81FBD1A .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "SCOTT: Hi, hi, {PLAYER}!\n" diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index acb1536e8a..3a0675e5e7 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -305,9 +305,9 @@ PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1 PlayersHouse_1F_EventScript_Mom:: @ 82929C5 lock faceplayer - compare VAR_LITTLEROOT_HOUSES_STATE, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard - compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty @@ -502,8 +502,8 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 copyvar VAR_ROAMER_POKEMON, VAR_RESULT msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT closemessage - setvar VAR_LITTLEROOT_HOUSES_STATE, 4 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 releaseall end diff --git a/data/text/match_call.inc b/data/text/match_call.inc index a695b1b80d..9ecdd03c7e 100644 --- a/data/text/match_call.inc +++ b/data/text/match_call.inc @@ -2831,7 +2831,7 @@ gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9 .string "I hope we can meet again\n" .string "somewhere!$" -Route101_Text_2B5F52: @ 82B5F52 +MatchCall_Text_BirchRegisterCall: @ 82B5F52 .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" .string "I've already heard about you!\p" .string "It seems your POKéNAV's been\n" @@ -2842,10 +2842,11 @@ Route101_Text_2B5F52: @ 82B5F52 .string "out in the field.\p" .string "… … … … … …$" -Route101_Text_2B603A: @ 82B603A +MatchCall_Text_RegisteredBirch: @ 82B603A .string "Registered PROF. BIRCH\n" .string "in the POKéNAV.$" +MatchCall_Text_UnusedProfBirch: .string "PROF. BIRCH: When one has both\n" .string "the POKéDEX and POKéNAV, studying\l" .string "POKéMON becomes more fun, eh?$" diff --git a/include/constants/vars.h b/include/constants/vars.h index 64ff6622b3..2e3ec758e6 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -144,7 +144,7 @@ #define VAR_ROUTE132_STATE 0x407F // Unused Var #define VAR_ROUTE133_STATE 0x4080 // Unused Var #define VAR_ROUTE134_STATE 0x4081 // Unused Var -#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 +#define VAR_LITTLEROOT_HOUSES_STATE_MAY 0x4082 #define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_BIRCH_LAB_STATE 0x4084 #define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman @@ -154,7 +154,7 @@ #define VAR_SECRET_BASE_INITIALIZED 0x4089 #define VAR_CONTEST_PRIZE_PICKUP 0x408A #define VAR_UNUSED_0x408B 0x408B // Unused Var -#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C +#define VAR_LITTLEROOT_HOUSES_STATE_BRENDAN 0x408C #define VAR_LITTLEROOT_RIVAL_STATE 0x408D #define VAR_BOARD_BRINEY_BOAT_STATE 0x408E #define VAR_DEVON_CORP_3F_STATE 0x408F diff --git a/include/event_scripts.h b/include/event_scripts.h index b86c46df06..1a3230b316 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -554,7 +554,7 @@ extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 IslandCave_EventScript_OpenRegiEntrance[]; extern const u8 MauvilleCity_EventScript_1DF7BA[]; extern const u8 Route119_EventScript_1F49EC[]; -extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[]; +extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[]; extern const u8 SSTidalCorridor_EventScript_23C050[]; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index bbd2ebda9e..64410ff7f7 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -578,7 +578,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) } if (ShouldDoScottCall() == TRUE) { - ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6); + ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall); return TRUE; } if (ShouldDoRoxanneCall() == TRUE) diff --git a/src/save_location.c b/src/save_location.c index 2443b3161b..7a9b08a09a 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -118,6 +118,8 @@ void TrySetMapSaveWarpStatus(void) sub_81AFD5C(); } +// Called when receiving the Pokedex +// Only place field_A8 is written (aside from clearing on new game), never read void sub_81AFDA0(void) { gSaveBlock2Ptr->field_A8 |= 0x8000;