diff options
31 files changed, 665 insertions, 649 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 6ca921af9..51528b6ef 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -48,7 +48,7 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E Route104_EventScript_1ECCB3:: @ 81ECCB3 lockall - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp @@ -62,7 +62,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 waitmovement 0 delay 20 setvar VAR_0x8008, 0 - call Route104_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic playse SE_PIN applymovement 34, Common_Movement_ExclamationMark waitmovement 0 diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 1c61d3be3..10fdddee3 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -10,7 +10,7 @@ Route104_MrBrineysHouse_OnTransition: @ 8229D34 end Route104_MrBrineysHouse_EventScript_HideRustboroRival:: @ 8229D4C - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL return Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos:: @ 8229D50 @@ -81,7 +81,7 @@ Route104_MrBrineysHouse_EventScript_SailToDewford:: @ 8229E27 setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setflag FLAG_HIDE_ROUTE_104_RIVAL warp MAP_ROUTE104, 255, 13, 51 waitstate diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index d9fd0d8cc..9c0d41709 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E088A", + "script": "RustboroCity_EventScript_Woman", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E085F", + "script": "RustboroCity_EventScript_FatMan", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E08DA", + "script": "RustboroCity_EventScript_NinjaBoy", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E08D1", + "script": "RustboroCity_EventScript_Twin", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E08B2", + "script": "RustboroCity_EventScript_Boy2", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0893", + "script": "RustboroCity_EventScript_Man1", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0922", + "script": "RustboroCity_EventScript_LittleBoy", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0938", + "script": "RustboroCity_EventScript_LittleGirl", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0ADD", + "script": "RustboroCity_EventScript_DevonEmployee1", "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" }, { @@ -170,7 +170,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E087E", + "script": "RustboroCity_EventScript_DevonEmployee2", "flag": "0" }, { @@ -196,7 +196,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E094E", + "script": "RustboroCity_EventScript_Man2", "flag": "0" }, { @@ -209,8 +209,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0DB8", - "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL" + "script": "RustboroCity_EventScript_Rival", + "flag": "FLAG_HIDE_RUSTBORO_CITY_RIVAL" }, { "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", @@ -235,7 +235,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E1236", + "script": "RustboroCity_EventScript_Boy1", "flag": "0" } ], @@ -333,7 +333,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E095A" + "script": "RustboroCity_EventScript_StolenGoodsTrigger0" }, { "type": "trigger", @@ -342,7 +342,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E0971" + "script": "RustboroCity_EventScript_StolenGoodsTrigger1" }, { "type": "trigger", @@ -351,7 +351,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E0988" + "script": "RustboroCity_EventScript_StolenGoodsTrigger2" }, { "type": "trigger", @@ -360,7 +360,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E099F" + "script": "RustboroCity_EventScript_StolenGoodsTrigger3" }, { "type": "trigger", @@ -369,7 +369,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E09B6" + "script": "RustboroCity_EventScript_StolenGoodsTrigger4" }, { "type": "trigger", @@ -378,7 +378,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_1E0AFE" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger0" }, { "type": "trigger", @@ -387,7 +387,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_1E0B0A" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger1" }, { "type": "trigger", @@ -396,7 +396,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_1E0B16" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger2" }, { "type": "trigger", @@ -405,7 +405,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_1E0B22" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger3" }, { "type": "trigger", @@ -414,7 +414,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_1E0C2B" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger0" }, { "type": "trigger", @@ -423,7 +423,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_1E0C37" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger1" }, { "type": "trigger", @@ -432,7 +432,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_1E0C43" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger2" }, { "type": "trigger", @@ -441,7 +441,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_1E0C4F" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger3" }, { "type": "trigger", @@ -450,7 +450,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0DF3" + "script": "RustboroCity_EventScript_RivalTrigger0" }, { "type": "trigger", @@ -459,7 +459,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0E33" + "script": "RustboroCity_EventScript_RivalTrigger1" }, { "type": "trigger", @@ -468,7 +468,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0E73" + "script": "RustboroCity_EventScript_RivalTrigger2" }, { "type": "trigger", @@ -477,7 +477,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0EB3" + "script": "RustboroCity_EventScript_RivalTrigger3" }, { "type": "trigger", @@ -486,7 +486,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0EF3" + "script": "RustboroCity_EventScript_RivalTrigger4" }, { "type": "trigger", @@ -495,7 +495,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0F33" + "script": "RustboroCity_EventScript_RivalTrigger5" }, { "type": "trigger", @@ -504,7 +504,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0F73" + "script": "RustboroCity_EventScript_RivalTrigger6" }, { "type": "trigger", @@ -513,7 +513,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0FB3" + "script": "RustboroCity_EventScript_RivalTrigger7" } ], "bg_events": [ @@ -523,7 +523,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E08F5" + "script": "RustboroCity_EventScript_GymSign" }, { "type": "sign", @@ -531,7 +531,7 @@ "y": 35, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E0910" + "script": "RustboroCity_EventScript_TrainersSchoolSign" }, { "type": "sign", @@ -555,7 +555,7 @@ "y": 49, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E0907" + "script": "RustboroCity_EventScript_CitySign" }, { "type": "sign", @@ -579,7 +579,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E08EC" + "script": "RustboroCity_EventScript_DevonCorpSign" }, { "type": "sign", @@ -587,7 +587,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E08E3" + "script": "RustboroCity_EventScript_TunnelSign" }, { "type": "sign", @@ -595,7 +595,7 @@ "y": 38, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E0919" + "script": "RustboroCity_EventScript_CuttersHouseSign" } ] } diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index ff9f2e03b..4cfb0ae6e 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,45 +1,45 @@ RustboroCity_MapScripts:: @ 81E06BD map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_OnFrame .byte 0 RustboroCity_OnTransition: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call Common_EventScript_SetupRivalGfxId compare VAR_RUSTBORO_CITY_STATE, 6 - call_if_eq RustboroCity_EventScript_1E0707 + call_if_eq RustboroCity_EventScript_HideMapNamePopup getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_RUSTBORO_CITY_STATE, 6 - goto_if_eq RustboroCity_EventScript_1E06EC + goto_if_eq RustboroCity_EventScript_PositionScientistForExit end -RustboroCity_EventScript_1E06EC:: @ 81E06EC +RustboroCity_EventScript_PositionScientistForExit:: @ 81E06EC compare VAR_TEMP_0, 11 - goto_if_eq RustboroCity_EventScript_1E06FF + goto_if_eq RustboroCity_EventScript_PositionScientistLeftExit setobjectxyperm 15, 12, 15 end -RustboroCity_EventScript_1E06FF:: @ 81E06FF +RustboroCity_EventScript_PositionScientistLeftExit:: @ 81E06FF setobjectxyperm 15, 11, 15 end -RustboroCity_EventScript_1E0707:: @ 81E0707 +RustboroCity_EventScript_HideMapNamePopup:: @ 81E0707 setflag FLAG_HIDE_MAP_NAME_POPUP return -RustboroCity_MapScript2_1E070B: @ 81E070B - map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_1E0715 +RustboroCity_OnFrame: @ 81E070B + map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_ScientistAddMatchCall .2byte 0 -RustboroCity_EventScript_1E0715:: @ 81E0715 +RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 lockall setvar VAR_ROUTE104_STATE, 1 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_1E0850 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown waitmovement 0 playse SE_KAIDAN delay 10 addobject 15 - applymovement 15, RustboroCity_Movement_1E0852 + applymovement 15, RustboroCity_Movement_ScientistApproachPlayer waitmovement 0 playse SE_PIN applymovement 15, Common_Movement_ExclamationMark @@ -48,9 +48,9 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 15, RustboroCity_Movement_1E084E + applymovement 15, RustboroCity_Movement_ScientistWalkInPlaceDown waitmovement 0 - msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT + msgbox RustboroCity_Text_DevelopedNewPokenavFeature, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL applymovement 15, Common_Movement_WalkInPlaceFastestLeft @@ -65,36 +65,36 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 20 applymovement 15, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT + msgbox RustboroCity_Text_AddedMatchCallPleaseCallMrStone, MSGBOX_DEFAULT closemessage delay 20 - goto RustboroCity_EventScript_1E07BD + goto RustboroCity_EventScript_MatchCallTutorial -RustboroCity_EventScript_1E07AC:: @ 81E07AC - msgbox RustboroCity_Text_1E2449, MSGBOX_DEFAULT +RustboroCity_EventScript_PleaseSelectPokenav:: @ 81E07AC + msgbox RustboroCity_Text_PleaseSelectPokenav, MSGBOX_DEFAULT closemessage delay 10 - goto RustboroCity_EventScript_1E07BD + goto RustboroCity_EventScript_MatchCallTutorial -RustboroCity_EventScript_1E07BD:: @ 81E07BD +RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD setflag FLAG_ADDED_MATCH_CALL_TO_POKENAV special ScriptMenu_CreateStartMenuForPokenavTutorial waitstate switch VAR_RESULT - case 0, RustboroCity_EventScript_1E07AC - case 1, RustboroCity_EventScript_1E07AC - case 2, RustboroCity_EventScript_1E07AC - case 4, RustboroCity_EventScript_1E07AC - case 5, RustboroCity_EventScript_1E07AC - case 6, RustboroCity_EventScript_1E07AC - case 7, RustboroCity_EventScript_1E07AC - case MULTI_B_PRESSED, RustboroCity_EventScript_1E07AC - special sub_81C72A4 + case 0, RustboroCity_EventScript_PleaseSelectPokenav + case 1, RustboroCity_EventScript_PleaseSelectPokenav + case 2, RustboroCity_EventScript_PleaseSelectPokenav + case 4, RustboroCity_EventScript_PleaseSelectPokenav + case 5, RustboroCity_EventScript_PleaseSelectPokenav + case 6, RustboroCity_EventScript_PleaseSelectPokenav + case 7, RustboroCity_EventScript_PleaseSelectPokenav + case MULTI_B_PRESSED, RustboroCity_EventScript_PleaseSelectPokenav + special OpenPokenavForTutorial waitstate delay 20 - msgbox RustboroCity_Text_1E2464, MSGBOX_DEFAULT + msgbox RustboroCity_Text_IdBetterGetBackToWork, MSGBOX_DEFAULT closemessage - applymovement 15, RustboroCity_Movement_1E085D + applymovement 15, RustboroCity_Movement_ScientistLeave waitmovement 0 playse SE_KAIDAN removeobject 15 @@ -104,20 +104,21 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD releaseall end -RustboroCity_Movement_1E084E: @ 81E084E +RustboroCity_Movement_ScientistWalkInPlaceDown: @ 81E084E walk_in_place_down step_end -RustboroCity_Movement_1E0850: @ 81E0850 +RustboroCity_Movement_PlayerWalkDown: @ 81E0850 walk_down step_end -RustboroCity_Movement_1E0852: @ 81E0852 +RustboroCity_Movement_ScientistApproachPlayer: @ 81E0852 walk_down delay_16 step_end -RustboroCity_Movement_1E0855: @ 81E0855 +@ Unused +RustboroCity_Movement_ScientistWalkAroundPlayer: @ 81E0855 delay_16 walk_left walk_down @@ -127,175 +128,176 @@ RustboroCity_Movement_1E0855: @ 81E0855 delay_16 step_end -RustboroCity_Movement_1E085D: @ 81E085D +RustboroCity_Movement_ScientistLeave: @ 81E085D walk_up step_end -RustboroCity_EventScript_1E085F:: @ 81E085F +RustboroCity_EventScript_FatMan:: @ 81E085F lock faceplayer - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_1E0874 - msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_FatManSawGrunt + msgbox RustboroCity_Text_WeShortenItToDevon, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E0874:: @ 81E0874 - msgbox RustboroCity_Text_1E12AC, MSGBOX_DEFAULT +RustboroCity_EventScript_FatManSawGrunt:: @ 81E0874 + msgbox RustboroCity_Text_SneakyLookingManWentAroundCorner, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E087E:: @ 81E087E +RustboroCity_EventScript_DevonEmployee2:: @ 81E087E lock faceplayer - msgbox RustboroCity_Text_1E1407, MSGBOX_DEFAULT + msgbox RustboroCity_Text_YoureNewAroundHere, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E088A:: @ 81E088A - msgbox RustboroCity_Text_1E1480, MSGBOX_NPC +RustboroCity_EventScript_Woman:: @ 81E088A + msgbox RustboroCity_Text_GymLeaderIsntEasyWithFire, MSGBOX_NPC end -RustboroCity_EventScript_1E0893:: @ 81E0893 +RustboroCity_EventScript_Man1:: @ 81E0893 lock faceplayer - goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_1E08A8 - msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_Man1HaveBadge + msgbox RustboroCity_Text_HaveYouChallengedGym, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E08A8:: @ 81E08A8 - msgbox RustboroCity_Text_1E139E, MSGBOX_DEFAULT +RustboroCity_EventScript_Man1HaveBadge:: @ 81E08A8 + msgbox RustboroCity_Text_HeyThatsRustborosGymBadge, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E08B2:: @ 81E08B2 +RustboroCity_EventScript_Boy2:: @ 81E08B2 lock faceplayer - goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_1E08C7 - msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_BrineyLeftTunnel + msgbox RustboroCity_Text_MrBrineyWalksInTheTunnel, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E08C7:: @ 81E08C7 - msgbox RustboroCity_Text_1E1589, MSGBOX_DEFAULT +RustboroCity_EventScript_BrineyLeftTunnel:: @ 81E08C7 + msgbox RustboroCity_Text_MrBrineyLovesPeeko, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E08D1:: @ 81E08D1 - msgbox RustboroCity_Text_1E1633, MSGBOX_NPC +RustboroCity_EventScript_Twin:: @ 81E08D1 + msgbox RustboroCity_Text_WowYouHavePokemon, MSGBOX_NPC end -RustboroCity_EventScript_1E08DA:: @ 81E08DA - msgbox RustboroCity_Text_1E1695, MSGBOX_SIGN +RustboroCity_EventScript_NinjaBoy:: @ 81E08DA + msgbox RustboroCity_Text_CatchRarePokemonIfIGoToSchool, MSGBOX_SIGN end -RustboroCity_EventScript_1E08E3:: @ 81E08E3 - msgbox RustboroCity_Text_1E20A6, MSGBOX_SIGN +RustboroCity_EventScript_TunnelSign:: @ 81E08E3 + msgbox RustboroCity_Text_TunnelNearingCompletion, MSGBOX_SIGN end -RustboroCity_EventScript_1E08EC:: @ 81E08EC - msgbox RustboroCity_Text_1E2128, MSGBOX_SIGN +RustboroCity_EventScript_DevonCorpSign:: @ 81E08EC + msgbox RustboroCity_Text_DevonCorpSign, MSGBOX_SIGN end -RustboroCity_EventScript_1E08F5:: @ 81E08F5 - msgbox RustboroCity_Text_1E2167, MSGBOX_SIGN +RustboroCity_EventScript_GymSign:: @ 81E08F5 + msgbox RustboroCity_Text_GymSign, MSGBOX_SIGN end -RustboroCity_EventScript_1E08FE:: @ 81E08FE - msgbox RustboroCity_Text_1E21B3, MSGBOX_SIGN +@ Unused +RustboroCity_EventScript_DevonCorpBranchOfficeSign:: @ 81E08FE + msgbox RustboroCity_Text_DevonCorpBranchOfficeSign, MSGBOX_SIGN end -RustboroCity_EventScript_1E0907:: @ 81E0907 - msgbox RustboroCity_Text_1E220B, MSGBOX_SIGN +RustboroCity_EventScript_CitySign:: @ 81E0907 + msgbox RustboroCity_Text_CitySign, MSGBOX_SIGN end -RustboroCity_EventScript_1E0910:: @ 81E0910 - msgbox RustboroCity_Text_1E2253, MSGBOX_SIGN +RustboroCity_EventScript_TrainersSchoolSign:: @ 81E0910 + msgbox RustboroCity_Text_TrainersSchoolSign, MSGBOX_SIGN end -RustboroCity_EventScript_1E0919:: @ 81E0919 - msgbox RustboroCity_Text_1E2296, MSGBOX_SIGN +RustboroCity_EventScript_CuttersHouseSign:: @ 81E0919 + msgbox RustboroCity_Text_CuttersHouse, MSGBOX_SIGN end -RustboroCity_EventScript_1E0922:: @ 81E0922 +RustboroCity_EventScript_LittleBoy:: @ 81E0922 lock faceplayer - msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT + msgbox RustboroCity_Text_PokemonCanChangeLookFromExp, MSGBOX_DEFAULT applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_EventScript_1E0938:: @ 81E0938 +RustboroCity_EventScript_LittleGirl:: @ 81E0938 lock faceplayer - msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT + msgbox RustboroCity_Text_PokemonChangeShape, MSGBOX_DEFAULT applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_EventScript_1E094E:: @ 81E094E +RustboroCity_EventScript_Man2:: @ 81E094E lock faceplayer - msgbox RustboroCity_Text_1E1789, MSGBOX_DEFAULT + msgbox RustboroCity_Text_TradePokemonGrowFast, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E095A:: @ 81E095A +RustboroCity_EventScript_StolenGoodsTrigger0:: @ 81E095A lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 0 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E0971:: @ 81E0971 +RustboroCity_EventScript_StolenGoodsTrigger1:: @ 81E0971 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 1 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E0988:: @ 81E0988 +RustboroCity_EventScript_StolenGoodsTrigger2:: @ 81E0988 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 2 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E099F:: @ 81E099F +RustboroCity_EventScript_StolenGoodsTrigger3:: @ 81E099F lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 3 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E09B6:: @ 81E09B6 +RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 4 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E09CD:: @ 81E09CD - msgbox RustboroCity_Text_1E17FE, MSGBOX_DEFAULT +RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD + msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 addobject 10 addobject 9 - applymovement 10, RustboroCity_Movement_1E0AA0 + applymovement 10, RustboroCity_Movement_GruntEscape waitmovement 0 removeobject 10 - applymovement 9, RustboroCity_Movement_1E0AB1 + applymovement 9, RustboroCity_Movement_EmployeeChaseGrunt1 waitmovement 0 - msgbox RustboroCity_Text_1E1817, MSGBOX_DEFAULT + msgbox RustboroCity_Text_WaitDontTakeMyGoods, MSGBOX_DEFAULT closemessage - applymovement 9, RustboroCity_Movement_1E0AB9 + applymovement 9, RustboroCity_Movement_EmployeeChaseGrunt2 waitmovement 0 fadedefaultbgm removeobject 9 @@ -313,42 +315,50 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD releaseall end -RustboroCity_EventScript_1E0A3B:: @ 81E0A3B - msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT +@ Unused +RustboroCity_EventScript_ShadyCharacterTookOff:: @ 81E0A3B + msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT return -RustboroCity_EventScript_1E0A44:: @ 81E0A44 - msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT +@ Unused +RustboroCity_EventScript_YouGotItThankYou:: @ 81E0A44 + msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT return -RustboroCity_EventScript_1E0A4D:: @ 81E0A4D - applymovement 9, RustboroCity_Movement_1E0AC1 +@ Unknown, unused employee movements. Based on the differences in movement theyre for approaching an object (probably the player) in different positions +RustboroCity_EventScript_EmployeeApproachUp:: @ 81E0A4D + applymovement 9, RustboroCity_Movement_EmployeeApproachUp waitmovement 0 return -RustboroCity_EventScript_1E0A58:: @ 81E0A58 - applymovement 9, RustboroCity_Movement_1E0AC5 +@ Unused, see above +RustboroCity_EventScript_EmployeeApproachLeft:: @ 81E0A58 + applymovement 9, RustboroCity_Movement_EmployeeApproachLeft waitmovement 0 return -RustboroCity_EventScript_1E0A63:: @ 81E0A63 - applymovement 9, RustboroCity_Movement_1E0ACA +@ Unused, see above +RustboroCity_EventScript_EmployeeApproachRight:: @ 81E0A63 + applymovement 9, RustboroCity_Movement_EmployeeApproachRight waitmovement 0 return -RustboroCity_EventScript_1E0A6E:: @ 81E0A6E - applymovement 9, RustboroCity_Movement_1E0ACF +@ Unused, see above +RustboroCity_EventScript_EmployeeApproachDown:: @ 81E0A6E + applymovement 9, RustboroCity_Movement_EmployeeApproachDown waitmovement 0 return -RustboroCity_EventScript_1E0A79:: @ 81E0A79 - applymovement 9, RustboroCity_Movement_1E0AD5 +@ Unused, similar movement to the above scripts +RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79 + applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerFar waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -RustboroCity_Movement_1E0A8E: @ 81E0A8E +@ Unused +RustboroCity_Movement_GruntEscapeExtended: @ 81E0A8E walk_fastest_right walk_fastest_right walk_fast_right @@ -368,7 +378,7 @@ RustboroCity_Movement_1E0A8E: @ 81E0A8E walk_fast_up step_end -RustboroCity_Movement_1E0AA0: @ 81E0AA0 +RustboroCity_Movement_GruntEscape: @ 81E0AA0 walk_fastest_right walk_fastest_right walk_fast_right @@ -387,7 +397,7 @@ RustboroCity_Movement_1E0AA0: @ 81E0AA0 walk_fast_up step_end -RustboroCity_Movement_1E0AB1: @ 81E0AB1 +RustboroCity_Movement_EmployeeChaseGrunt1: @ 81E0AB1 walk_right walk_right walk_right @@ -397,7 +407,7 @@ RustboroCity_Movement_1E0AB1: @ 81E0AB1 walk_in_place_fastest_up step_end -RustboroCity_Movement_1E0AB9: @ 81E0AB9 +RustboroCity_Movement_EmployeeChaseGrunt2: @ 81E0AB9 walk_up walk_up walk_up @@ -407,27 +417,31 @@ RustboroCity_Movement_1E0AB9: @ 81E0AB9 walk_up step_end -RustboroCity_Movement_1E0AC1: @ 81E0AC1 +@ Functionally unused +RustboroCity_Movement_EmployeeApproachUp: @ 81E0AC1 walk_down walk_right walk_right step_end -RustboroCity_Movement_1E0AC5: @ 81E0AC5 +@ Functionally unused +RustboroCity_Movement_EmployeeApproachLeft: @ 81E0AC5 walk_down walk_down walk_right walk_right step_end -RustboroCity_Movement_1E0ACA: @ 81E0ACA +@ Functionally unused +RustboroCity_Movement_EmployeeApproachRight: @ 81E0ACA walk_down walk_down walk_right walk_right step_end -RustboroCity_Movement_1E0ACF: @ 81E0ACF +@ Functionally unused +RustboroCity_Movement_EmployeeApproachDown: @ 81E0ACF walk_down walk_down walk_down @@ -435,7 +449,8 @@ RustboroCity_Movement_1E0ACF: @ 81E0ACF walk_right step_end -RustboroCity_Movement_1E0AD5: @ 81E0AD5 +@ Functionally unused +RustboroCity_Movement_EmployeeApproachPlayerFar: @ 81E0AD5 walk_down walk_down walk_down @@ -445,61 +460,62 @@ RustboroCity_Movement_1E0AD5: @ 81E0AD5 walk_in_place_fastest_down step_end -RustboroCity_EventScript_1E0ADD:: @ 81E0ADD +RustboroCity_EventScript_DevonEmployee1:: @ 81E0ADD lock faceplayer - goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_1E0AF2 - msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_ReturnGoodsSpokeToEmployee + msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E0AF2:: @ 81E0AF2 +RustboroCity_EventScript_ReturnGoodsSpokeToEmployee:: @ 81E0AF2 waitse setvar VAR_TEMP_1, 4 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0AFE:: @ 81E0AFE +RustboroCity_EventScript_HelpGetGoodsTrigger0:: @ 81E0AFE lockall setvar VAR_TEMP_1, 0 - goto RustboroCity_EventScript_1E0B2E + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_1E0B0A:: @ 81E0B0A +RustboroCity_EventScript_HelpGetGoodsTrigger1:: @ 81E0B0A lockall setvar VAR_TEMP_1, 1 - goto RustboroCity_EventScript_1E0B2E + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_1E0B16:: @ 81E0B16 +RustboroCity_EventScript_HelpGetGoodsTrigger2:: @ 81E0B16 lockall setvar VAR_TEMP_1, 2 - goto RustboroCity_EventScript_1E0B2E + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_1E0B22:: @ 81E0B22 +RustboroCity_EventScript_HelpGetGoodsTrigger3:: @ 81E0B22 lockall setvar VAR_TEMP_1, 3 - goto RustboroCity_EventScript_1E0B2E + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_1E0B2E:: @ 81E0B2E +RustboroCity_EventScript_EmployeeAskToGetGoods:: @ 81E0B2E compare VAR_TEMP_1, 0 - call_if_eq RustboroCity_EventScript_1E0B6F + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp1 compare VAR_TEMP_1, 1 - call_if_eq RustboroCity_EventScript_1E0B9B + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerLeft1 compare VAR_TEMP_1, 2 - call_if_eq RustboroCity_EventScript_1E0BC7 + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerDown1 compare VAR_TEMP_1, 3 - call_if_eq RustboroCity_EventScript_1E0BF3 + call_if_eq RustboroCity_EventScript_EmployeeApproachPlayerDown1 setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN setvar VAR_RUSTBORO_CITY_STATE, 3 copyobjectxytoperm 9 - msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT + msgbox RustboroCity_Text_HelpMeIWasRobbed, MSGBOX_DEFAULT releaseall end -RustboroCity_EventScript_1E0B6F:: @ 81E0B6F +@ The below movement scripts are either partially or fully duplicated by the movement scripts when the player returns the goods +RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN @@ -511,7 +527,7 @@ RustboroCity_EventScript_1E0B6F:: @ 81E0B6F waitmovement 0 return -RustboroCity_EventScript_1E0B9B:: @ 81E0B9B +RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN @@ -523,7 +539,7 @@ RustboroCity_EventScript_1E0B9B:: @ 81E0B9B waitmovement 0 return -RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 +RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -535,7 +551,7 @@ RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 waitmovement 0 return -RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 +RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -543,56 +559,56 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 9, RustboroCity_Movement_1E0C29 + applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -RustboroCity_Movement_1E0C29: @ 81E0C29 +RustboroCity_Movement_EmployeeApproachPlayerDown: @ 81E0C29 walk_down step_end -RustboroCity_EventScript_1E0C2B:: @ 81E0C2B +RustboroCity_EventScript_ReturnGoodsTrigger0:: @ 81E0C2B lockall setvar VAR_TEMP_1, 0 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0C37:: @ 81E0C37 +RustboroCity_EventScript_ReturnGoodsTrigger1:: @ 81E0C37 lockall setvar VAR_TEMP_1, 1 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0C43:: @ 81E0C43 +RustboroCity_EventScript_ReturnGoodsTrigger2:: @ 81E0C43 lockall setvar VAR_TEMP_1, 2 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0C4F:: @ 81E0C4F +RustboroCity_EventScript_ReturnGoodsTrigger3:: @ 81E0C4F lockall setvar VAR_TEMP_1, 3 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0C5B:: @ 81E0C5B +RustboroCity_EventScript_ReturnGoods:: @ 81E0C5B compare VAR_TEMP_1, 0 - call_if_eq RustboroCity_EventScript_1E0CDC + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp2 compare VAR_TEMP_1, 1 - call_if_eq RustboroCity_EventScript_1E0D08 + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerLeft2 compare VAR_TEMP_1, 2 - call_if_eq RustboroCity_EventScript_1E0D34 + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerDown2 compare VAR_TEMP_1, 3 - call_if_eq RustboroCity_EventScript_1E0D60 + call_if_eq RustboroCity_EventScript_EmployeeApproachPlayerDown2 compare VAR_TEMP_1, 4 - call_if_eq RustboroCity_EventScript_1E0D96 - msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerRight + msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL - compare VAR_RESULT, 0 - call_if_eq RustboroCity_EventScript_1E0CD3 - msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq RustboroCity_EventScript_BagFull + msgbox RustboroCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 @@ -603,11 +619,11 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B releaseall end -RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 - msgbox RustboroCity_Text_1E19E5, MSGBOX_DEFAULT +RustboroCity_EventScript_BagFull:: @ 81E0CD3 + msgbox RustboroCity_Text_YoureLoadedWithItems, MSGBOX_DEFAULT return -RustboroCity_EventScript_1E0CDC:: @ 81E0CDC +RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN @@ -619,7 +635,7 @@ RustboroCity_EventScript_1E0CDC:: @ 81E0CDC waitmovement 0 return -RustboroCity_EventScript_1E0D08:: @ 81E0D08 +RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08 applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN @@ -631,7 +647,7 @@ RustboroCity_EventScript_1E0D08:: @ 81E0D08 waitmovement 0 return -RustboroCity_EventScript_1E0D34:: @ 81E0D34 +RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -643,7 +659,7 @@ RustboroCity_EventScript_1E0D34:: @ 81E0D34 waitmovement 0 return -RustboroCity_EventScript_1E0D60:: @ 81E0D60 +RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -651,13 +667,13 @@ RustboroCity_EventScript_1E0D60:: @ 81E0D60 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 9, RustboroCity_Movement_1E0C29 + applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -RustboroCity_EventScript_1E0D96:: @ 81E0D96 +RustboroCity_EventScript_EmployeeFacePlayerRight:: @ 81E0D96 applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN @@ -667,33 +683,32 @@ RustboroCity_EventScript_1E0D96:: @ 81E0D96 waitmovement 0 return -RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 +RustboroCity_EventScript_Rival:: @ 81E0DB8 lockall - call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1 + call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_FacePlayer waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -Route104_EventScript_1E0DD1:: @ 81E0DD1 -RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 +RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1 checkplayergender compare VAR_RESULT, MALE - goto_if_eq RustboroCity_EventScript_1E0DE9 + goto_if_eq RustboroCity_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - goto_if_eq RustboroCity_EventScript_1E0DEE + goto_if_eq RustboroCity_EventScript_PlayBrendanMusic return -RustboroCity_EventScript_1E0DE9:: @ 81E0DE9 +RustboroCity_EventScript_PlayMayMusic:: @ 81E0DE9 playbgm MUS_GIRL_SUP, 1 return -RustboroCity_EventScript_1E0DEE:: @ 81E0DEE +RustboroCity_EventScript_PlayBrendanMusic:: @ 81E0DEE playbgm MUS_BOY_SUP, 1 return -RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 +RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -701,15 +716,15 @@ RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E120E + applymovement 14, RustboroCity_Movement_RivalApproachPlayer0 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0E33:: @ 81E0E33 +RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -717,15 +732,15 @@ RustboroCity_EventScript_1E0E33:: @ 81E0E33 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1215 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer1 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0E73:: @ 81E0E73 +RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -733,15 +748,15 @@ RustboroCity_EventScript_1E0E73:: @ 81E0E73 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E121B + applymovement 14, RustboroCity_Movement_RivalApproachPlayer2 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 +RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -749,15 +764,15 @@ RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1220 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer3 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 +RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -765,15 +780,15 @@ RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1224 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer4 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0F33:: @ 81E0F33 +RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -781,15 +796,15 @@ RustboroCity_EventScript_1E0F33:: @ 81E0F33 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1227 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer5 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0F73:: @ 81E0F73 +RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -797,15 +812,15 @@ RustboroCity_EventScript_1E0F73:: @ 81E0F73 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E122B + applymovement 14, RustboroCity_Movement_RivalApproachPlayer6 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 +RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -813,29 +828,29 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1230 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer7 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 +RustboroCity_EventScript_RivalEncounter:: @ 81E0FF3 checkplayergender compare VAR_RESULT, MALE - goto_if_eq RustboroCity_EventScript_1E100B + goto_if_eq RustboroCity_EventScript_MayEncounter compare VAR_RESULT, FEMALE - goto_if_eq RustboroCity_EventScript_1E1114 + goto_if_eq RustboroCity_EventScript_BrendanEncounter end -RustboroCity_EventScript_1E100B:: @ 81E100B - goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_1E10C1 - goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E1070 +RustboroCity_EventScript_MayEncounter:: @ 81E100B + goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_MayBrineyHint + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_MayAskToBattle setflag FLAG_MET_RIVAL_RUSTBORO - msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT + msgbox RustboroCity_Text_MayHiLetsRegister, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1ADB, MSGBOX_DEFAULT + msgbox RustboroCity_Text_RegisteredMay, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -843,126 +858,126 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 setvar VAR_0x8008, 0 - msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO + msgbox RustboroCity_Text_MayPassedBrineyWantToBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT - call RustboroCity_EventScript_1E10D6 + goto_if_eq RustboroCity_EventScript_BattleMay + msgbox RustboroCity_Text_MayOhHaventRaisedPokemonEnough, MSGBOX_DEFAULT + call RustboroCity_EventScript_RestoreBgm releaseall end -RustboroCity_EventScript_1E1070:: @ 81E1070 +RustboroCity_EventScript_MayAskToBattle:: @ 81E1070 setvar VAR_0x8008, 1 - msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO + msgbox RustboroCity_Text_MayWantToBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT + goto_if_eq RustboroCity_EventScript_BattleMay + msgbox RustboroCity_Text_MayOhHaventRaisedPokemonEnough, MSGBOX_DEFAULT releaseall end -RustboroCity_EventScript_1E1092:: @ 81E1092 - msgbox RustboroCity_Text_1E1C84, MSGBOX_DEFAULT +RustboroCity_EventScript_BattleMay:: @ 81E1092 + msgbox RustboroCity_Text_MayImNotGoingToLose, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, RustboroCity_EventScript_1E10DB - case 1, RustboroCity_EventScript_1E10EE - case 2, RustboroCity_EventScript_1E1101 + case 0, RustboroCity_EventScript_BattleMayTreecko + case 1, RustboroCity_EventScript_BattleMayTorchic + case 2, RustboroCity_EventScript_BattleMayMudkip end -RustboroCity_EventScript_1E10C1:: @ 81E10C1 - msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT +RustboroCity_EventScript_MayBrineyHint:: @ 81E10C1 + msgbox RustboroCity_Text_MayMrBrineyHint, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq RustboroCity_EventScript_1E10D6 + call_if_eq RustboroCity_EventScript_RestoreBgm releaseall end -RustboroCity_EventScript_1E10D6:: @ 81E10D6 +RustboroCity_EventScript_RestoreBgm:: @ 81E10D6 savebgm MUS_DUMMY fadedefaultbgm return -RustboroCity_EventScript_1E10DB:: @ 81E10DB - trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_1E1CC1 +RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB + trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E10C1 + goto RustboroCity_EventScript_MayBrineyHint end -RustboroCity_EventScript_1E10EE:: @ 81E10EE - trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_1E1CC1 +RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE + trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E10C1 + goto RustboroCity_EventScript_MayBrineyHint end -RustboroCity_EventScript_1E1101:: @ 81E1101 - trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_1E1CC1 +RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101 + trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E10C1 + goto RustboroCity_EventScript_MayBrineyHint end -RustboroCity_EventScript_1E1114:: @ 81E1114 - goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_1E11C0 - goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E1174 +RustboroCity_EventScript_BrendanEncounter:: @ 81E1114 + goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanBrineyHint + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanAskToBattle setflag FLAG_MET_RIVAL_RUSTBORO - msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT + msgbox RustboroCity_Text_BrendanHiLetsRegister, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1E11, MSGBOX_DEFAULT + msgbox RustboroCity_Text_RegisteredBrendan, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 - msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO + msgbox RustboroCity_Text_BrendanPassedBrineyWantToBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT - call RustboroCity_EventScript_1E10D6 + goto_if_eq RustboroCity_EventScript_BattleBrendan + msgbox RustboroCity_Text_BrendanNoConfidenceInPokemon, MSGBOX_DEFAULT + call RustboroCity_EventScript_RestoreBgm releaseall end -RustboroCity_EventScript_1E1174:: @ 81E1174 - msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO +RustboroCity_EventScript_BrendanAskToBattle:: @ 81E1174 + msgbox RustboroCity_Text_BrendanWantToBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT + goto_if_eq RustboroCity_EventScript_BattleBrendan + msgbox RustboroCity_Text_BrendanNoConfidenceInPokemon, MSGBOX_DEFAULT releaseall end -RustboroCity_EventScript_1E1191:: @ 81E1191 - msgbox RustboroCity_Text_1E1FA9, MSGBOX_DEFAULT +RustboroCity_EventScript_BattleBrendan:: @ 81E1191 + msgbox RustboroCity_Text_BrendanIWontGoEasy, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, RustboroCity_EventScript_1E11D5 - case 1, RustboroCity_EventScript_1E11E8 - case 2, RustboroCity_EventScript_1E11FB + case 0, RustboroCity_EventScript_BattleBrendanTreecko + case 1, RustboroCity_EventScript_BattleBrendanTorchic + case 2, RustboroCity_EventScript_BattleBrendanMudkip end -RustboroCity_EventScript_1E11C0:: @ 81E11C0 - msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT +RustboroCity_EventScript_BrendanBrineyHint:: @ 81E11C0 + msgbox RustboroCity_Text_BrendanMrBrineyHint, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq RustboroCity_EventScript_1E10D6 + call_if_eq RustboroCity_EventScript_RestoreBgm releaseall end -RustboroCity_EventScript_1E11D5:: @ 81E11D5 - trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_1E1FE9 +RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5 + trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E11C0 + goto RustboroCity_EventScript_BrendanBrineyHint end -RustboroCity_EventScript_1E11E8:: @ 81E11E8 - trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_1E1FE9 +RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8 + trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E11C0 + goto RustboroCity_EventScript_BrendanBrineyHint end -RustboroCity_EventScript_1E11FB:: @ 81E11FB - trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_1E1FE9 +RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB + trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E11C0 + goto RustboroCity_EventScript_BrendanBrineyHint end -RustboroCity_Movement_1E120E: @ 81E120E +RustboroCity_Movement_RivalApproachPlayer0: @ 81E120E walk_down walk_left walk_left @@ -971,7 +986,7 @@ RustboroCity_Movement_1E120E: @ 81E120E walk_down step_end -RustboroCity_Movement_1E1215: @ 81E1215 +RustboroCity_Movement_RivalApproachPlayer1: @ 81E1215 walk_down walk_left walk_left @@ -979,38 +994,38 @@ RustboroCity_Movement_1E1215: @ 81E1215 walk_down step_end -RustboroCity_Movement_1E121B: @ 81E121B +RustboroCity_Movement_RivalApproachPlayer2: @ 81E121B walk_down walk_left walk_left walk_down step_end -RustboroCity_Movement_1E1220: @ 81E1220 +RustboroCity_Movement_RivalApproachPlayer3: @ 81E1220 walk_down walk_left walk_down step_end -RustboroCity_Movement_1E1224: @ 81E1224 +RustboroCity_Movement_RivalApproachPlayer4: @ 81E1224 walk_down walk_down step_end -RustboroCity_Movement_1E1227: @ 81E1227 +RustboroCity_Movement_RivalApproachPlayer5: @ 81E1227 walk_down walk_right walk_down step_end -RustboroCity_Movement_1E122B: @ 81E122B +RustboroCity_Movement_RivalApproachPlayer6: @ 81E122B walk_down walk_right walk_right walk_down step_end -RustboroCity_Movement_1E1230: @ 81E1230 +RustboroCity_Movement_RivalApproachPlayer7: @ 81E1230 walk_down walk_right walk_right @@ -1018,53 +1033,53 @@ RustboroCity_Movement_1E1230: @ 81E1230 walk_down step_end -RustboroCity_EventScript_1E1236:: @ 81E1236 - msgbox RustboroCity_Text_1E249D, MSGBOX_NPC +RustboroCity_EventScript_Boy1:: @ 81E1236 + msgbox RustboroCity_Text_YouCanHave2On2Battle, MSGBOX_NPC end -RustboroCity_Text_1E123F: @ 81E123F +RustboroCity_Text_WeShortenItToDevon: @ 81E123F .string "The DEVON CORPORATION…\n" .string "We all just shorten it to DEVON.\p" .string "That company makes all sorts of\n" .string "convenient products.$" -RustboroCity_Text_1E12AC: @ 81E12AC +RustboroCity_Text_SneakyLookingManWentAroundCorner: @ 81E12AC .string "Hm? A sneaky-looking man?\p" .string "Come to think of it, yes, a shady-\n" .string "looking guy went around the corner.$" -RustboroCity_Text_1E130D: @ 81E130D +RustboroCity_Text_HaveYouChallengedGym: @ 81E130D .string "Have you taken the POKéMON GYM\n" .string "challenge?\p" .string "When you get that shiny GYM BADGE\n" .string "in hand, I guess TRAINERS begin to\l" .string "realize what is required of them.$" -RustboroCity_Text_1E139E: @ 81E139E +RustboroCity_Text_HeyThatsRustborosGymBadge: @ 81E139E .string "Hey, that's RUSTBORO's GYM BADGE!\p" .string "Out of all the POKéMON GYM BADGES,\n" .string "RUSTBORO's is the coolest, I'd say.$" -RustboroCity_Text_1E1407: @ 81E1407 +RustboroCity_Text_YoureNewAroundHere: @ 81E1407 .string "Oh? Who might you be?\n" .string "You're a new face around these parts.\p" .string "Have you just transferred into the\n" .string "POKéMON TRAINER'S SCHOOL?$" -RustboroCity_Text_1E1480: @ 81E1480 +RustboroCity_Text_GymLeaderIsntEasyWithFire: @ 81E1480 .string "I challenged the GYM LEADER, but…\p" .string "It's not going to be easy winning with\n" .string "my FIRE-type POKéMON…\p" .string "FIRE-type POKéMON don't match up\n" .string "well against ROCK-type POKéMON…$" -RustboroCity_Text_1E1520: @ 81E1520 +RustboroCity_Text_MrBrineyWalksInTheTunnel: @ 81E1520 .string "The old sailor MR. BRINEY lives in\n" .string "a cottage by the sea.\p" .string "He goes for walks in the tunnel every\n" .string "so often.$" -RustboroCity_Text_1E1589: @ 81E1589 +RustboroCity_Text_MrBrineyLovesPeeko: @ 81E1589 .string "The old sailor MR. BRINEY lives in\n" .string "a cottage by the sea.\p" .string "He said he was going shopping in\n" @@ -1072,40 +1087,40 @@ RustboroCity_Text_1E1589: @ 81E1589 .string "That old sea dog, he must really love\n" .string "that PEEKO.$" -RustboroCity_Text_1E1633: @ 81E1633 +RustboroCity_Text_WowYouHavePokemon: @ 81E1633 .string "Wow, you have POKéMON with you, too.\p" .string "When I get bigger, I'm going to go\n" .string "places with POKéMON, too.$" -RustboroCity_Text_1E1695: @ 81E1695 +RustboroCity_Text_CatchRarePokemonIfIGoToSchool: @ 81E1695 .string "POKéMON TRAINER'S SCHOOL!\p" .string "If I go to this school, will I be able\n" .string "to catch rare POKéMON easily?$" -RustboroCity_Text_1E16F4: @ 81E16F4 +RustboroCity_Text_PokemonCanChangeLookFromExp: @ 81E16F4 .string "If a POKéMON gains experience in\n" .string "battles, it can sometimes change in\l" .string "the way it looks.$" -RustboroCity_Text_1E174B: @ 81E174B +RustboroCity_Text_PokemonChangeShape: @ 81E174B .string "A POKéMON changes shape?\n" .string "If one did that, I would be shocked!$" -RustboroCity_Text_1E1789: @ 81E1789 +RustboroCity_Text_TradePokemonGrowFast: @ 81E1789 .string "A POKéMON you get in a trade from\n" .string "someone grows fast.\p" .string "But if you don't have certain GYM\n" .string "BADGES, it may not obey you…$" -RustboroCity_Text_1E17FE: @ 81E17FE +RustboroCity_Text_OutOfTheWay: @ 81E17FE .string "Get out!\n" .string "Out of the way!$" -RustboroCity_Text_1E1817: @ 81E1817 +RustboroCity_Text_WaitDontTakeMyGoods: @ 81E1817 .string "Wait! Pleeeaaase!\p" .string "Don't take my GOODS!$" -RustboroCity_Text_1E183E: @ 81E183E +RustboroCity_Text_HelpMeIWasRobbed: @ 81E183E .string "Oh, it's you!\p" .string "You're that fantastic TRAINER who\n" .string "helped me in PETALBURG WOODS!\p" @@ -1114,11 +1129,11 @@ RustboroCity_Text_1E183E: @ 81E183E .string "If I don't…\n" .string "I'm going to be in serious trouble.$" -RustboroCity_Text_1E1904: @ 81E1904 +RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel: @ 81E1904 .string "That shady character, I think he took\n" .string "off towards the tunnel over there.$" -RustboroCity_Text_1E194D: @ 81E194D +RustboroCity_Text_YouGotItThankYou: @ 81E194D .string "Oh! How did it go?\n" .string "The DEVON GOODS?\p" .string "You did!\n" @@ -1127,15 +1142,15 @@ RustboroCity_Text_1E194D: @ 81E194D .string "I know! As my thanks, I'll give you\n" .string "another GREAT BALL!$" -RustboroCity_Text_1E19E5: @ 81E19E5 +RustboroCity_Text_YoureLoadedWithItems: @ 81E19E5 .string "You're loaded with items.\n" .string "I can't give you this GREAT BALL.$" -RustboroCity_Text_1E1A21: @ 81E1A21 +RustboroCity_Text_PleaseComeWithMe: @ 81E1A21 .string "Excuse me, please!\n" .string "Please come with me!$" -RustboroCity_Text_1E1A49: @ 81E1A49 +RustboroCity_Text_MayHiLetsRegister: @ 81E1A49 .string "MAY: Oh, hi, {PLAYER}{KUN}!\p" .string "You had a MATCH CALL feature put\n" .string "on your POKéNAV!\p" @@ -1143,11 +1158,11 @@ RustboroCity_Text_1E1A49: @ 81E1A49 .string "contact one another anytime!\p" .string "… … … … … …$" -RustboroCity_Text_1E1ADB: @ 81E1ADB +RustboroCity_Text_RegisteredMay: @ 81E1ADB .string "Registered MAY\n" .string "in the POKéNAV.$" -RustboroCity_Text_1E1AFA: @ 81E1AFA +RustboroCity_Text_MayPassedBrineyWantToBattle: @ 81E1AFA .string "MAY: Oh, by the way, I passed\n" .string "MR. BRINEY in PETALBURG WOODS.\p" .string "I guess he's on his way home to his\n" @@ -1157,32 +1172,32 @@ RustboroCity_Text_1E1AFA: @ 81E1AFA .string "So…\n" .string "How about a little battle?$" -RustboroCity_Text_1E1BD3: @ 81E1BD3 +RustboroCity_Text_MayOhHaventRaisedPokemonEnough: @ 81E1BD3 .string "MAY: Oh, what's the matter?\p" .string "Haven't you caught or raised your\n" .string "POKéMON very much?\p" .string "That's not very good for a TRAINER!$" -RustboroCity_Text_1E1C48: @ 81E1C48 +RustboroCity_Text_MayWantToBattle: @ 81E1C48 .string "MAY: So, what do you think?\n" .string "How about a little battle here?$" -RustboroCity_Text_1E1C84: @ 81E1C84 +RustboroCity_Text_MayImNotGoingToLose: @ 81E1C84 .string "MAY: You just became a TRAINER,\n" .string "{PLAYER}{KUN}. I'm not going to lose!$" -RustboroCity_Text_1E1CC1: @ 81E1CC1 +RustboroCity_Text_MayDefeat: @ 81E1CC1 .string "Yikes!\n" .string "You're better than I expected!$" -RustboroCity_Text_1E1CE7: @ 81E1CE7 +RustboroCity_Text_MayMrBrineyHint: @ 81E1CE7 .string "MAY: Oh, by the way, MR. BRINEY, who\n" .string "I just passed…\p" .string "{PLAYER}{KUN}, you just moved here so you\n" .string "might not know this, but MR. BRINEY\l" .string "was once a revered seafarer.$" -RustboroCity_Text_1E1D7D: @ 81E1D7D +RustboroCity_Text_BrendanHiLetsRegister: @ 81E1D7D .string "BRENDAN: Oh, hey, {PLAYER}!\p" .string "You had a MATCH CALL feature put\n" .string "on your POKéNAV! Cool!\p" @@ -1190,11 +1205,11 @@ RustboroCity_Text_1E1D7D: @ 81E1D7D .string "get in touch anytime!\p" .string "… … … … … …$" -RustboroCity_Text_1E1E11: @ 81E1E11 +RustboroCity_Text_RegisteredBrendan: @ 81E1E11 .string "Registered BRENDAN\n" .string "in the POKéNAV.$" -RustboroCity_Text_1E1E34: @ 81E1E34 +RustboroCity_Text_BrendanPassedBrineyWantToBattle: @ 81E1E34 .string "BRENDAN: By the way, {PLAYER}, I walked\n" .string "by MR. BRINEY in PETALBURG WOODS.\p" .string "I bet he was on his way home to his\n" @@ -1205,72 +1220,72 @@ RustboroCity_Text_1E1E34: @ 81E1E34 .string "Want to have a battle to test how\n" .string "far you've progressed?$" -RustboroCity_Text_1E1F2F: @ 81E1F2F +RustboroCity_Text_BrendanNoConfidenceInPokemon: @ 81E1F2F .string "BRENDAN: What's the matter? Don't have\n" .string "any confidence in your POKéMON?$" -RustboroCity_Text_1E1F76: @ 81E1F76 +RustboroCity_Text_BrendanWantToBattle: @ 81E1F76 .string "BRENDAN: What's up?\n" .string "Want to have a battle with me?$" -RustboroCity_Text_1E1FA9: @ 81E1FA9 +RustboroCity_Text_BrendanIWontGoEasy: @ 81E1FA9 .string "BRENDAN: I know you just became\n" .string "a TRAINER, but I won't go easy!$" -RustboroCity_Text_1E1FE9: @ 81E1FE9 +RustboroCity_Text_BrendanDefeat: @ 81E1FE9 .string "Hmm…\n" .string "You're pretty good.$" -RustboroCity_Text_1E2002: @ 81E2002 +RustboroCity_Text_BrendanMrBrineyHint: @ 81E2002 .string "BRENDAN: By the way, you know\n" .string "MR. BRINEY? The guy I just passed?\p" .string "I bet you didn't know this, since you\n" .string "just moved here, {PLAYER}, but\l" .string "MR. BRINEY was once a great sailor.$" -RustboroCity_Text_1E20A6: @ 81E20A6 +RustboroCity_Text_TunnelNearingCompletion: @ 81E20A6 .string "“Timesaving tunnel nearing\n" .string "completion!”\p" .string "…Is what it says on the sign, but\n" .string "there's also a big “X” splashed\l" .string "across it in red paint…$" -RustboroCity_Text_1E2128: @ 81E2128 +RustboroCity_Text_DevonCorpSign: @ 81E2128 .string "DEVON CORPORATION\p" .string "“For all your living needs, we make\n" .string "it all.”$" -RustboroCity_Text_1E2167: @ 81E2167 +RustboroCity_Text_GymSign: @ 81E2167 .string "RUSTBORO CITY POKéMON GYM\n" .string "LEADER: ROXANNE\p" .string "“The ROCK-loving honors student!”$" -RustboroCity_Text_1E21B3: @ 81E21B3 +RustboroCity_Text_DevonCorpBranchOfficeSign: @ 81E21B3 .string "DEVON CORP. BRANCH OFFICE\p" .string "“Access limited to DEVON employees\n" .string "and authorized personnel.”$" -RustboroCity_Text_1E220B: @ 81E220B +RustboroCity_Text_CitySign: @ 81E220B .string "RUSTBORO CITY\p" .string "“The city probing the integration of\n" .string "nature and science.”$" -RustboroCity_Text_1E2253: @ 81E2253 +RustboroCity_Text_TrainersSchoolSign: @ 81E2253 .string "POKéMON TRAINER'S SCHOOL\p" .string "“We'll teach you anything about\n" .string "POKéMON!”$" -RustboroCity_Text_1E2296: @ 81E2296 +RustboroCity_Text_CuttersHouse: @ 81E2296 .string "CUTTER'S HOUSE$" -RustboroCity_Text_1E22A5: @ 81E22A5 +RustboroCity_Text_DevelopedNewPokenavFeature: @ 81E22A5 .string "I've been developing an added feature\n" .string "for the POKéNAV…\p" .string "And it turned out great!\p" .string "{PLAYER}, may I see that POKéNAV?\n" .string "The one our PRESIDENT gave you?$" -RustboroCity_Text_1E2331: @ 81E2331 +RustboroCity_Text_AddedMatchCallPleaseCallMrStone: @ 81E2331 .string "There you go, {PLAYER}!\p" .string "I added a new feature named\n" .string "MATCH CALL to your POKéNAV.\p" @@ -1282,14 +1297,14 @@ RustboroCity_Text_1E2331: @ 81E2331 .string "Test it out.\n" .string "Please give our PRESIDENT a call.$" -RustboroCity_Text_1E2449: @ 81E2449 +RustboroCity_Text_PleaseSelectPokenav: @ 81E2449 .string "Please select the POKéNAV.$" -RustboroCity_Text_1E2464: @ 81E2464 +RustboroCity_Text_IdBetterGetBackToWork: @ 81E2464 .string "Okay, I'd better get back to work.\n" .string "Please take care, {PLAYER}!$" -RustboroCity_Text_1E249D: @ 81E249D +RustboroCity_Text_YouCanHave2On2Battle: @ 81E249D .string "Did you know this?\p" .string "You can have a 2-on-2 battle even\n" .string "if you're not with another TRAINER.\p" diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index 134b9f726..a4bc47476 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_CuttersHouse_EventScript_215BD4", + "script": "RustboroCity_CuttersHouse_EventScript_Cutter", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_CuttersHouse_EventScript_215C0A", + "script": "RustboroCity_CuttersHouse_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index ab74d5340..f19d56a2d 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -1,27 +1,27 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8215BD3 .byte 0 -RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 +RustboroCity_CuttersHouse_EventScript_Cutter:: @ 8215BD4 lock faceplayer - goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_215C00 - msgbox RustboroCity_CuttersHouse_Text_215C13, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_ExplainCut + msgbox RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse, MSGBOX_DEFAULT giveitem_std ITEM_HM01 setflag FLAG_RECEIVED_HM01 - msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT + msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT release end -RustboroCity_CuttersHouse_EventScript_215C00:: @ 8215C00 - msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT +RustboroCity_CuttersHouse_EventScript_ExplainCut:: @ 8215C00 + msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT release end -RustboroCity_CuttersHouse_EventScript_215C0A:: @ 8215C0A - msgbox RustboroCity_CuttersHouse_Text_215E39, MSGBOX_NPC +RustboroCity_CuttersHouse_EventScript_Lass:: @ 8215C0A + msgbox RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees, MSGBOX_NPC end -RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 +RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse: @ 8215C13 .string "That determined expression…\n" .string "That limber way you move…\l" .string "And your well-trained POKéMON…\p" @@ -33,7 +33,7 @@ RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 .string "No need to be modest or shy.\n" .string "Go on, take it!$" -RustboroCity_CuttersHouse_Text_215D33: @ 8215D33 +RustboroCity_CuttersHouse_Text_ExplainCut: @ 8215D33 .string "That HIDDEN MACHINE, or HM for\n" .string "short, is CUT.\p" .string "An HM move is one that can be used\n" @@ -44,7 +44,7 @@ RustboroCity_CuttersHouse_Text_215D33: @ 8215D33 .string "And, unlike a TM, an HM can be used\n" .string "more than once.$" -RustboroCity_CuttersHouse_Text_215E39: @ 8215E39 +RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees: @ 8215E39 .string "When they were expanding the city of\n" .string "RUSTBORO, my dad helped out.\p" .string "He made his POKéMON use CUT to clear\n" diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index c841406b8..b7dbdb3d5 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_PokenavFeatureScientist", + "script": "RustboroCity_DevonCorp_2F_EventScript_MatchCallScientist", "flag": "0" } ], diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 2db001f0d..d2a5acd0f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -277,7 +277,7 @@ RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect:: @ 8211BCD release end -RustboroCity_DevonCorp_2F_EventScript_PokenavFeatureScientist:: @ 8211BCF +RustboroCity_DevonCorp_2F_EventScript_MatchCallScientist:: @ 8211BCF lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index b4eee4866..27152e8d6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -66,7 +66,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_BRINEY_LOCATION, 1 - clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL + clearflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setvar VAR_DEVON_CORP_3F_STATE, 1 setvar VAR_RUSTBORO_CITY_STATE, 6 releaseall diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index bc016aa2c..a35fe32cf 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_1F_EventScript_2150CE", + "script": "RustboroCity_Flat1_1F_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_1F_EventScript_2150D7", + "script": "RustboroCity_Flat1_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc index 9cff0b010..c52c7f069 100644 --- a/data/maps/RustboroCity_Flat1_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc @@ -1,18 +1,18 @@ RustboroCity_Flat1_1F_MapScripts:: @ 82150CD .byte 0 -RustboroCity_Flat1_1F_EventScript_2150CE:: @ 82150CE - msgbox RustboroCity_Flat1_1F_Text_2150E0, MSGBOX_NPC +RustboroCity_Flat1_1F_EventScript_Man:: @ 82150CE + msgbox RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility, MSGBOX_NPC end -RustboroCity_Flat1_1F_EventScript_2150D7:: @ 82150D7 - msgbox RustboroCity_Flat1_1F_Text_215115, MSGBOX_NPC +RustboroCity_Flat1_1F_EventScript_Woman:: @ 82150D7 + msgbox RustboroCity_Flat1_1F_Text_PokemonStrange, MSGBOX_NPC end -RustboroCity_Flat1_1F_Text_2150E0: @ 82150E0 +RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility: @ 82150E0 .string "Every POKéMON has a special ability\n" .string "that it can use.$" -RustboroCity_Flat1_1F_Text_215115: @ 8215115 +RustboroCity_Flat1_1F_Text_PokemonStrange: @ 8215115 .string "POKéMON are such strange creatures.$" diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 5c047888e..b937d323a 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_21523D", + "script": "RustboroCity_Flat1_2F_EventScript_WaldasMom", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_21513A", + "script": "RustboroCity_Flat1_2F_EventScript_WaldasDad", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 5a4b50ccc..4295f0447 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -1,90 +1,90 @@ RustboroCity_Flat1_2F_MapScripts:: @ 8215139 .byte 0 -RustboroCity_Flat1_2F_EventScript_21513A:: @ 821513A +RustboroCity_Flat1_2F_EventScript_WaldasDad:: @ 821513A lock faceplayer specialvar VAR_RESULT, TryBufferWaldaPhrase - compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Flat1_2F_EventScript_21518D - compare VAR_RESULT, 1 - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151AD + compare VAR_RESULT, FALSE + goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase + compare VAR_RESULT, TRUE + goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase -RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 +RustboroCity_Flat1_2F_EventScript_GivePhrase:: @ 8215157 special DoWaldaNamingScreen waitstate compare VAR_0x8004, 1 - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151D7 + goto_if_eq RustboroCity_Flat1_2F_EventScript_CancelGivePhrase compare VAR_0x8004, 2 - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151E1 + goto_if_eq RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase - compare VAR_RESULT, 1 - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151F8 - compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Flat1_2F_EventScript_215221 + compare VAR_RESULT, TRUE + goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase + compare VAR_RESULT, FALSE + goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase end -RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D - msgbox RustboroCity_Flat1_2F_Text_2152FA, MSGBOX_YESNO +RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase:: @ 821518D + msgbox RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT - goto RustboroCity_Flat1_2F_EventScript_215157 + goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase + msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT + goto RustboroCity_Flat1_2F_EventScript_GivePhrase -RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD - msgbox RustboroCity_Flat1_2F_Text_215448, MSGBOX_YESNO +RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase:: @ 82151AD + msgbox RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT - goto RustboroCity_Flat1_2F_EventScript_215157 + goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase + msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT + goto RustboroCity_Flat1_2F_EventScript_GivePhrase -RustboroCity_Flat1_2F_EventScript_2151CD:: @ 82151CD - msgbox RustboroCity_Flat1_2F_Text_2154E7, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase:: @ 82151CD + msgbox RustboroCity_Flat1_2F_Text_OhIsThatRight, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_2151D7:: @ 82151D7 - msgbox RustboroCity_Flat1_2F_Text_2156E3, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_CancelGivePhrase:: @ 82151D7 + msgbox RustboroCity_Flat1_2F_Text_OhYouDontKnowAny, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_2151E1:: @ 82151E1 - msgbox RustboroCity_Flat1_2F_Text_21561E, MSGBOX_DEFAULT - call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215699, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase:: @ 82151E1 + msgbox RustboroCity_Flat1_2F_Text_ThinkOfMyOwnPhrase, MSGBOX_DEFAULT + call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda + msgbox RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll2, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 - msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT - call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase:: @ 82151F8 + msgbox RustboroCity_Flat1_2F_Text_LetsGiveItATry2, MSGBOX_DEFAULT + call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda + msgbox RustboroCity_Flat1_2F_Text_OhShesLaughing, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT + msgbox RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_215221:: @ 8215221 - msgbox RustboroCity_Flat1_2F_Text_2155A4, MSGBOX_DEFAULT - call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_2155D4, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase:: @ 8215221 + msgbox RustboroCity_Flat1_2F_Text_LetsGiveItATry, MSGBOX_DEFAULT + call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda + msgbox RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_215238:: @ 8215238 +RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda:: @ 8215238 turnobject 6, DIR_EAST return -RustboroCity_Flat1_2F_EventScript_21523D:: @ 821523D - msgbox RustboroCity_Flat1_2F_Text_21524F, MSGBOX_NPC +RustboroCity_Flat1_2F_EventScript_WaldasMom:: @ 821523D + msgbox RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard, MSGBOX_NPC end -RustboroCity_Flat1_2F_EventScript_215246:: @ 8215246 - msgbox RustboroCity_Flat1_2F_Text_215923, MSGBOX_SIGN +RustboroCity_Flat1_2F_EventScript_PokeDoll:: @ 8215246 + msgbox RustboroCity_Flat1_2F_Text_ItsAPokemonPlushDoll, MSGBOX_SIGN end -RustboroCity_Flat1_2F_Text_21524F: @ 821524F +RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard: @ 821524F .string "Oh, it's so hard every day…\p" .string "What's hard?\n" .string "You need to ask?\p" @@ -93,7 +93,7 @@ RustboroCity_Flat1_2F_Text_21524F: @ 821524F .string "It really isn't easy coming up with\n" .string "meals every day.$" -RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA +RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase: @ 82152FA .string "Oh, hello!\n" .string "Welcome to the PEPPER household.\p" .string "I have a question for you.\n" @@ -107,62 +107,62 @@ RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA .string "Do you know of a funny word or\n" .string "phrase you can tell me?$" -RustboroCity_Flat1_2F_Text_215448: @ 8215448 +RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase: @ 8215448 .string "I've been saying “{STR_VAR_1}”\n" .string "to amuse her lately.\p" .string "Do you know of a better word or\n" .string "a phrase that might work?$" -RustboroCity_Flat1_2F_Text_2154AD: @ 82154AD +RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion: @ 82154AD .string "Oh, that's wonderful.\n" .string "So, let's hear it, your suggestion.$" -RustboroCity_Flat1_2F_Text_2154E7: @ 82154E7 +RustboroCity_Flat1_2F_Text_OhIsThatRight: @ 82154E7 .string "Oh, is that right?\p" .string "Well, if you come up with a good\n" .string "suggestion, I'm all ears.$" -RustboroCity_Flat1_2F_Text_215535: @ 8215535 +RustboroCity_Flat1_2F_Text_LetsGiveItATry2: @ 8215535 .string "Ah, I see.\n" .string "Well, let's give it a try, shall we?$" -RustboroCity_Flat1_2F_Text_215565: @ 8215565 +RustboroCity_Flat1_2F_Text_OhShesLaughing: @ 8215565 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" .string "Oh, yes! She's laughing!\n" .string "Oh, I am as delighted as she!$" -RustboroCity_Flat1_2F_Text_2155A4: @ 82155A4 +RustboroCity_Flat1_2F_Text_LetsGiveItATry: @ 82155A4 .string "Ah, I see.\n" .string "Well, let's give it a try, shall we?$" -RustboroCity_Flat1_2F_Text_2155D4: @ 82155D4 +RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll: @ 82155D4 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" .string "Hmmm… She's not smiling at all.\n" .string "Maybe WALDA is one serious child…$" -RustboroCity_Flat1_2F_Text_21561E: @ 821561E +RustboroCity_Flat1_2F_Text_ThinkOfMyOwnPhrase: @ 821561E .string "Oh, so you don't know any good words.\n" .string "I'd better think for myself, then.\p" .string "Hmm…\n" .string "How about “{STR_VAR_1}”?\l" .string "Let's see if that will work.$" -RustboroCity_Flat1_2F_Text_215699: @ 8215699 +RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll2: @ 8215699 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" .string "Hmmm… She's not smiling at all.\n" .string "Maybe WALDA is one serious child…$" -RustboroCity_Flat1_2F_Text_2156E3: @ 82156E3 +RustboroCity_Flat1_2F_Text_OhYouDontKnowAny: @ 82156E3 .string "Oh, so you don't know any good words.\n" .string "I guess I'll try to amuse her with\l" .string "the saying I used before.\p" .string "Anyways, if you have a good suggestion,\n" .string "don't hesitate in telling me, okay?$" -RustboroCity_Flat1_2F_Text_215792: @ 8215792 +RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper: @ 8215792 .string "Thank you!\p" .string "Thanks to you, my darling WALDA\n" .string "laughed for me!\p" @@ -179,6 +179,6 @@ RustboroCity_Flat1_2F_Text_215792: @ 8215792 .string "That will give you access to the new\n" .string "wallpaper patterns.$" -RustboroCity_Flat1_2F_Text_215923: @ 8215923 +RustboroCity_Flat1_2F_Text_ItsAPokemonPlushDoll: @ 8215923 .string "It's a POKéMON plush DOLL!$" diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 6d10fe9d8..6ca0fbd1b 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_1F_EventScript_215F80", + "script": "RustboroCity_Flat2_1F_EventScript_Skitty", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_1F_EventScript_215F77", + "script": "RustboroCity_Flat2_1F_EventScript_OldWoman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc index 8fc7e4972..182060955 100644 --- a/data/maps/RustboroCity_Flat2_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -1,24 +1,24 @@ RustboroCity_Flat2_1F_MapScripts:: @ 8215F76 .byte 0 -RustboroCity_Flat2_1F_EventScript_215F77:: @ 8215F77 - msgbox RustboroCity_Flat2_1F_Text_215F93, MSGBOX_NPC +RustboroCity_Flat2_1F_EventScript_OldWoman:: @ 8215F77 + msgbox RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere, MSGBOX_NPC end -RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 +RustboroCity_Flat2_1F_EventScript_Skitty:: @ 8215F80 lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox RustboroCity_Flat2_1F_Text_215FC6, MSGBOX_DEFAULT + msgbox RustboroCity_Flat2_1F_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end -RustboroCity_Flat2_1F_Text_215F93: @ 8215F93 +RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere: @ 8215F93 .string "DEVON CORPORATION's workers live in\n" .string "this building.$" -RustboroCity_Flat2_1F_Text_215FC6: @ 8215FC6 +RustboroCity_Flat2_1F_Text_Skitty: @ 8215FC6 .string "SKITTY: Gyaaaah!$" diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index a7d254e4d..9667ebf92 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_2F_EventScript_215FD8", + "script": "RustboroCity_Flat2_2F_EventScript_OldMan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_2F_EventScript_215FE1", + "script": "RustboroCity_Flat2_2F_EventScript_NinjaBoy", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index d4b940c9f..f328b71c1 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -1,15 +1,15 @@ RustboroCity_Flat2_2F_MapScripts:: @ 8215FD7 .byte 0 -RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 - msgbox RustboroCity_Flat2_2F_Text_21601A, MSGBOX_NPC +RustboroCity_Flat2_2F_EventScript_OldMan:: @ 8215FD8 + msgbox RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays, MSGBOX_NPC end -RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 +RustboroCity_Flat2_2F_EventScript_NinjaBoy:: @ 8215FE1 lock faceplayer - goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_216010 - msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_GavePremierBall + msgbox RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -17,21 +17,21 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 release end -RustboroCity_Flat2_2F_EventScript_216010:: @ 8216010 - msgbox RustboroCity_Flat2_2F_Text_2160BD, MSGBOX_DEFAULT +RustboroCity_Flat2_2F_EventScript_GavePremierBall:: @ 8216010 + msgbox RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo, MSGBOX_DEFAULT release end -RustboroCity_Flat2_2F_Text_21601A: @ 821601A +RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays: @ 821601A .string "Way back in the old days, DEVON was just\n" .string "a teeny, tiny company.$" -RustboroCity_Flat2_2F_Text_21605A: @ 821605A +RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt: @ 821605A .string "My daddy's working at the CORPORATION.\p" .string "My daddy made this!\n" .string "But I can't use it, so you can have it.$" -RustboroCity_Flat2_2F_Text_2160BD: @ 82160BD +RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo: @ 82160BD .string "My daddy's working at the CORPORATION.\p" .string "When I grow up, I'm going to work for\n" .string "DEVON, too.$" diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 2366b5392..a9c1e40cd 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_3F_EventScript_216117", + "script": "RustboroCity_Flat2_3F_EventScript_DevonEmployee", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_3F_EventScript_216120", + "script": "RustboroCity_Flat2_3F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc index dd5a86dae..8af31531d 100644 --- a/data/maps/RustboroCity_Flat2_3F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -1,19 +1,19 @@ RustboroCity_Flat2_3F_MapScripts:: @ 8216116 .byte 0 -RustboroCity_Flat2_3F_EventScript_216117:: @ 8216117 - msgbox RustboroCity_Flat2_3F_Text_216129, MSGBOX_NPC +RustboroCity_Flat2_3F_EventScript_DevonEmployee:: @ 8216117 + msgbox RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones, MSGBOX_NPC end -RustboroCity_Flat2_3F_EventScript_216120:: @ 8216120 - msgbox RustboroCity_Flat2_3F_Text_216159, MSGBOX_NPC +RustboroCity_Flat2_3F_EventScript_Woman:: @ 8216120 + msgbox RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones, MSGBOX_NPC end -RustboroCity_Flat2_3F_Text_216129: @ 8216129 +RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones: @ 8216129 .string "DEVON's PRESIDENT likes to collect\n" .string "rare stones.$" -RustboroCity_Flat2_3F_Text_216159: @ 8216159 +RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones: @ 8216159 .string "I think the PRESIDENT's son also\n" .string "collects rare stones.$" diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index bc889d66b..5d3000846 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House1_EventScript_21593F", + "script": "RustboroCity_House1_EventScript_Trader", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House1_EventScript_2159DF", + "script": "RustboroCity_House1_EventScript_Hiker", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index f578b251b..cf1cec610 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -1,58 +1,58 @@ RustboroCity_House1_MapScripts:: @ 821593E .byte 0 -RustboroCity_House1_EventScript_21593F:: @ 821593F +RustboroCity_House1_EventScript_Trader:: @ 821593F lock faceplayer - goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5 + goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_TradeCompleted setvar VAR_0x8008, INGAME_TRADE_SEEDOT copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO + msgbox RustboroCity_House1_Text_IllTradeIfYouWant, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_House1_EventScript_2159BD + goto_if_eq RustboroCity_House1_EventScript_DeclineTrade special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq RustboroCity_House1_EventScript_2159BD + goto_if_eq RustboroCity_House1_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne RustboroCity_House1_EventScript_2159C7 + goto_if_ne RustboroCity_House1_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate - msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT + msgbox RustboroCity_House1_Text_PleaseBeGoodToMyPokemon, MSGBOX_DEFAULT setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED release end -RustboroCity_House1_EventScript_2159BD:: @ 82159BD - msgbox RustboroCity_House1_Text_215ACE, MSGBOX_DEFAULT +RustboroCity_House1_EventScript_DeclineTrade:: @ 82159BD + msgbox RustboroCity_House1_Text_YouDontWantToThatsOkay, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_2159C7:: @ 82159C7 +RustboroCity_House1_EventScript_NotRequestedMon:: @ 82159C7 bufferspeciesname 0, VAR_0x8009 - msgbox RustboroCity_House1_Text_215A9D, MSGBOX_DEFAULT + msgbox RustboroCity_House1_Text_DoesntLookLikeMonToMe, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_2159D5:: @ 82159D5 - msgbox RustboroCity_House1_Text_215B17, MSGBOX_DEFAULT +RustboroCity_House1_EventScript_TradeCompleted:: @ 82159D5 + msgbox RustboroCity_House1_Text_AnyPokemonCanBeCute, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_2159DF:: @ 82159DF - msgbox RustboroCity_House1_Text_215B57, MSGBOX_NPC +RustboroCity_House1_EventScript_Hiker:: @ 82159DF + msgbox RustboroCity_House1_Text_AllSortsOfPlaces, MSGBOX_NPC end -RustboroCity_House1_Text_2159E8: @ 82159E8 +RustboroCity_House1_Text_IllTradeIfYouWant: @ 82159E8 .string "Huh? My POKéMON is cute?\n" .string "Sure, I knew that.\p" .string "But if you really want, I'm willing\n" @@ -60,23 +60,23 @@ RustboroCity_House1_Text_2159E8: @ 82159E8 .string "I'll trade you my {STR_VAR_2} for\n" .string "a {STR_VAR_1} if you want.$" -RustboroCity_House1_Text_215A77: @ 8215A77 +RustboroCity_House1_Text_PleaseBeGoodToMyPokemon: @ 8215A77 .string "Eheheh…\n" .string "Please be good to my POKéMON.$" -RustboroCity_House1_Text_215A9D: @ 8215A9D +RustboroCity_House1_Text_DoesntLookLikeMonToMe: @ 8215A9D .string "Huh? That doesn't look anything like\n" .string "a {STR_VAR_1} to me.$" -RustboroCity_House1_Text_215ACE: @ 8215ACE +RustboroCity_House1_Text_YouDontWantToThatsOkay: @ 8215ACE .string "Oh, if you don't want to, that's okay.\n" .string "But my POKéMON is cute, you know…$" -RustboroCity_House1_Text_215B17: @ 8215B17 +RustboroCity_House1_Text_AnyPokemonCanBeCute: @ 8215B17 .string "Any POKéMON can be cute if you raise\n" .string "it with care and kindness.$" -RustboroCity_House1_Text_215B57: @ 8215B57 +RustboroCity_House1_Text_AllSortsOfPlaces: @ 8215B57 .string "In all sorts of places, there are all\n" .string "sorts of POKéMON and people.\p" .string "I find that fascinating, so I go to all\n" diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index b10b2c074..6dcd38ab4 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House2_EventScript_215EB4", + "script": "RustboroCity_House2_EventScript_PokefanF", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House2_EventScript_215EBD", + "script": "RustboroCity_House2_EventScript_LittleGirl", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc index 632eb6877..c8e80ee9f 100644 --- a/data/maps/RustboroCity_House2/scripts.inc +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -1,20 +1,20 @@ RustboroCity_House2_MapScripts:: @ 8215EB3 .byte 0 -RustboroCity_House2_EventScript_215EB4:: @ 8215EB4 - msgbox RustboroCity_House2_Text_215EC6, MSGBOX_NPC +RustboroCity_House2_EventScript_PokefanF:: @ 8215EB4 + msgbox RustboroCity_House2_Text_TrainerSchoolExcellent, MSGBOX_NPC end -RustboroCity_House2_EventScript_215EBD:: @ 8215EBD - msgbox RustboroCity_House2_Text_215F21, MSGBOX_NPC +RustboroCity_House2_EventScript_LittleGirl:: @ 8215EBD + msgbox RustboroCity_House2_Text_RoxanneKnowsALot, MSGBOX_NPC end -RustboroCity_House2_Text_215EC6: @ 8215EC6 +RustboroCity_House2_Text_TrainerSchoolExcellent: @ 8215EC6 .string "The TRAINER'S SCHOOL is excellent.\p" .string "If you study there, you could even\n" .string "become a GYM LEADER.$" -RustboroCity_House2_Text_215F21: @ 8215F21 +RustboroCity_House2_Text_RoxanneKnowsALot: @ 8215F21 .string "ROXANNE, the GYM LEADER, really knows\n" .string "a lot about POKéMON.\p" .string "She's really strong, too!$" diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 50b5f1295..66fa98833 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_216191", + "script": "RustboroCity_House3_EventScript_OldMan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_21619A", + "script": "RustboroCity_House3_EventScript_OldWoman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_2161A3", + "script": "RustboroCity_House3_EventScript_Pekachu", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc index 04992fbba..d55166e67 100644 --- a/data/maps/RustboroCity_House3/scripts.inc +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -1,36 +1,37 @@ RustboroCity_House3_MapScripts:: @ 8216190 .byte 0 -RustboroCity_House3_EventScript_216191:: @ 8216191 - msgbox RustboroCity_House3_Text_2161B6, MSGBOX_NPC +RustboroCity_House3_EventScript_OldMan:: @ 8216191 + msgbox RustboroCity_House3_Text_IGivePerfectlySuitedNicknames, MSGBOX_NPC end -RustboroCity_House3_EventScript_21619A:: @ 821619A - msgbox RustboroCity_House3_Text_21622A, MSGBOX_NPC +RustboroCity_House3_EventScript_OldWoman:: @ 821619A + msgbox RustboroCity_House3_Text_NamingPikachuPekachu, MSGBOX_NPC end -RustboroCity_House3_EventScript_2161A3:: @ 82161A3 +@ Misspelling on purpose, see nickname +RustboroCity_House3_EventScript_Pekachu:: @ 82161A3 lock faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox RustboroCity_House3_Text_2162AB, MSGBOX_DEFAULT + msgbox RustboroCity_House3_Text_Pekachu, MSGBOX_DEFAULT waitmoncry release end -RustboroCity_House3_Text_2161B6: @ 82161B6 +RustboroCity_House3_Text_IGivePerfectlySuitedNicknames: @ 82161B6 .string "For my own POKéMON, I give them\n" .string "perfectly suited nicknames!\p" .string "It's my expression of, uh…\n" .string "originality, yes, that's it!$" -RustboroCity_House3_Text_21622A: @ 821622A +RustboroCity_House3_Text_NamingPikachuPekachu: @ 821622A .string "But giving the name PEKACHU to\n" .string "a PIKACHU? It seems pointless.\p" .string "I suppose it is good to use a name\n" .string "that's easy to understand, but…$" -RustboroCity_House3_Text_2162AB: @ 82162AB +RustboroCity_House3_Text_Pekachu: @ 82162AB .string "PEKACHU: Peka!$" diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index 614b123c4..a60add1ee 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F5F", + "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid1", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F68", + "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid2", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F71", + "script": "RustboroCity_PokemonSchool_EventScript_RichBoy", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F7A", + "script": "RustboroCity_PokemonSchool_EventScript_Lass", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F83", + "script": "RustboroCity_PokemonSchool_EventScript_SchoolKidM", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F95", + "script": "RustboroCity_PokemonSchool_EventScript_Teacher", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_214040", + "script": "RustboroCity_PokemonSchool_EventScript_Scott", "flag": "FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT" } ], @@ -130,7 +130,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -138,7 +138,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -146,7 +146,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -154,7 +154,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -162,7 +162,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213F8C" + "script": "RustboroCity_PokemonSchool_EventScript_StudentNotebook" } ] }
\ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index db4bf21f0..9fb4146da 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -1,88 +1,88 @@ RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8 .byte 0 -RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9 +RustboroCity_PokemonSchool_EventScript_Blackboard:: @ 8213EA9 lockall - msgbox RustboroCity_PokemonSchool_Text_2140B2, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 + msgbox RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8 - message RustboroCity_PokemonSchool_Text_2140F9 +RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic:: @ 8213EB8 + message RustboroCity_PokemonSchool_Text_ReadWhichTopic waitmessage multichoicegrid 8, 1, MULTI_STATUS_INFO, 3, 0 switch VAR_RESULT - case 0, RustboroCity_PokemonSchool_EventScript_213F17 - case 1, RustboroCity_PokemonSchool_EventScript_213F25 - case 2, RustboroCity_PokemonSchool_EventScript_213F33 - case 3, RustboroCity_PokemonSchool_EventScript_213F41 - case 4, RustboroCity_PokemonSchool_EventScript_213F4F - case 5, RustboroCity_PokemonSchool_EventScript_213F5D - case MULTI_B_PRESSED, RustboroCity_PokemonSchool_EventScript_213F5D + case 0, RustboroCity_PokemonSchool_EventScript_Poison + case 1, RustboroCity_PokemonSchool_EventScript_Paralysis + case 2, RustboroCity_PokemonSchool_EventScript_Sleep + case 3, RustboroCity_PokemonSchool_EventScript_Burn + case 4, RustboroCity_PokemonSchool_EventScript_Freeze + case 5, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect + case MULTI_B_PRESSED, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect end -RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17 - msgbox RustboroCity_PokemonSchool_Text_21411A, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Poison:: @ 8213F17 + msgbox RustboroCity_PokemonSchool_Text_ExplainPoison, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25 - msgbox RustboroCity_PokemonSchool_Text_2141D8, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Paralysis:: @ 8213F25 + msgbox RustboroCity_PokemonSchool_Text_ExplainParalysis, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33 - msgbox RustboroCity_PokemonSchool_Text_21427D, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Sleep:: @ 8213F33 + msgbox RustboroCity_PokemonSchool_Text_ExplainSleep, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41 - msgbox RustboroCity_PokemonSchool_Text_214336, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Burn:: @ 8213F41 + msgbox RustboroCity_PokemonSchool_Text_ExplainBurn, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F - msgbox RustboroCity_PokemonSchool_Text_2143B8, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Freeze:: @ 8213F4F + msgbox RustboroCity_PokemonSchool_Text_ExplainFreeze, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D +RustboroCity_PokemonSchool_EventScript_ExitTopicSelect:: @ 8213F5D releaseall end -RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F - msgbox RustboroCity_PokemonSchool_Text_21459F, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_GameboyKid1:: @ 8213F5F + msgbox RustboroCity_PokemonSchool_Text_TradingRightNow, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68 - msgbox RustboroCity_PokemonSchool_Text_2145CD, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_GameboyKid2:: @ 8213F68 + msgbox RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71 - msgbox RustboroCity_PokemonSchool_Text_214604, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_RichBoy:: @ 8213F71 + msgbox RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A - msgbox RustboroCity_PokemonSchool_Text_214669, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_Lass:: @ 8213F7A + msgbox RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83 - msgbox RustboroCity_PokemonSchool_Text_214719, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_SchoolKidM:: @ 8213F83 + msgbox RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C - msgbox RustboroCity_PokemonSchool_Text_2147A2, MSGBOX_SIGN +RustboroCity_PokemonSchool_EventScript_StudentNotebook:: @ 8213F8C + msgbox RustboroCity_PokemonSchool_Text_StudentsNotes, MSGBOX_SIGN end -RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 +RustboroCity_PokemonSchool_EventScript_Teacher:: @ 8213F95 lock faceplayer - goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_213FFB + goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_GaveQuickClaw compare VAR_FACING, DIR_EAST - call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5 + call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast compare VAR_FACING, DIR_WEST - call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0 - msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT + call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest + msgbox RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -93,25 +93,25 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 release end -RustboroCity_PokemonSchool_EventScript_213FE5:: @ 8213FE5 - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214027 +RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast:: @ 8213FE5 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast waitmovement 0 return -RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214010 +RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest:: @ 8213FF0 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest waitmovement 0 return -RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB - msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT +RustboroCity_PokemonSchool_EventScript_GaveQuickClaw:: @ 8213FFB + msgbox RustboroCity_PokemonSchool_Text_ExplainQuickClaw, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 release end -RustboroCity_PokemonSchool_Movement_214010: @ 8214010 +RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest: @ 8214010 walk_left walk_down walk_down @@ -136,7 +136,7 @@ RustboroCity_PokemonSchool_Movement_214010: @ 8214010 walk_right step_end -RustboroCity_PokemonSchool_Movement_214027: @ 8214027 +RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast: @ 8214027 walk_right walk_right walk_down @@ -163,53 +163,53 @@ RustboroCity_PokemonSchool_Movement_214027: @ 8214027 walk_left step_end -RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 +RustboroCity_PokemonSchool_EventScript_Scott:: @ 8214040 lock faceplayer - goto_if_set FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE, RustboroCity_PokemonSchool_EventScript_2140A8 - goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F - goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082 - msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT + goto_if_set FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE, RustboroCity_PokemonSchool_EventScript_ScottWatchStudents + goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_ScottSpokeAlready + goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_ScottGreetHasBadge + msgbox RustboroCity_PokemonSchool_Text_ScottMetAlreadyCut, MSGBOX_DEFAULT addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_RUSTBORO release end -RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F - goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214090 - msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT +RustboroCity_PokemonSchool_EventScript_ScottSpokeAlready:: @ 821406F + goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_ScottNoticeBadge + msgbox RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown, MSGBOX_DEFAULT release end -RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082 - msgbox RustboroCity_PokemonSchool_Text_214B8A, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_21409E +RustboroCity_PokemonSchool_EventScript_ScottGreetHasBadge:: @ 8214082 + msgbox RustboroCity_PokemonSchool_Text_ScottMetAlreadyStoneBadge, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge end -RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 - msgbox RustboroCity_PokemonSchool_Text_214AB6, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_21409E +RustboroCity_PokemonSchool_EventScript_ScottNoticeBadge:: @ 8214090 + msgbox RustboroCity_PokemonSchool_Text_ScottStoneBadge, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge end -RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E +RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge:: @ 821409E addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE release end -RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8 - msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT +RustboroCity_PokemonSchool_EventScript_ScottWatchStudents:: @ 82140A8 + msgbox RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown, MSGBOX_DEFAULT release end -RustboroCity_PokemonSchool_Text_2140B2: @ 82140B2 +RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges: @ 82140B2 .string "The blackboard lists status changes\n" .string "that may affect POKéMON in battle.$" -RustboroCity_PokemonSchool_Text_2140F9: @ 82140F9 +RustboroCity_PokemonSchool_Text_ReadWhichTopic: @ 82140F9 .string "Which topic do you want to read?$" -RustboroCity_PokemonSchool_Text_21411A: @ 821411A +RustboroCity_PokemonSchool_Text_ExplainPoison: @ 821411A .string "If a POKéMON is poisoned, it will\n" .string "steadily lose HP.\p" .string "The effects of poison remain after\n" @@ -218,7 +218,7 @@ RustboroCity_PokemonSchool_Text_21411A: @ 821411A .string "while it is traveling.\p" .string "Heal a poisoning using an ANTIDOTE.$" -RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8 +RustboroCity_PokemonSchool_Text_ExplainParalysis: @ 82141D8 .string "If a POKéMON becomes paralyzed,\n" .string "its SPEED drops.\p" .string "It may also not be able to move while\n" @@ -226,7 +226,7 @@ RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8 .string "Paralysis remains after battle.\n" .string "Cure it using a PARLYZ HEAL.$" -RustboroCity_PokemonSchool_Text_21427D: @ 821427D +RustboroCity_PokemonSchool_Text_ExplainSleep: @ 821427D .string "If a POKéMON falls asleep, it will be\n" .string "unable to attack.\p" .string "A POKéMON may wake up on its own,\n" @@ -234,26 +234,26 @@ RustboroCity_PokemonSchool_Text_21427D: @ 821427D .string "sleeping, it will stay asleep.\p" .string "Wake it up using an AWAKENING.$" -RustboroCity_PokemonSchool_Text_214336: @ 8214336 +RustboroCity_PokemonSchool_Text_ExplainBurn: @ 8214336 .string "A burn reduces ATTACK power, and it\n" .string "steadily reduces the victim's HP.\p" .string "A burn lingers after battle.\n" .string "Cure a burn using a BURN HEAL.$" -RustboroCity_PokemonSchool_Text_2143B8: @ 82143B8 +RustboroCity_PokemonSchool_Text_ExplainFreeze: @ 82143B8 .string "If a POKéMON is frozen, it becomes\n" .string "completely helpless.\p" .string "It will remain frozen after battle.\n" .string "Thaw it out using an ICE HEAL.$" -RustboroCity_PokemonSchool_Text_214433: @ 8214433 +RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw: @ 8214433 .string "Students who don't study get a little\n" .string "taste of my QUICK CLAW.\p" .string "Whether or not you are a good student \n" .string "will be evident from the way you use\l" .string "this item.$" -RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8 +RustboroCity_PokemonSchool_Text_ExplainQuickClaw: @ 82144C8 .string "A POKéMON holding the QUICK CLAW will\n" .string "occasionally speed up and get to move\l" .string "before its opponent.\p" @@ -262,20 +262,20 @@ RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8 .string "Just those alone will give you many\n" .string "topics to study!$" -RustboroCity_PokemonSchool_Text_21459F: @ 821459F +RustboroCity_PokemonSchool_Text_TradingRightNow: @ 821459F .string "I'm trading POKéMON with my friend\n" .string "right now.$" -RustboroCity_PokemonSchool_Text_2145CD: @ 82145CD +RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot: @ 82145CD .string "I always wanted a SEEDOT, and\n" .string "I'm finally getting one!$" -RustboroCity_PokemonSchool_Text_214604: @ 8214604 +RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems: @ 8214604 .string "POKéMON can hold items, but they\n" .string "don't know what to do with man-made\l" .string "items like POTION and ANTIDOTE.$" -RustboroCity_PokemonSchool_Text_214669: @ 8214669 +RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself: @ 8214669 .string "You know how some POKéMON moves can\n" .string "confuse a POKéMON?\p" .string "A confused POKéMON will sometimes\n" @@ -283,7 +283,7 @@ RustboroCity_PokemonSchool_Text_214669: @ 8214669 .string "But once it leaves battle, it will\n" .string "return to normal.$" -RustboroCity_PokemonSchool_Text_214719: @ 8214719 +RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry: @ 8214719 .string "A POKéMON holding a BERRY will heal\n" .string "itself…\p" .string "There are many kinds of items that\n" @@ -291,7 +291,7 @@ RustboroCity_PokemonSchool_Text_214719: @ 8214719 .string "Boy, it sure is hard taking notes\n" .string "down…$" -RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 +RustboroCity_PokemonSchool_Text_StudentsNotes: @ 82147A2 .string "It's this student's notebook…\p" .string "POKéMON are to be caught using\n" .string "POKé BALLS.\p" @@ -304,7 +304,7 @@ RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 .string "the strong TRAINERS who await\l" .string "challengers in POKéMON GYMS.$" -RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 +RustboroCity_PokemonSchool_Text_ScottMetAlreadyCut: @ 82148C0 .string "Hello? Didn't we meet before?\n" .string "I think back in PETALBURG CITY.\p" .string "Let me introduce myself.\n" @@ -320,12 +320,12 @@ RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 .string "If I remember correctly, someone in\n" .string "this town has CUT.$" -RustboroCity_PokemonSchool_Text_214A5F: @ 8214A5F +RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown: @ 8214A5F .string "SCOTT: Hmm…\p" .string "The talent levels of the students here\n" .string "are unknown. The potential's there.$" -RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6 +RustboroCity_PokemonSchool_Text_ScottStoneBadge: @ 8214AB6 .string "SCOTT: Oh, what's that?\p" .string "It's a STONE BADGE, isn't it?\n" .string "That's pretty impressive, I'd say.\p" @@ -334,7 +334,7 @@ RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6 .string "It's hard to tell what you're like as\n" .string "a TRAINER from a LEAGUE BADGE.$" -RustboroCity_PokemonSchool_Text_214B8A: @ 8214B8A +RustboroCity_PokemonSchool_Text_ScottMetAlreadyStoneBadge: @ 8214B8A .string "Hello? Didn't we meet before?\n" .string "I think back in PETALBURG CITY.\p" .string "Let me introduce myself.\n" diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index 4357199c4..e39c6eca6 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -95,7 +95,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_UNKNOWN_0x363 setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY diff --git a/data/specials.inc b/data/specials.inc index c8fd515db..62311ce14 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -479,7 +479,7 @@ gSpecials:: @ 81DBA64 def_special ShowFrontierGamblerLookingMessage def_special ShowFrontierGamblerGoMessage def_special Script_DoRayquazaScene - def_special sub_81C72A4 + def_special OpenPokenavForTutorial def_special ScriptMenu_CreateStartMenuForPokenavTutorial def_special CountPlayerTrainerStars def_special BufferBattleFrontierTutorMoveName diff --git a/include/constants/flags.h b/include/constants/flags.h index 687fea766..368f4f287 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -854,7 +854,7 @@ #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL 0x32B #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE 0x32C #define FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN 0x32D -#define FLAG_HIDE_RUSBORO_CITY_RIVAL 0x32E +#define FLAG_HIDE_RUSTBORO_CITY_RIVAL 0x32E #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL 0x32F #define FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE 0x330 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL 0x331 diff --git a/src/pokenav.c b/src/pokenav.c index 2a1647a6f..9f12380df 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -48,8 +48,8 @@ static void VBlankCB_Pokenav(void); static void CB2_Pokenav(void); static void Task_RunLoopedTask_LinkMode(u8 a0); static void Task_RunLoopedTask(u8 taskId); -static void sub_81C742C(u8 taskId); -static void sub_81C72BC(void); +static void Task_Pokenav(u8 taskId); +static void CB2_InitPokenavForTutorial(void); const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] = { @@ -311,19 +311,19 @@ void CB2_InitPokeNav(void) InitPokenavResources(gPokenavResources); ResetTasks(); SetVBlankCallback(NULL); - CreateTask(sub_81C742C, 0); + CreateTask(Task_Pokenav, 0); SetMainCallback2(CB2_Pokenav); SetVBlankCallback(VBlankCB_Pokenav); } } -void sub_81C72A4(void) +void OpenPokenavForTutorial(void) { - SetMainCallback2(sub_81C72BC); + SetMainCallback2(CB2_InitPokenavForTutorial); FadeScreen(1, 0); } -static void sub_81C72BC(void) +static void CB2_InitPokenavForTutorial(void) { UpdatePaletteFade(); if (gPaletteFade.active) @@ -342,7 +342,7 @@ static void sub_81C72BC(void) ResetSpriteData(); FreeAllSpritePalettes(); SetVBlankCallback(NULL); - CreateTask(sub_81C742C, 0); + CreateTask(Task_Pokenav, 0); SetMainCallback2(CB2_Pokenav); SetVBlankCallback(VBlankCB_Pokenav); } @@ -416,7 +416,7 @@ static void VBlankCB_Pokenav(void) ProcessSpriteCopyRequests(); } -static void sub_81C742C(u8 taskId) +static void Task_Pokenav(u8 taskId) { u32 v1; s16 *data = gTasks[taskId].data; |