diff options
27 files changed, 538 insertions, 1254 deletions
diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index c8ecf0a16..7222993be 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_EventScript_166075", + "script": "PewterCity_EventScript_Lass", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_EventScript_16607E", + "script": "PewterCity_EventScript_MuseumGuide", "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_EventScript_16622B", + "script": "PewterCity_EventScript_FatMan", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_EventScript_166244", + "script": "PewterCity_EventScript_BugCatcher", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_EventScript_165B9D", + "script": "PewterCity_EventScript_GymGuide", "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_EventScript_1662A9", + "script": "PewterCity_EventScript_RunningShoesAide", "flag": "FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY" } ], @@ -175,7 +175,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, - "script": "PewterCity_EventScript_165D8E" + "script": "PewterCity_EventScript_GymGuideTriggerTop" }, { "type": "trigger", @@ -184,7 +184,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, - "script": "PewterCity_EventScript_165D9A" + "script": "PewterCity_EventScript_GymGuideTriggerMid" }, { "type": "trigger", @@ -193,7 +193,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, - "script": "PewterCity_EventScript_165DA6" + "script": "PewterCity_EventScript_GymGuideTriggerBottom" }, { "type": "trigger", @@ -202,7 +202,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, - "script": "PewterCity_EventScript_165DB2" + "script": "PewterCity_EventScript_GymGuideTriggerRight" }, { "type": "trigger", @@ -211,7 +211,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 1, - "script": "PewterCity_EventScript_1662B7" + "script": "PewterCity_EventScript_RunningShoesAideTriggerTop" }, { "type": "trigger", @@ -220,7 +220,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 1, - "script": "PewterCity_EventScript_1662C4" + "script": "PewterCity_EventScript_RunningShoesAideTriggerMid" }, { "type": "trigger", @@ -229,7 +229,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 1, - "script": "PewterCity_EventScript_1662D1" + "script": "PewterCity_EventScript_RunningShoesAideTriggerBottom" } ], "bg_events": [ @@ -238,35 +238,35 @@ "x": 19, "y": 7, "elevation": 0, - "script": "PewterCity_EventScript_16627F" + "script": "PewterCity_EventScript_MuseumSign" }, { "type": "bg_event_type_0", "x": 39, "y": 19, "elevation": 0, - "script": "PewterCity_EventScript_166276" + "script": "PewterCity_EventScript_PoliceNotice" }, { "type": "bg_event_type_0", "x": 11, "y": 16, "elevation": 0, - "script": "PewterCity_EventScript_166288" + "script": "PewterCity_EventScript_GymSign" }, { "type": "bg_event_type_0", "x": 20, "y": 30, "elevation": 0, - "script": "PewterCity_EventScript_16626D" + "script": "PewterCity_EventScript_TrainerTips" }, { "type": "bg_event_type_0", "x": 31, "y": 25, "elevation": 0, - "script": "PewterCity_EventScript_1662A0" + "script": "PewterCity_EventScript_CitySign" }, { "type": "hidden_item", diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index fd8b6ec9a..83d8f4d35 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1,3 +1,7 @@ +.equ LOCALID_MUSEUM_GUIDE, 2 +.equ LOCALID_GYM_GUIDE, 5 +.equ LOCALID_AIDE, 7 + PewterCity_MapScripts:: @ 8165B8E map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_OnTransition .byte 0 @@ -7,60 +11,56 @@ PewterCity_OnTransition:: @ 8165B94 setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 0 end -PewterCity_EventScript_165B9D:: @ 8165B9D +@ Impossible to speak to this NPC from a facing dir != DIR_EAST normally, so they arent checked +@ Additionally, no movement script exists for facing DIR_SOUTH, which would necessitate walking out of bounds +PewterCity_EventScript_GymGuide:: @ 8165B9D lock faceplayer - msgbox gUnknown_817E67E + msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe closemessage playbgm MUS_ANNAI, 0 compare VAR_FACING, DIR_EAST - call_if_eq EventScript_165BD3 - msgbox gUnknown_817E6C7 + call_if_eq PewterCity_EventScript_WalkToGymEast + msgbox PewterCity_Text_GoTakeOnBrock closemessage - applymovement 5, Movement_165D83 + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit waitmovement 0 fadedefaultbgm - removeobject 5 + removeobject LOCALID_GYM_GUIDE clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE release end -EventScript_165BD3:: @ 8165BD3 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165C3C - applymovement 5, Movement_165CDE +PewterCity_EventScript_WalkToGymEast:: @ 8165BD3 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165C41 - applymovement 5, Movement_165CE3 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymEast + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast waitmovement 0 return -EventScript_165BF6:: @ 8165BF6 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165C80 - applymovement 5, Movement_165D23 +@ Unused +PewterCity_EventScript_WalkToGymWest:: @ 8165BF6 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165C82 - applymovement 5, Movement_165D25 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymWest + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest waitmovement 0 return -EventScript_165C19:: @ 8165C19 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165CAF - applymovement 5, Movement_165D53 +@ Unused +PewterCity_EventScript_WalkToGymNorth:: @ 8165C19 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165CB1 - applymovement 5, Movement_165D55 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymNorth + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth waitmovement 0 return -Movement_165C3C:: @ 8165C3C - delay_16 - delay_16 - delay_4 - walk_in_place_fastest_down - step_end - -Movement_165C41:: @ 8165C41 - walk_down +.macro walk_to_gym walk_left walk_left walk_left @@ -122,18 +122,9 @@ Movement_165C41:: @ 8165C41 walk_right walk_right walk_right - step_end - -Movement_165C80:: @ 8165C80 - delay_16 - step_end +.endm -Movement_165C82:: @ 8165C82 - walk_left - walk_left - walk_left - walk_left - walk_left +.macro walk_to_gym_alt walk_left walk_left walk_left @@ -173,237 +164,88 @@ Movement_165C82:: @ 8165C82 walk_down walk_down walk_right +.endm + +PewterCity_Movement_PlayerWaitForGuideEast:: @ 8165C3C + delay_16 + delay_16 + delay_4 + walk_in_place_fastest_down + step_end + +PewterCity_Movement_PlayerWalkToGymEast:: @ 8165C41 + walk_down + walk_to_gym step_end -Movement_165CAF:: @ 8165CAF +PewterCity_Movement_PlayerWaitForGuideWest:: @ 8165C80 delay_16 step_end -Movement_165CB1:: @ 8165CB1 - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left +PewterCity_Movement_PlayerWalkToGymWest:: @ 8165C82 walk_left walk_left walk_left walk_left walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up + walk_to_gym_alt + step_end + +PewterCity_Movement_PlayerWaitForGuideNorth:: @ 8165CAF + delay_16 + step_end + +PewterCity_Movement_PlayerWalkToGymNorth:: @ 8165CB1 walk_up walk_left walk_left walk_left walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right + walk_to_gym_alt step_end -Movement_165CDE:: @ 8165CDE +PewterCity_Movement_GuideMoveToLeadEast:: @ 8165CDE walk_down walk_left walk_in_place_fastest_up walk_in_place_up step_end -Movement_165CE3:: @ 8165CE3 - walk_left - walk_left - walk_left - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right +PewterCity_Movement_GuideWalkToGymEast:: @ 8165CE3 + walk_to_gym walk_right walk_in_place_fastest_left step_end -Movement_165D23:: @ 8165D23 +PewterCity_Movement_GuideMoveToLeadWest:: @ 8165D23 walk_in_place_right step_end -Movement_165D25:: @ 8165D25 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left +PewterCity_Movement_GuideWalkToGymWest:: @ 8165D25 walk_left walk_left walk_left walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right + walk_to_gym_alt walk_right walk_in_place_fastest_left step_end -Movement_165D53:: @ 8165D53 +PewterCity_Movement_GuideMoveToLeadNorth:: @ 8165D53 walk_in_place_down step_end -Movement_165D55:: @ 8165D55 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left +PewterCity_Movement_GuideWalkToGymNorth:: @ 8165D55 walk_left walk_left walk_left walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right + walk_to_gym_alt walk_right walk_in_place_fastest_left step_end -Movement_165D83:: @ 8165D83 +PewterCity_Movement_GymGuideExit:: @ 8165D83 walk_down walk_left walk_left @@ -416,282 +258,104 @@ Movement_165D83:: @ 8165D83 walk_left step_end -PewterCity_EventScript_165D8E:: @ 8165D8E +PewterCity_EventScript_GymGuideTriggerTop:: @ 8165D8E lockall setvar VAR_TEMP_1, 0 - goto EventScript_165DBE + goto PewterCity_EventScript_GymGuideTrigger end -PewterCity_EventScript_165D9A:: @ 8165D9A +PewterCity_EventScript_GymGuideTriggerMid:: @ 8165D9A lockall setvar VAR_TEMP_1, 1 - goto EventScript_165DBE + goto PewterCity_EventScript_GymGuideTrigger end -PewterCity_EventScript_165DA6:: @ 8165DA6 +PewterCity_EventScript_GymGuideTriggerBottom:: @ 8165DA6 lockall setvar VAR_TEMP_1, 2 - goto EventScript_165DBE + goto PewterCity_EventScript_GymGuideTrigger end -PewterCity_EventScript_165DB2:: @ 8165DB2 +@ This trigger is inaccessible and its corresponding movement script isnt linked +PewterCity_EventScript_GymGuideTriggerRight:: @ 8165DB2 lockall setvar VAR_TEMP_1, 3 - goto EventScript_165DBE + goto PewterCity_EventScript_GymGuideTrigger end -EventScript_165DBE:: @ 8165DBE +PewterCity_EventScript_GymGuideTrigger:: @ 8165DBE textcolor 0 - msgbox gUnknown_817E67E + msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe closemessage playbgm MUS_ANNAI, 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_165E0A + call_if_eq PewterCity_EventScript_WalkToGymTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_165E26 + call_if_eq PewterCity_EventScript_WalkToGymMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_165E42 - msgbox gUnknown_817E6C7 + call_if_eq PewterCity_EventScript_WalkToGymBottom + msgbox PewterCity_Text_GoTakeOnBrock closemessage - applymovement 5, Movement_165D83 + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit waitmovement 0 fadedefaultbgm - removeobject 5 + removeobject LOCALID_GYM_GUIDE clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE releaseall end -EventScript_165E0A:: @ 8165E0A - applymovement 5, Movement_165F6C +PewterCity_EventScript_WalkToGymTop:: @ 8165E0A + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165E7A - applymovement 5, Movement_165F7F + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop waitmovement 0 return -EventScript_165E26:: @ 8165E26 - applymovement 5, Movement_165F71 +PewterCity_EventScript_WalkToGymMid:: @ 8165E26 + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165EB9 - applymovement 5, Movement_165FBF + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid waitmovement 0 return -EventScript_165E42:: @ 8165E42 - applymovement 5, Movement_165F74 +PewterCity_EventScript_WalkToGymBottom:: @ 8165E42 + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165EF9 - applymovement 5, Movement_166000 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom waitmovement 0 return -EventScript_165E5E:: @ 8165E5E - applymovement 5, Movement_165F78 +@ Unused +PewterCity_EventScript_WalkToGymRight:: @ 8165E5E + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165F3A - applymovement 5, Movement_166042 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight + applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight waitmovement 0 return -Movement_165E7A:: @ 8165E7A - walk_left - walk_left - walk_left - walk_left - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left +PewterCity_Movement_PlayerWalkToGymTop:: @ 8165E7A walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right + walk_to_gym step_end -Movement_165EB9:: @ 8165EB9 - walk_up - walk_left - walk_left - walk_left - walk_left - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up +PewterCity_Movement_PlayerWalkToGymMid:: @ 8165EB9 walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right + walk_to_gym step_end -Movement_165EF9:: @ 8165EF9 - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up +PewterCity_Movement_PlayerWalkToGymBottom:: @ 8165EF9 walk_up walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right + walk_to_gym step_end -Movement_165F3A:: @ 8165F3A +PewterCity_Movement_PlayerWalkToGymRight:: @ 8165F3A walk_left walk_left walk_left @@ -702,66 +366,28 @@ Movement_165F3A:: @ 8165F3A walk_left walk_up walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right + walk_to_gym_alt step_end -Movement_165F6C:: @ 8165F6C +PewterCity_Movement_GuideMoveToLeadTop:: @ 8165F6C walk_left walk_down walk_in_place_fastest_right walk_in_place_right step_end -Movement_165F71:: @ 8165F71 +PewterCity_Movement_GuideMoveToLeadMid:: @ 8165F71 walk_down walk_in_place_down step_end -Movement_165F74:: @ 8165F74 +PewterCity_Movement_GuideMoveToLeadBottom:: @ 8165F74 walk_down walk_down walk_in_place_down step_end -Movement_165F78:: @ 8165F78 +PewterCity_Movement_GuideApproachPlayerRight:: @ 8165F78 walk_down walk_down walk_right @@ -770,324 +396,105 @@ Movement_165F78:: @ 8165F78 walk_in_place_right step_end -Movement_165F7F:: @ 8165F7F - walk_left - walk_left - walk_left - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right +PewterCity_Movement_GuideWalkToGymTop:: @ 8165F7F + walk_to_gym walk_right walk_in_place_fastest_left step_end -Movement_165FBF:: @ 8165FBF - walk_left - walk_left - walk_left - walk_left - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left +PewterCity_Movement_GuideWalkToGymMid:: @ 8165FBF walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right + walk_to_gym walk_right walk_in_place_fastest_left step_end -Movement_166000:: @ 8166000 - walk_up - walk_left - walk_left - walk_left - walk_left - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up +PewterCity_Movement_GuideWalkToGymBottom:: @ 8166000 walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right + walk_to_gym walk_right walk_in_place_fastest_left step_end -Movement_166042:: @ 8166042 - walk_left - walk_left - walk_left - walk_up +PewterCity_Movement_GuideWalkToGymRight:: @ 8166042 walk_left walk_left walk_left walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left walk_left walk_left walk_left walk_up walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right + walk_to_gym_alt walk_right walk_in_place_fastest_left step_end -PewterCity_EventScript_166075:: @ 8166075 - msgbox gUnknown_817E436, MSGBOX_NPC +PewterCity_EventScript_Lass:: @ 8166075 + msgbox PewterCity_Text_ClefairyCameFromMoon, MSGBOX_NPC end -PewterCity_EventScript_16607E:: @ 816607E +PewterCity_EventScript_MuseumGuide:: @ 816607E lock faceplayer - msgbox gUnknown_817E53E, MSGBOX_YESNO + msgbox PewterCity_Text_DidYouCheckOutMuseum, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_166136 - msgbox gUnknown_817E589 + goto_if_eq PewterCity_EventScript_CheckedOutMuseum + msgbox PewterCity_Text_ReallyYouHaveToGo closemessage delay 10 playbgm MUS_ANNAI, 0 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1660EE + call_if_eq PewterCity_EventScript_LeadToMuseumNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_166100 + call_if_eq PewterCity_EventScript_LeadToMuseumSouth compare VAR_FACING, DIR_WEST - call_if_eq EventScript_166112 + call_if_eq PewterCity_EventScript_LeadToMuseumWest compare VAR_FACING, DIR_EAST - call_if_eq EventScript_166124 - msgbox gUnknown_817E5AC + call_if_eq PewterCity_EventScript_LeadToMuseumEast + msgbox PewterCity_Text_ThisIsTheMuseum closemessage delay 10 - applymovement 2, Movement_16621C + applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_MuseumGuideExit waitmovement 0 fadedefaultbgm - removeobject 2 + removeobject LOCALID_MUSEUM_GUIDE clearflag FLAG_HIDE_PEWTER_MUSEUM_GUIDE release end -EventScript_1660EE:: @ 81660EE - applymovement 2, Movement_16615C - applymovement OBJ_EVENT_ID_PLAYER, Movement_166140 +PewterCity_EventScript_LeadToMuseumNorth:: @ 81660EE + applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth waitmovement 0 return -EventScript_166100:: @ 8166100 - applymovement 2, Movement_166193 - applymovement OBJ_EVENT_ID_PLAYER, Movement_166177 +PewterCity_EventScript_LeadToMuseumSouth:: @ 8166100 + applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth waitmovement 0 return -EventScript_166112:: @ 8166112 - applymovement 2, Movement_1661CA - applymovement OBJ_EVENT_ID_PLAYER, Movement_1661AE +PewterCity_EventScript_LeadToMuseumWest:: @ 8166112 + applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest waitmovement 0 return -EventScript_166124:: @ 8166124 - applymovement 2, Movement_166201 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1661E5 +PewterCity_EventScript_LeadToMuseumEast:: @ 8166124 + applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast waitmovement 0 return -EventScript_166136:: @ 8166136 - msgbox gUnknown_817E55C +PewterCity_EventScript_CheckedOutMuseum:: @ 8166136 + msgbox PewterCity_Text_WerentThoseFossilsAmazing release end -Movement_166140:: @ 8166140 - walk_up +.macro walk_to_museum walk_up walk_up walk_up @@ -1112,12 +519,9 @@ Movement_166140:: @ 8166140 walk_left walk_left walk_left - delay_8 - walk_in_place_fastest_up - step_end +.endm -Movement_16615C:: @ 816615C - walk_up +.macro walk_to_museum_south walk_up walk_up walk_up @@ -1130,7 +534,6 @@ Movement_16615C:: @ 816615C walk_left walk_left walk_left - walk_left walk_up walk_up walk_up @@ -1141,188 +544,65 @@ Movement_16615C:: @ 816615C walk_left walk_left walk_left +.endm + +PewterCity_Movement_PlayerWalkToMuseumNorth:: @ 8166140 + walk_up + walk_to_museum + delay_8 + walk_in_place_fastest_up + step_end + +PewterCity_Movement_GuideWalkToMuseumNorth:: @ 816615C + walk_to_museum walk_left walk_in_place_fastest_up step_end -Movement_166177:: @ 8166177 +PewterCity_Movement_PlayerWalkToMuseumSouth:: @ 8166177 delay_16 delay_16 walk_left - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left + walk_to_museum_south delay_8 walk_in_place_fastest_up step_end -Movement_166193:: @ 8166193 +PewterCity_Movement_GuideWalkToMuseumSouth:: @ 8166193 walk_left walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left + walk_to_museum_south walk_left walk_in_place_fastest_up step_end -Movement_1661AE:: @ 81661AE - walk_left - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left +PewterCity_Movement_PlayerWalkToMuseumWest:: @ 81661AE walk_left + walk_to_museum delay_8 walk_in_place_fastest_up step_end -Movement_1661CA:: @ 81661CA - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left +PewterCity_Movement_GuideWalkToMuseumWest:: @ 81661CA + walk_to_museum walk_left walk_in_place_fastest_up step_end -Movement_1661E5:: @ 81661E5 +PewterCity_Movement_PlayerWalkToMuseumEast:: @ 81661E5 walk_right - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left + walk_to_museum delay_8 walk_in_place_fastest_up step_end -Movement_166201:: @ 8166201 - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_up - walk_up - walk_up - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left +PewterCity_Movement_GuideWalkToMuseumEast:: @ 8166201 + walk_to_museum walk_left walk_in_place_fastest_up step_end -Movement_16621C:: @ 816621C +PewterCity_Movement_MuseumGuideExit:: @ 816621C walk_down walk_right walk_right @@ -1339,199 +619,200 @@ Movement_16621C:: @ 816621C walk_right step_end -PewterCity_EventScript_16622B:: @ 816622B +PewterCity_EventScript_FatMan:: @ 816622B lock faceplayer famechecker FAMECHECKER_BROCK, 2 - msgbox gUnknown_817E49F + msgbox PewterCity_Text_BrockOnlySeriousTrainerHere release end -PewterCity_EventScript_166244:: @ 8166244 +PewterCity_EventScript_BugCatcher:: @ 8166244 lock faceplayer - msgbox gUnknown_817E602, MSGBOX_YESNO + msgbox PewterCity_Text_DoYouKnowWhatImDoing, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_166263 - msgbox gUnknown_817E644 + goto_if_eq PewterCity_EventScript_KnowWhatTheyreDoing + msgbox PewterCity_Text_SprayingRepelToKeepWildMonsOut release end -EventScript_166263:: @ 8166263 - msgbox gUnknown_817E626 +PewterCity_EventScript_KnowWhatTheyreDoing:: @ 8166263 + msgbox PewterCity_Text_ThatsRightItsHardWork release end -PewterCity_EventScript_16626D:: @ 816626D - msgbox gUnknown_817E6F6, MSGBOX_SIGN +PewterCity_EventScript_TrainerTips:: @ 816626D + msgbox PewterCity_Text_TrainerTipsEarningEXP, MSGBOX_SIGN end -PewterCity_EventScript_166276:: @ 8166276 - msgbox gUnknown_817E748, MSGBOX_SIGN +PewterCity_EventScript_PoliceNotice:: @ 8166276 + msgbox PewterCity_Text_CallPoliceIfInfoOnThieves, MSGBOX_SIGN end -PewterCity_EventScript_16627F:: @ 816627F - msgbox gUnknown_817E7C5, MSGBOX_SIGN +PewterCity_EventScript_MuseumSign:: @ 816627F + msgbox PewterCity_Text_MuseumOfScience, MSGBOX_SIGN end -PewterCity_EventScript_166288:: @ 8166288 +PewterCity_EventScript_GymSign:: @ 8166288 lockall famechecker FAMECHECKER_BROCK, 0 - msgbox gUnknown_817E7DE + msgbox PewterCity_Text_GymSign releaseall end -PewterCity_EventScript_1662A0:: @ 81662A0 - msgbox gUnknown_817E824, MSGBOX_SIGN +PewterCity_EventScript_CitySign:: @ 81662A0 + msgbox PewterCity_Text_CitySign, MSGBOX_SIGN end -PewterCity_EventScript_1662A9:: @ 81662A9 +PewterCity_EventScript_RunningShoesAide:: @ 81662A9 lock faceplayer setvar VAR_TEMP_1, 0 - call EventScript_1662DE + call PewterCity_EventScript_AideGiveRunningShoes release end -PewterCity_EventScript_1662B7:: @ 81662B7 +PewterCity_EventScript_RunningShoesAideTriggerTop:: @ 81662B7 lockall setvar VAR_TEMP_1, 1 - call EventScript_1662DE + call PewterCity_EventScript_AideGiveRunningShoes releaseall end -PewterCity_EventScript_1662C4:: @ 81662C4 +PewterCity_EventScript_RunningShoesAideTriggerMid:: @ 81662C4 lockall setvar VAR_TEMP_1, 2 - call EventScript_1662DE + call PewterCity_EventScript_AideGiveRunningShoes releaseall end -PewterCity_EventScript_1662D1:: @ 81662D1 +PewterCity_EventScript_RunningShoesAideTriggerBottom:: @ 81662D1 lockall setvar VAR_TEMP_1, 3 - call EventScript_1662DE + call PewterCity_EventScript_AideGiveRunningShoes releaseall end -EventScript_1662DE:: @ 81662DE +PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE textcolor 0 compare VAR_TEMP_1, 1 - call_if_eq EventScript_1663CA + call_if_eq PewterCity_EventScript_AideNoticePlayer compare VAR_TEMP_1, 2 - call_if_eq EventScript_1663CA + call_if_eq PewterCity_EventScript_AideNoticePlayer compare VAR_TEMP_1, 3 - call_if_eq EventScript_1663CA + call_if_eq PewterCity_EventScript_AideNoticePlayer waitse playse SE_PIN - applymovement 7, Movement_ExclamationMark + applymovement LOCALID_AIDE, Movement_ExclamationMark waitmovement 0 - applymovement 7, Movement_Delay48 + applymovement LOCALID_AIDE, Movement_Delay48 waitmovement 0 - msgbox gUnknown_817E902 + msgbox PewterCity_Text_OhPlayer compare VAR_TEMP_1, 0 - call_if_eq EventScript_1663D5 + call_if_eq PewterCity_EventScript_AideApproachPlayer0 compare VAR_TEMP_1, 1 - call_if_eq EventScript_1663DA + call_if_eq PewterCity_EventScript_AideApproachPlayer1 compare VAR_TEMP_1, 2 - call_if_eq EventScript_1663E6 + call_if_eq PewterCity_EventScript_AideApproachPlayer2 compare VAR_TEMP_1, 3 - call_if_eq EventScript_1663FC - msgbox gUnknown_817E90C + call_if_eq PewterCity_EventScript_AideApproachPlayer3 + msgbox PewterCity_Text_AskedToDeliverThis textcolor 3 playfanfare MUS_FAN5 - message Text_17E970 + message PewterCity_Text_ReceivedRunningShoesFromAide waitmessage waitfanfare - msgbox gUnknown_817E99D + msgbox PewterCity_Text_SwitchedShoesWithRunningShoes special sub_80699BC signmsg - msgbox gUnknown_817E9C7 + msgbox PewterCity_Text_ExplainRunningShoes normalmsg call EventScript_1A6675 - msgbox gUnknown_817EA06 + msgbox PewterCity_Text_MustBeGoingBackToLab closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_166412 + call_if_eq PewterCity_EventScript_AideExit0 compare VAR_TEMP_1, 1 - call_if_eq EventScript_16641D + call_if_eq PewterCity_EventScript_AideExit1 compare VAR_TEMP_1, 2 - call_if_eq EventScript_166428 + call_if_eq PewterCity_EventScript_AideExit2 compare VAR_TEMP_1, 3 - call_if_eq EventScript_166433 + call_if_eq PewterCity_EventScript_AideExit3 delay 30 textcolor 3 - msgbox gUnknown_817EA36 + msgbox PewterCity_Text_RunningShoesLetterFromMom closemessage - removeobject 7 + removeobject LOCALID_AIDE setflag FLAG_SYS_RUNNING_SHOES setvar VAR_MAP_SCENE_PEWTER_CITY, 2 return -EventScript_1663CA:: @ 81663CA - applymovement 7, Movement_WalkInPlaceFastestDown +PewterCity_EventScript_AideNoticePlayer:: @ 81663CA + applymovement LOCALID_AIDE, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_1663D5:: @ 81663D5 +@ Aide already at player +PewterCity_EventScript_AideApproachPlayer0:: @ 81663D5 closemessage delay 20 return -EventScript_1663DA:: @ 81663DA +PewterCity_EventScript_AideApproachPlayer1:: @ 81663DA closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_1663E6:: @ 81663E6 +PewterCity_EventScript_AideApproachPlayer2:: @ 81663E6 closemessage - applymovement 7, Movement_16643E + applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_1663FC:: @ 81663FC +PewterCity_EventScript_AideApproachPlayer3:: @ 81663FC closemessage - applymovement 7, Movement_166441 + applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_166412:: @ 8166412 - applymovement 7, Movement_166445 +PewterCity_EventScript_AideExit0:: @ 8166412 + applymovement LOCALID_AIDE, PewterCity_Movement_AideExit0 waitmovement 0 return -EventScript_16641D:: @ 816641D - applymovement 7, Movement_166450 +PewterCity_EventScript_AideExit1:: @ 816641D + applymovement LOCALID_AIDE, PewterCity_Movement_AideExit1 waitmovement 0 return -EventScript_166428:: @ 8166428 - applymovement 7, Movement_16645B +PewterCity_EventScript_AideExit2:: @ 8166428 + applymovement LOCALID_AIDE, PewterCity_Movement_AideExit2 waitmovement 0 return -EventScript_166433:: @ 8166433 - applymovement 7, Movement_166465 +PewterCity_EventScript_AideExit3:: @ 8166433 + applymovement LOCALID_AIDE, PewterCity_Movement_AideExit3 waitmovement 0 return -Movement_16643E:: @ 816643E +PewterCity_Movement_AideApproachPlayerMid:: @ 816643E delay_4 walk_down step_end -Movement_166441:: @ 8166441 +PewterCity_Movement_AideApproachPlayerBottom:: @ 8166441 delay_4 walk_down walk_down step_end -Movement_166445:: @ 8166445 +PewterCity_Movement_AideExit0:: @ 8166445 walk_down walk_left walk_left @@ -1544,7 +825,7 @@ Movement_166445:: @ 8166445 walk_left step_end -Movement_166450:: @ 8166450 +PewterCity_Movement_AideExit1:: @ 8166450 walk_left walk_down walk_left @@ -1557,7 +838,7 @@ Movement_166450:: @ 8166450 walk_left step_end -Movement_16645B:: @ 816645B +PewterCity_Movement_AideExit2:: @ 816645B walk_left walk_left walk_left @@ -1569,7 +850,7 @@ Movement_16645B:: @ 816645B walk_left step_end -Movement_166465:: @ 8166465 +PewterCity_Movement_AideExit3:: @ 8166465 walk_left walk_left walk_left @@ -1581,6 +862,7 @@ Movement_166465:: @ 8166465 walk_left step_end -Movement_16646F:: @ 816646F +@ Unused +PewterCity_Movement_WalkInPlaceLeft:: @ 816646F walk_in_place_left step_end diff --git a/data/maps/PewterCity/text.inc b/data/maps/PewterCity/text.inc index 966cbcfe4..fbd6f40f4 100644 --- a/data/maps/PewterCity/text.inc +++ b/data/maps/PewterCity/text.inc @@ -20,13 +20,13 @@ Text_DreamEaterTaught:: @ 817E41B .string "…ZZZ…\n" .string "I…can't eat…anymore…$" -gUnknown_817E436:: @ 817E436 +PewterCity_Text_ClefairyCameFromMoon:: @ 817E436 .string "CLEFAIRY came from the moon.\n" .string "That's what the rumor is.\p" .string "They appeared after MOON STONES\n" .string "fell on MT. MOON.$" -gUnknown_817E49F:: @ 817E49F +PewterCity_Text_BrockOnlySeriousTrainerHere:: @ 817E49F .string "There aren't many serious POKéMON\n" .string "TRAINERS here.\p" .string "They're all like BUG CATCHERS,\n" @@ -34,81 +34,82 @@ gUnknown_817E49F:: @ 817E49F .string "But PEWTER GYM's BROCK isn't like\n" .string "that, not one bit.$" -gUnknown_817E53E:: @ 817E53E +PewterCity_Text_DidYouCheckOutMuseum:: @ 817E53E .string "Did you check out the MUSEUM?$" -gUnknown_817E55C:: @ 817E55C +PewterCity_Text_WerentThoseFossilsAmazing:: @ 817E55C .string "Weren't those fossils from MT. MOON\n" .string "amazing?$" -gUnknown_817E589:: @ 817E589 +PewterCity_Text_ReallyYouHaveToGo:: @ 817E589 .string "Really?\n" .string "You absolutely have to go!$" -gUnknown_817E5AC:: @ 817E5AC +PewterCity_Text_ThisIsTheMuseum:: @ 817E5AC .string "This is it, the MUSEUM.\p" .string "You have to pay to get in, but it's\n" .string "worth it. See you around!$" -gUnknown_817E602:: @ 817E602 +PewterCity_Text_DoYouKnowWhatImDoing:: @ 817E602 .string "Psssst!\n" .string "Do you know what I'm doing?$" -gUnknown_817E626:: @ 817E626 +PewterCity_Text_ThatsRightItsHardWork:: @ 817E626 .string "That's right!\n" .string "It's hard work!$" -gUnknown_817E644:: @ 817E644 +PewterCity_Text_SprayingRepelToKeepWildMonsOut:: @ 817E644 .string "I'm spraying REPEL to keep wild\n" .string "POKéMON out of my garden!$" -gUnknown_817E67E:: @ 817E67E +PewterCity_Text_BrocksLookingForChallengersFollowMe:: @ 817E67E .string "You're a TRAINER, right?\p" .string "BROCK's looking for new\n" .string "challengers. Follow me!$" -gUnknown_817E6C7:: @ 817E6C7 +PewterCity_Text_GoTakeOnBrock:: @ 817E6C7 .string "If you have the right stuff,\n" .string "go take on BROCK!$" -gUnknown_817E6F6:: @ 817E6F6 +PewterCity_Text_TrainerTipsEarningEXP:: @ 817E6F6 .string "TRAINER TIPS\p" .string "All POKéMON that appear in battle,\n" .string "however briefly, earn EXP Points.$" -gUnknown_817E748:: @ 817E748 +PewterCity_Text_CallPoliceIfInfoOnThieves:: @ 817E748 .string "NOTICE!\p" .string "Thieves have been stealing POKéMON\n" .string "fossils from MT. MOON.\p" .string "Please call the PEWTER POLICE if\n" .string "you have any information.$" -gUnknown_817E7C5:: @ 817E7C5 +PewterCity_Text_MuseumOfScience:: @ 817E7C5 .string "PEWTER MUSEUM OF SCIENCE$" -gUnknown_817E7DE:: @ 817E7DE +PewterCity_Text_GymSign:: @ 817E7DE .string "PEWTER CITY POKéMON GYM\n" .string "LEADER: BROCK\l" .string "The Rock-Solid POKéMON TRAINER!$" -gUnknown_817E824:: @ 817E824 +PewterCity_Text_CitySign:: @ 817E824 .string "PEWTER CITY\n" .string "A Stone Gray City$" -Text_17E842:: @ 817E842 +@ The below 3 JP texts are unused. Possibly a cut NPC meant to give the player the Berry Pouch +PewterCity_Text_DefeatedBrockYouCanHaveTreasure:: @ 817E842 .string "あッれー！\n" .string "その ジムバッジ‥‥\l" .string "すげえな タケシに かったのかよ！\p" .string "かんどう したから\n" .string "おれの たからもの やるよ！$" -Text_17E87E:: @ 817E87E +PewterCity_Text_BerriesInsideUseCarefully:: @ 817E87E .string "なかには きのみが はいってるぜ\p" .string "やくに たつ きのみも\n" .string "はいって いるから\l" .string "だいじに つかって くれよ！$" -Text_17E8B4:: @ 817E8B4 +PewterCity_Text_MonsWillUseHeldBerriesOnTheirOwn:: @ 817E8B4 .string "ポケモンに きのみを\n" .string "もたせて おけば\l" .string "たたかっている ときに\l" @@ -116,33 +117,33 @@ Text_17E8B4:: @ 817E8B4 .string "キズぐすり とか どくけし より\n" .string "てがるで べんり だろ？$" -gUnknown_817E902:: @ 817E902 +PewterCity_Text_OhPlayer:: @ 817E902 .string "Oh, {PLAYER}{KUN}!$" -gUnknown_817E90C:: @ 817E90C +PewterCity_Text_AskedToDeliverThis:: @ 817E90C .string "I'm glad I caught up to you.\n" .string "I'm PROF. OAK's AIDE.\p" .string "I've been asked to deliver this,\n" .string "so here you go.$" -Text_17E970:: @ 817E970 +PewterCity_Text_ReceivedRunningShoesFromAide:: @ 817E970 .string "{PLAYER} received the\n" .string "RUNNING SHOES from the AIDE.$" -gUnknown_817E99D:: @ 817E99D +PewterCity_Text_SwitchedShoesWithRunningShoes:: @ 817E99D .string "{PLAYER} switched shoes with the\n" .string "RUNNING SHOES.$" -gUnknown_817E9C7:: @ 817E9C7 +PewterCity_Text_ExplainRunningShoes:: @ 817E9C7 .string "Press the B Button to run.\n" .string "But only where there's room to run!$" -gUnknown_817EA06:: @ 817EA06 +PewterCity_Text_MustBeGoingBackToLab:: @ 817EA06 .string "Well, I must be going back to\n" .string "the LAB.\p" .string "Bye-bye!$" -gUnknown_817EA36:: @ 817EA36 +PewterCity_Text_RunningShoesLetterFromMom:: @ 817EA36 .string "There's a letter attached…\p" .string "Dear {PLAYER},\p" .string "Here is a pair of RUNNING SHOES\n" diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 6c488ebea..04870110f 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Gym_EventScript_16A593", + "script": "PewterCity_Gym_EventScript_Brock", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "PewterCity_Gym_EventScript_16A63E", + "script": "PewterCity_Gym_EventScript_Liam", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Gym_EventScript_16A655", + "script": "PewterCity_Gym_EventScript_GymGuy", "flag": "0" } ], @@ -83,14 +83,14 @@ "x": 4, "y": 12, "elevation": 0, - "script": "PewterCity_Gym_EventScript_16A6AF" + "script": "PewterCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 8, "y": 12, "elevation": 0, - "script": "PewterCity_Gym_EventScript_16A6AF" + "script": "PewterCity_Gym_EventScript_GymStatue" } ] } diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 9774003b2..341fee207 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -1,15 +1,15 @@ PewterCity_Gym_MapScripts:: @ 816A592 .byte 0 -PewterCity_Gym_EventScript_16A593:: @ 816A593 +PewterCity_Gym_EventScript_Brock:: @ 816A593 famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_BROCK, Text_190CD4, Text_190E4F, EventScript_16A5C5, NO_MUSIC - goto_if_unset FLAG_GOT_TM39_FROM_BROCK, EventScript_16A5F3 - msgbox gUnknown_819110F + trainerbattle_single TRAINER_LEADER_BROCK, PewterCity_Gym_Text_BrockIntro, PewterCity_Gym_Text_BrockDefeat, PewterCity_Gym_EventScript_DefeatedBrock, NO_MUSIC + goto_if_unset FLAG_GOT_TM39_FROM_BROCK, PewterCity_Gym_EventScript_GiveTM39 + msgbox PewterCity_Gym_Text_BrockPostBattle release end -EventScript_16A5C5:: @ 816A5C5 +PewterCity_Gym_EventScript_DefeatedBrock:: @ 816A5C5 famechecker FAMECHECKER_BROCK, 1 setflag FLAG_DEFEATED_BROCK setflag FLAG_BADGE01_GET @@ -17,69 +17,69 @@ EventScript_16A5C5:: @ 816A5C5 setflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE clearflag FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY set_gym_trainers 1 - goto EventScript_16A5F3 + goto PewterCity_Gym_EventScript_GiveTM39 end -EventScript_16A5F3:: @ 816A5F3 - msgbox gUnknown_8190FC1 +PewterCity_Gym_EventScript_GiveTM39:: @ 816A5F3 + msgbox PewterCity_Gym_Text_TakeThisWithYou checkitemspace ITEM_TM39, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16A634 - giveitem_msg gUnknown_8190FDB, ITEM_TM39 + goto_if_eq PewterCity_Gym_EventScript_NoRoomForTM39 + giveitem_msg PewterCity_Gym_Text_ReceivedTM39FromBrock, ITEM_TM39 setflag FLAG_GOT_TM39_FROM_BROCK - msgbox gUnknown_8190FF8 + msgbox PewterCity_Gym_Text_ExplainTM39 release end -EventScript_16A634:: @ 816A634 - msgbox gUnknown_81911CE +PewterCity_Gym_EventScript_NoRoomForTM39:: @ 816A634 + msgbox PewterCity_Gym_Text_DontHaveRoomForThis release end -PewterCity_Gym_EventScript_16A63E:: @ 816A63E - trainerbattle_single TRAINER_CAMPER_LIAM, Text_1911EC, Text_191237 - msgbox gUnknown_819126B, MSGBOX_AUTOCLOSE +PewterCity_Gym_EventScript_Liam:: @ 816A63E + trainerbattle_single TRAINER_CAMPER_LIAM, PewterCity_Gym_Text_LiamIntro, PewterCity_Gym_Text_LiamDefeat + msgbox PewterCity_Gym_Text_LiamPostBattle, MSGBOX_AUTOCLOSE end -PewterCity_Gym_EventScript_16A655:: @ 816A655 +PewterCity_Gym_EventScript_GymGuy:: @ 816A655 lock faceplayer - goto_if_set FLAG_DEFEATED_BROCK, EventScript_16A67F - msgbox gUnknown_8191298, MSGBOX_YESNO + goto_if_set FLAG_DEFEATED_BROCK, PewterCity_Gym_EventScript_GymGuyPostVictory + msgbox PewterCity_Gym_Text_LetMeTakeYouToTheTop, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16A689 + goto_if_eq PewterCity_Gym_EventScript_GymGuyTakeMeToTop compare VAR_RESULT, NO - goto_if_eq EventScript_16A697 + goto_if_eq PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop end -EventScript_16A67F:: @ 816A67F - msgbox gUnknown_819143C +PewterCity_Gym_EventScript_GymGuyPostVictory:: @ 816A67F + msgbox PewterCity_Gym_Text_YoureChampMaterial release end -EventScript_16A689:: @ 816A689 - msgbox gUnknown_819133C - goto EventScript_16A6A5 +PewterCity_Gym_EventScript_GymGuyTakeMeToTop:: @ 816A689 + msgbox PewterCity_Gym_Text_LetsGetHappening + goto PewterCity_Gym_EventScript_GymGuyAdvice end -EventScript_16A697:: @ 816A697 - msgbox gUnknown_8191412 - goto EventScript_16A6A5 +PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop:: @ 816A697 + msgbox PewterCity_Gym_Text_ItsFreeLetsGetHappening + goto PewterCity_Gym_EventScript_GymGuyAdvice end -EventScript_16A6A5:: @ 816A6A5 - msgbox gUnknown_819135C +PewterCity_Gym_EventScript_GymGuyAdvice:: @ 816A6A5 + msgbox PewterCity_Gym_Text_TryDifferentPartyOrders release end -PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF +PewterCity_Gym_EventScript_GymStatue:: @ 816A6AF lockall - goto_if_set FLAG_BADGE01_GET, EventScript_16A6C3 - msgbox gUnknown_819146E + goto_if_set FLAG_BADGE01_GET, PewterCity_Gym_EventScript_GymStatuePostVictory + msgbox PewterCity_Gym_Text_GymStatue releaseall end -EventScript_16A6C3:: @ 816A6C3 - msgbox gUnknown_81914A4 +PewterCity_Gym_EventScript_GymStatuePostVictory:: @ 816A6C3 + msgbox PewterCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/PewterCity_Gym/text.inc b/data/maps/PewterCity_Gym/text.inc index 7d7101fec..c47a60b05 100644 --- a/data/maps/PewterCity_Gym/text.inc +++ b/data/maps/PewterCity_Gym/text.inc @@ -1,4 +1,4 @@ -Text_190CD4:: @ 8190CD4 +PewterCity_Gym_Text_BrockIntro:: @ 8190CD4 .string "So, you're here. I'm BROCK.\n" .string "I'm PEWTER's GYM LEADER.\p" .string "My rock-hard willpower is evident\n" @@ -14,7 +14,7 @@ Text_190CD4:: @ 8190CD4 .string "Fine, then!\n" .string "Show me your best!{PLAY_BGM}{MUS_EXEYE}$" -Text_190E4F:: @ 8190E4F +PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F .string "I took you for granted, and so\n" .string "I lost.\p" .string "As proof of your victory, I confer\n" @@ -29,15 +29,15 @@ Text_190E4F:: @ 8190E4F .string "Of course, a POKéMON must know the\n" .string "move FLASH to use it.$" -gUnknown_8190FC1:: @ 8190FC1 +PewterCity_Gym_Text_TakeThisWithYou:: @ 8190FC1 .string "Wait!\n" .string "Take this with you.$" -gUnknown_8190FDB:: @ 8190FDB +PewterCity_Gym_Text_ReceivedTM39FromBrock:: @ 8190FDB .string "{PLAYER} received TM39\n" .string "from BROCK.$" -gUnknown_8190FF8:: @ 8190FF8 +PewterCity_Gym_Text_ExplainTM39:: @ 8190FF8 .string "A TM, Technical Machine, contains a\n" .string "technique for POKéMON.\p" .string "Using a TM teaches the move it\n" @@ -50,7 +50,7 @@ gUnknown_8190FF8:: @ 8190FF8 .string "It hurls boulders at the foe and\n" .string "lowers its SPEED.$" -gUnknown_819110F:: @ 819110F +PewterCity_Gym_Text_BrockPostBattle:: @ 819110F .string "There are all kinds of TRAINERS in\n" .string "this huge world of ours.\p" .string "You appear to be very gifted as a\n" @@ -59,24 +59,24 @@ gUnknown_819110F:: @ 819110F .string "Go to the GYM in CERULEAN and test\n" .string "your abilities.$" -gUnknown_81911CE:: @ 81911CE +PewterCity_Gym_Text_DontHaveRoomForThis:: @ 81911CE .string "You don't have room for this.$" -Text_1911EC:: @ 81911EC +PewterCity_Gym_Text_LiamIntro:: @ 81911EC .string "Stop right there, kid!\p" .string "You're ten thousand light-years \n" .string "from facing BROCK!$" -Text_191237:: @ 8191237 +PewterCity_Gym_Text_LiamDefeat:: @ 8191237 .string "Darn!\p" .string "Light-years isn't time…\n" .string "It measures distance!$" -gUnknown_819126B:: @ 819126B +PewterCity_Gym_Text_LiamPostBattle:: @ 819126B .string "You're pretty hot.\n" .string "…But not as hot as BROCK!$" -gUnknown_8191298:: @ 8191298 +PewterCity_Gym_Text_LetMeTakeYouToTheTop:: @ 8191298 .string "Hiya!\n" .string "Do you want to dream big?\p" .string "Do you dare to dream of becoming\n" @@ -85,11 +85,11 @@ gUnknown_8191298:: @ 8191298 .string "you on how to win.\p" .string "Let me take you to the top!$" -gUnknown_819133C:: @ 819133C +PewterCity_Gym_Text_LetsGetHappening:: @ 819133C .string "All right!\n" .string "Let's get happening!$" -gUnknown_819135C:: @ 819135C +PewterCity_Gym_Text_TryDifferentPartyOrders:: @ 819135C .string "The first POKéMON out in a match is\n" .string "at the left of the POKéMON LIST.\p" .string "By changing the order of POKéMON,\n" @@ -97,21 +97,21 @@ gUnknown_819135C:: @ 819135C .string "Try different orders to suit your\n" .string "opponent's party.$" -gUnknown_8191412:: @ 8191412 +PewterCity_Gym_Text_ItsFreeLetsGetHappening:: @ 8191412 .string "It's a free service!\n" .string "Let's get happening!$" -gUnknown_819143C:: @ 819143C +PewterCity_Gym_Text_YoureChampMaterial:: @ 819143C .string "Just as I thought!\n" .string "You're POKéMON champ material!$" -gUnknown_819146E:: @ 819146E +PewterCity_Gym_Text_GymStatue:: @ 819146E .string "PEWTER POKéMON GYM\n" .string "LEADER: BROCK\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_81914A4:: @ 81914A4 +PewterCity_Gym_Text_GymStatuePlayerWon:: @ 81914A4 .string "PEWTER POKéMON GYM\n" .string "LEADER: BROCK\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 435ac6917..d1ec624c9 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_House1_EventScript_16A71D", + "script": "PewterCity_House1_EventScript_BaldingMan", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_House1_EventScript_16A726", + "script": "PewterCity_House1_EventScript_LittleBoy", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_House1_EventScript_16A736", + "script": "PewterCity_House1_EventScript_Nidoran", "flag": "0" } ], diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index 58d201193..3d173b174 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -1,31 +1,31 @@ PewterCity_House1_MapScripts:: @ 816A71C .byte 0 -PewterCity_House1_EventScript_16A71D:: @ 816A71D - msgbox gUnknown_81915DB, MSGBOX_NPC +PewterCity_House1_EventScript_BaldingMan:: @ 816A71D + msgbox PewterCity_House1_Text_TradeMonsAreFinicky, MSGBOX_NPC end -PewterCity_House1_EventScript_16A726:: @ 816A726 +PewterCity_House1_EventScript_LittleBoy:: @ 816A726 lock - msgbox gUnknown_81915CD - call EventScript_16A749 + msgbox PewterCity_House1_Text_NidoranSit + call PewterCity_House1_EventScript_DoNidoranCry release end -PewterCity_House1_EventScript_16A736:: @ 816A736 +PewterCity_House1_EventScript_Nidoran:: @ 816A736 lock faceplayer - call EventScript_16A749 + call PewterCity_House1_EventScript_DoNidoranCry applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_16A749:: @ 816A749 +PewterCity_House1_EventScript_DoNidoranCry:: @ 816A749 textcolor 3 waitse playmoncry SPECIES_NIDORAN_M, 0 - msgbox gUnknown_81915BB + msgbox PewterCity_House1_Text_Nidoran waitmoncry call EventScript_1A6675 return diff --git a/data/maps/PewterCity_House1/text.inc b/data/maps/PewterCity_House1/text.inc index b0a691229..8365dc580 100644 --- a/data/maps/PewterCity_House1/text.inc +++ b/data/maps/PewterCity_House1/text.inc @@ -1,10 +1,10 @@ -gUnknown_81915BB:: @ 81915BB +PewterCity_House1_Text_Nidoran:: @ 81915BB .string "NIDORAN♂: Bowbow!$" -gUnknown_81915CD:: @ 81915CD +PewterCity_House1_Text_NidoranSit:: @ 81915CD .string "NIDORAN, sit!$" -gUnknown_81915DB:: @ 81915DB +PewterCity_House1_Text_TradeMonsAreFinicky:: @ 81915DB .string "Our POKéMON's an outsider, so it's\n" .string "finicky and hard to handle.\p" .string "An outsider is a POKéMON that you\n" diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 90b0c0241..88ce44057 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_House2_EventScript_16A7DD", + "script": "PewterCity_House2_EventScript_OldMan", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_House2_EventScript_16A7E6", + "script": "PewterCity_House2_EventScript_LittleBoy", "flag": "0" } ], diff --git a/data/maps/PewterCity_House2/scripts.inc b/data/maps/PewterCity_House2/scripts.inc index 52a5bbc02..bb4fc2c72 100644 --- a/data/maps/PewterCity_House2/scripts.inc +++ b/data/maps/PewterCity_House2/scripts.inc @@ -1,10 +1,10 @@ PewterCity_House2_MapScripts:: @ 816A7DC .byte 0 -PewterCity_House2_EventScript_16A7DD:: @ 816A7DD - msgbox gUnknown_81917E4, MSGBOX_NPC +PewterCity_House2_EventScript_OldMan:: @ 816A7DD + msgbox PewterCity_House2_Text_MonsLearnTechniquesAsTheyGrow, MSGBOX_NPC end -PewterCity_House2_EventScript_16A7E6:: @ 816A7E6 - msgbox gUnknown_8191840, MSGBOX_NPC +PewterCity_House2_EventScript_LittleBoy:: @ 816A7E6 + msgbox PewterCity_House2_Text_MonsEasierCatchIfStatused, MSGBOX_NPC end diff --git a/data/maps/PewterCity_House2/text.inc b/data/maps/PewterCity_House2/text.inc index 6dc70b2ba..3f0898fc3 100644 --- a/data/maps/PewterCity_House2/text.inc +++ b/data/maps/PewterCity_House2/text.inc @@ -1,10 +1,10 @@ -gUnknown_81917E4:: @ 81917E4 +PewterCity_House2_Text_MonsLearnTechniquesAsTheyGrow:: @ 81917E4 .string "POKéMON learn new techniques as\n" .string "they grow.\p" .string "But some moves must be taught to\n" .string "them by people.$" -gUnknown_8191840:: @ 8191840 +PewterCity_House2_Text_MonsEasierCatchIfStatused:: @ 8191840 .string "A POKéMON becomes easier to \n" .string "catch if it has a status problem.\p" .string "Sleep, poison, burn, or paralysis…\n" diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 7d4a44390..f062c5bea 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Mart_EventScript_16A6CE", + "script": "PewterCity_Mart_EventScript_Youngster", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Mart_EventScript_16A6D7", + "script": "PewterCity_Mart_EventScript_Boy", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Mart_EventScript_16A6E0", + "script": "PewterCity_Mart_EventScript_Clerk", "flag": "0" } ], diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index e03f14deb..1735013a5 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -1,15 +1,15 @@ PewterCity_Mart_MapScripts:: @ 816A6CD .byte 0 -PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE - msgbox gUnknown_81914DE, MSGBOX_NPC +PewterCity_Mart_EventScript_Youngster:: @ 816A6CE + msgbox PewterCity_Mart_Text_BoughtWeirdFishFromShadyGuy, MSGBOX_NPC end -PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 - msgbox gUnknown_8191541, MSGBOX_NPC +PewterCity_Mart_EventScript_Boy:: @ 816A6D7 + msgbox PewterCity_Mart_Text_GoodThingsIfRaiseMonsDiligently, MSGBOX_NPC end -PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 +PewterCity_Mart_EventScript_Clerk:: @ 816A6E0 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -17,13 +17,13 @@ PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16A708 + pokemart PewterCity_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16A708:: @ 816A708 +PewterCity_Mart_Items:: @ 816A708 .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE diff --git a/data/maps/PewterCity_Mart/text.inc b/data/maps/PewterCity_Mart/text.inc index 24dcbdbb2..336baa4e6 100644 --- a/data/maps/PewterCity_Mart/text.inc +++ b/data/maps/PewterCity_Mart/text.inc @@ -1,9 +1,9 @@ -gUnknown_81914DE:: @ 81914DE +PewterCity_Mart_Text_BoughtWeirdFishFromShadyGuy:: @ 81914DE .string "A shady old guy sucked me into\n" .string "buying this weird fish POKéMON!\p" .string "It's totally weak and it cost ¥500!$" -gUnknown_8191541:: @ 8191541 +PewterCity_Mart_Text_GoodThingsIfRaiseMonsDiligently:: @ 8191541 .string "Good things can happen if you raise\n" .string "POKéMON diligently.\p" .string "Even the weak ones can surprise\n" diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index e4f450c81..26df37224 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_1F_EventScript_16A31B", + "script": "PewterCity_Museum_1F_EventScript_Scientist1", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_1F_EventScript_16A4A5", + "script": "PewterCity_Museum_1F_EventScript_OldMan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_1F_EventScript_16A4AE", + "script": "PewterCity_Museum_1F_EventScript_OldAmberScientist", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_1F_EventScript_16A509", + "script": "PewterCity_Museum_1F_EventScript_OldAmber", "flag": "FLAG_HIDE_OLD_AMBER" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_1F_EventScript_16A49C", + "script": "PewterCity_Museum_1F_EventScript_Scientist2", "flag": "0" }, { @@ -144,7 +144,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", "var_value": 0, - "script": "PewterCity_Museum_1F_EventScript_16A38F" + "script": "PewterCity_Museum_1F_EventScript_EntranceTriggerLeft" }, { "type": "trigger", @@ -153,7 +153,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", "var_value": 0, - "script": "PewterCity_Museum_1F_EventScript_16A3A5" + "script": "PewterCity_Museum_1F_EventScript_EntranceTriggerMid" }, { "type": "trigger", @@ -162,7 +162,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", "var_value": 0, - "script": "PewterCity_Museum_1F_EventScript_16A3BB" + "script": "PewterCity_Museum_1F_EventScript_EntranceTriggerRight" } ], "bg_events": [ @@ -171,28 +171,28 @@ "x": 4, "y": 4, "elevation": 0, - "script": "PewterCity_Museum_1F_EventScript_16A512" + "script": "PewterCity_Museum_1F_EventScript_AerodactylFossil" }, { "type": "bg_event_type_0", "x": 4, "y": 7, "elevation": 0, - "script": "PewterCity_Museum_1F_EventScript_16A532" + "script": "PewterCity_Museum_1F_EventScript_KabutopsFossil" }, { "type": "bg_event_type_1", "x": 27, "y": 1, "elevation": 0, - "script": "PewterCity_Museum_1F_EventScript_1ACE1C" + "script": "PewterCity_Museum_1F_EventScript_PokemonJournalBrock" }, { "type": "bg_event_type_1", "x": 26, "y": 1, "elevation": 0, - "script": "PewterCity_Museum_1F_EventScript_1ACE1C" + "script": "PewterCity_Museum_1F_EventScript_PokemonJournalBrock" } ] } diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 4622ee8a7..f9a097919 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -1,200 +1,200 @@ PewterCity_Museum_1F_MapScripts:: @ 816A31A .byte 0 -PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B +PewterCity_Museum_1F_EventScript_Scientist1:: @ 816A31B lock faceplayer compare VAR_FACING, DIR_WEST - goto_if_eq EventScript_16A348 + goto_if_eq PewterCity_Museum_1F_EventScript_Scientist1BehindCounter compare VAR_FACING, DIR_SOUTH - goto_if_eq EventScript_16A348 + goto_if_eq PewterCity_Museum_1F_EventScript_Scientist1BehindCounter compare VAR_FACING, DIR_NORTH - goto_if_eq EventScript_16A348 - msgbox gUnknown_8190539 + goto_if_eq PewterCity_Museum_1F_EventScript_Scientist1BehindCounter + msgbox PewterCity_Museum_1F_Text_PleaseEnjoyYourself release end -EventScript_16A348:: @ 816A348 - msgbox gUnknown_8190550, MSGBOX_YESNO +PewterCity_Museum_1F_EventScript_Scientist1BehindCounter:: @ 816A348 + msgbox PewterCity_Museum_1F_Text_DoYouKnowWhatAmberIs, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16A367 + goto_if_eq PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter compare VAR_RESULT, NO - goto_if_eq EventScript_16A37B + goto_if_eq PewterCity_Museum_1F_EventScript_ExplainAmber end -EventScript_16A367:: @ 816A367 - msgbox gUnknown_81905B1 +PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter:: @ 816A367 + msgbox PewterCity_Museum_1F_Text_AmberContainsGeneticMatter applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_16A37B:: @ 816A37B - msgbox gUnknown_8190627 +PewterCity_Museum_1F_EventScript_ExplainAmber:: @ 816A37B + msgbox PewterCity_Museum_1F_Text_AmberIsFossilizedSap applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F +PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: @ 816A38F lockall setvar VAR_TEMP_1, 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - goto EventScript_16A3D1 + goto PewterCity_Museum_1F_EventScript_EntranceTrigger end -PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 +PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: @ 816A3A5 lockall setvar VAR_TEMP_1, 1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - goto EventScript_16A3D1 + goto PewterCity_Museum_1F_EventScript_EntranceTrigger end -PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB +PewterCity_Museum_1F_EventScript_EntranceTriggerRight:: @ 816A3BB lockall setvar VAR_TEMP_1, 2 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - goto EventScript_16A3D1 + goto PewterCity_Museum_1F_EventScript_EntranceTrigger end -EventScript_16A3D1:: @ 816A3D1 +PewterCity_Museum_1F_EventScript_EntranceTrigger:: @ 816A3D1 textcolor 0 showmoneybox 0, 0, 0 - msgbox gUnknown_81904B5, MSGBOX_YESNO + msgbox PewterCity_Museum_1F_Text_Its50YForChildsTicket, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16A402 - msgbox gUnknown_81904F9 + goto_if_eq PewterCity_Museum_1F_EventScript_TryPayForTicket + msgbox PewterCity_Museum_1F_Text_ComeAgain closemessage hidemoneybox 0, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16A48E + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit waitmovement 0 releaseall end -EventScript_16A402:: @ 816A402 +PewterCity_Museum_1F_EventScript_TryPayForTicket:: @ 816A402 checkmoney 50, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16A476 + goto_if_eq PewterCity_Museum_1F_EventScript_NotEnoughMoney closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16A455 + call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16A460 + call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16A46B + call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 waitse - msgbox gUnknown_8190505 + msgbox PewterCity_Museum_1F_Text_Right50YThankYou setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 1 hidemoneybox 0, 0 releaseall end -EventScript_16A455:: @ 816A455 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16A490 +PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft:: @ 816A455 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterLeft waitmovement 0 return -EventScript_16A460:: @ 816A460 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16A495 +PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid:: @ 816A460 + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterMid waitmovement 0 return -EventScript_16A46B:: @ 816A46B - applymovement OBJ_EVENT_ID_PLAYER, Movement_16A499 +PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight:: @ 816A46B + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterRight waitmovement 0 return -EventScript_16A476:: @ 816A476 - msgbox gUnknown_819051C +PewterCity_Museum_1F_EventScript_NotEnoughMoney:: @ 816A476 + msgbox PewterCity_Museum_1F_Text_DontHaveEnoughMoney closemessage hidemoneybox 0, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16A48E + applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit waitmovement 0 releaseall end -Movement_16A48E:: @ 816A48E +PewterCity_Museum_1F_Movement_ForcePlayerExit:: @ 816A48E walk_down step_end -Movement_16A490:: @ 816A490 +PewterCity_Museum_1F_Movement_ApproachCounterLeft:: @ 816A490 walk_right walk_right delay_8 walk_in_place_right step_end -Movement_16A495:: @ 816A495 +PewterCity_Museum_1F_Movement_ApproachCounterMid:: @ 816A495 walk_right delay_8 walk_in_place_right step_end -Movement_16A499:: @ 816A499 +PewterCity_Museum_1F_Movement_ApproachCounterRight:: @ 816A499 delay_8 walk_in_place_right step_end -PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C - msgbox gUnknown_81908CD, MSGBOX_NPC +PewterCity_Museum_1F_EventScript_Scientist2:: @ 816A49C + msgbox PewterCity_Museum_1F_Text_WeHaveTwoFossilsOnExhibit, MSGBOX_NPC end -PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 - msgbox gUnknown_81906B4, MSGBOX_NPC +PewterCity_Museum_1F_EventScript_OldMan:: @ 816A4A5 + msgbox PewterCity_Museum_1F_Text_ShouldBeGratefulForLongLife, MSGBOX_NPC end -PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE +PewterCity_Museum_1F_EventScript_OldAmberScientist:: @ 816A4AE lock faceplayer - goto_if_set FLAG_GOT_OLD_AMBER, EventScript_16A4FF - msgbox gUnknown_8190717 + goto_if_set FLAG_GOT_OLD_AMBER, PewterCity_Museum_1F_EventScript_AlreadyGotOldAmber + msgbox PewterCity_Museum_1F_Text_WantYouToGetAmberExamined checkitemspace ITEM_OLD_AMBER, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16A4F5 + goto_if_eq PewterCity_Museum_1F_EventScript_NoRoomForOldAmber setflag FLAG_GOT_OLD_AMBER removeobject 4 - giveitem_msg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 + giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_FAN5 release end -EventScript_16A4F5:: @ 816A4F5 - msgbox gUnknown_81908AE +PewterCity_Museum_1F_EventScript_NoRoomForOldAmber:: @ 816A4F5 + msgbox PewterCity_Museum_1F_Text_DontHaveSpaceForThis release end -EventScript_16A4FF:: @ 816A4FF - msgbox gUnknown_819088E +PewterCity_Museum_1F_EventScript_AlreadyGotOldAmber:: @ 816A4FF + msgbox PewterCity_Museum_1F_Text_GetOldAmberChecked release end -PewterCity_Museum_1F_EventScript_16A509:: @ 816A509 - msgbox gUnknown_819090A, MSGBOX_NPC +PewterCity_Museum_1F_EventScript_OldAmber:: @ 816A509 + msgbox PewterCity_Museum_1F_Text_BeautifulPieceOfAmber, MSGBOX_NPC end -PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 +PewterCity_Museum_1F_EventScript_AerodactylFossil:: @ 816A512 lockall setvar VAR_0x8004, SPECIES_AERODACTYL setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 special Special_OpenMuseumFossilPic - msgbox gUnknown_8190945 + msgbox PewterCity_Museum_1F_Text_AerodactylFossil special Special_CloseMuseumFossilPic releaseall end -PewterCity_Museum_1F_EventScript_16A532:: @ 816A532 +PewterCity_Museum_1F_EventScript_KabutopsFossil:: @ 816A532 lockall setvar VAR_0x8004, SPECIES_KABUTOPS setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 special Special_OpenMuseumFossilPic - msgbox gUnknown_8190975 + msgbox PewterCity_Museum_1F_Text_KabutopsFossil special Special_CloseMuseumFossilPic releaseall end diff --git a/data/maps/PewterCity_Museum_1F/text.inc b/data/maps/PewterCity_Museum_1F/text.inc index 0c784c4d2..ea1e55dec 100644 --- a/data/maps/PewterCity_Museum_1F/text.inc +++ b/data/maps/PewterCity_Museum_1F/text.inc @@ -1,49 +1,50 @@ -gUnknown_81904B5:: @ 81904B5 +PewterCity_Museum_1F_Text_Its50YForChildsTicket:: @ 81904B5 .string "Yes, yes.\n" .string "It's ¥50 for a child's ticket.\p" .string "Would you like to come in?$" -gUnknown_81904F9:: @ 81904F9 +PewterCity_Museum_1F_Text_ComeAgain:: @ 81904F9 .string "Come again!$" -gUnknown_8190505:: @ 8190505 +PewterCity_Museum_1F_Text_Right50YThankYou:: @ 8190505 .string "Right, ¥50!\n" .string "Thank you!$" -gUnknown_819051C:: @ 819051C +PewterCity_Museum_1F_Text_DontHaveEnoughMoney:: @ 819051C .string "You don't have enough money.$" -gUnknown_8190539:: @ 8190539 +PewterCity_Museum_1F_Text_PleaseEnjoyYourself:: @ 8190539 .string "Please enjoy yourself.$" -gUnknown_8190550:: @ 8190550 +PewterCity_Museum_1F_Text_DoYouKnowWhatAmberIs:: @ 8190550 .string "You can't sneak in the back way!\n" .string "Nice try, kid, but no.\p" .string "Oh, whatever!\n" .string "Do you know what AMBER is?$" -gUnknown_81905B1:: @ 81905B1 +PewterCity_Museum_1F_Text_AmberContainsGeneticMatter:: @ 81905B1 .string "AMBER contains the genetic matter\n" .string "of ancient POKéMON.\p" .string "There's a LAB somewhere trying to\n" .string "resurrect POKéMON from AMBER.$" -gUnknown_8190627:: @ 8190627 +PewterCity_Museum_1F_Text_AmberIsFossilizedSap:: @ 8190627 .string "AMBER is actually sap, that gooey\n" .string "stuff that oozes from trees.\p" .string "The ancient sap fossilized over\n" .string "time to become rock-hard AMBER.$" -Text_1906A6:: @ 81906A6 +@ Unused +PewterCity_Museum_1F_Text_PleaseGoAround:: @ 81906A6 .string "あちらへ おまわりください$" -gUnknown_81906B4:: @ 81906B4 +PewterCity_Museum_1F_Text_ShouldBeGratefulForLongLife:: @ 81906B4 .string "I should be grateful for my long\n" .string "life.\p" .string "Never did I think I would get to\n" .string "see the bones of a dragon!$" -gUnknown_8190717:: @ 8190717 +PewterCity_Museum_1F_Text_WantYouToGetAmberExamined:: @ 8190717 .string "Ssh! Listen, I need to share a\n" .string "secret with someone.\p" .string "I think that this chunk of AMBER\n" @@ -57,30 +58,30 @@ gUnknown_8190717:: @ 8190717 .string "I want you to get this examined at\n" .string "a POKéMON LAB somewhere.$" -gUnknown_8190866:: @ 8190866 +PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan:: @ 8190866 .string "{PLAYER} received the OLD AMBER\n" .string "from the man.$" -gUnknown_819088E:: @ 819088E +PewterCity_Museum_1F_Text_GetOldAmberChecked:: @ 819088E .string "Ssh!\n" .string "Get the OLD AMBER checked!$" -gUnknown_81908AE:: @ 81908AE +PewterCity_Museum_1F_Text_DontHaveSpaceForThis:: @ 81908AE .string "You don't have space for this.$" -gUnknown_81908CD:: @ 81908CD +PewterCity_Museum_1F_Text_WeHaveTwoFossilsOnExhibit:: @ 81908CD .string "We have two fossils of rare,\n" .string "prehistoric POKéMON on exhibit.$" -gUnknown_819090A:: @ 819090A +PewterCity_Museum_1F_Text_BeautifulPieceOfAmber:: @ 819090A .string "There is a beautiful piece of\n" .string "AMBER in a clear gold color.$" -gUnknown_8190945:: @ 8190945 +PewterCity_Museum_1F_Text_AerodactylFossil:: @ 8190945 .string "AERODACTYL Fossil\n" .string "A primitive and rare POKéMON.$" -gUnknown_8190975:: @ 8190975 +PewterCity_Museum_1F_Text_KabutopsFossil:: @ 8190975 .string "KABUTOPS Fossil\n" .string "A primitive and rare POKéMON.$" diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 32eebc0dc..0139c1133 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_2F_EventScript_16A565", + "script": "PewterCity_Museum_2F_EventScript_Scientist", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_2F_EventScript_16A553", + "script": "PewterCity_Museum_2F_EventScript_Man", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_2F_EventScript_16A55C", + "script": "PewterCity_Museum_2F_EventScript_OldMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_2F_EventScript_16A56E", + "script": "PewterCity_Museum_2F_EventScript_LittleGirl", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_2F_EventScript_16A577", + "script": "PewterCity_Museum_2F_EventScript_BaldingMan", "flag": "0" } ], @@ -95,56 +95,56 @@ "x": 3, "y": 6, "elevation": 0, - "script": "PewterCity_Museum_2F_EventScript_16A589" + "script": "PewterCity_Museum_2F_EventScript_MoonStone" }, { "type": "bg_event_type_0", "x": 15, "y": 5, "elevation": 0, - "script": "PewterCity_Museum_2F_EventScript_16A580" + "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { "type": "bg_event_type_0", "x": 14, "y": 5, "elevation": 0, - "script": "PewterCity_Museum_2F_EventScript_16A580" + "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { "type": "bg_event_type_0", "x": 16, "y": 5, "elevation": 0, - "script": "PewterCity_Museum_2F_EventScript_16A580" + "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { "type": "bg_event_type_0", "x": 14, "y": 4, "elevation": 0, - "script": "PewterCity_Museum_2F_EventScript_16A580" + "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { "type": "bg_event_type_0", "x": 15, "y": 4, "elevation": 0, - "script": "PewterCity_Museum_2F_EventScript_16A580" + "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { "type": "bg_event_type_0", "x": 16, "y": 4, "elevation": 0, - "script": "PewterCity_Museum_2F_EventScript_16A580" + "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { "type": "bg_event_type_0", "x": 3, "y": 5, "elevation": 0, - "script": "PewterCity_Museum_2F_EventScript_16A589" + "script": "PewterCity_Museum_2F_EventScript_MoonStone" } ] } diff --git a/data/maps/PewterCity_Museum_2F/scripts.inc b/data/maps/PewterCity_Museum_2F/scripts.inc index 11b1af625..67f92f0ec 100644 --- a/data/maps/PewterCity_Museum_2F/scripts.inc +++ b/data/maps/PewterCity_Museum_2F/scripts.inc @@ -1,30 +1,30 @@ PewterCity_Museum_2F_MapScripts:: @ 816A552 .byte 0 -PewterCity_Museum_2F_EventScript_16A553:: @ 816A553 - msgbox gUnknown_8190B30, MSGBOX_NPC +PewterCity_Museum_2F_EventScript_Man:: @ 816A553 + msgbox PewterCity_Museum_1F_Text_WhatsSpecialAboutMoonStone, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C - msgbox gUnknown_8190B80, MSGBOX_NPC +PewterCity_Museum_2F_EventScript_OldMan:: @ 816A55C + msgbox PewterCity_Museum_1F_Text_BoughtColorTVForMoonLanding, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_16A565:: @ 816A565 - msgbox gUnknown_8190BF3, MSGBOX_NPC +PewterCity_Museum_2F_EventScript_Scientist:: @ 816A565 + msgbox PewterCity_Museum_1F_Text_RunningSpaceExhibitThisMonth, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E - msgbox gUnknown_8190C1E, MSGBOX_NPC +PewterCity_Museum_2F_EventScript_LittleGirl:: @ 816A56E + msgbox PewterCity_Museum_1F_Text_AskedDaddyToCatchPikachu, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_16A577:: @ 816A577 - msgbox gUnknown_8190C60, MSGBOX_NPC +PewterCity_Museum_2F_EventScript_BaldingMan:: @ 816A577 + msgbox PewterCity_Museum_1F_Text_PikachuSoonIPromise, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_16A580:: @ 816A580 - msgbox gUnknown_8190C81, MSGBOX_SIGN +PewterCity_Museum_2F_EventScript_SpaceShuttle:: @ 816A580 + msgbox PewterCity_Museum_1F_Text_SpaceShuttle, MSGBOX_SIGN end -PewterCity_Museum_2F_EventScript_16A589:: @ 816A589 - msgbox gUnknown_8190C8F, MSGBOX_SIGN +PewterCity_Museum_2F_EventScript_MoonStone:: @ 816A589 + msgbox PewterCity_Museum_1F_Text_MeteoriteThatFellOnMtMoon, MSGBOX_SIGN end diff --git a/data/maps/PewterCity_Museum_2F/text.inc b/data/maps/PewterCity_Museum_2F/text.inc index 2c1cd4d20..f1d5a95a4 100644 --- a/data/maps/PewterCity_Museum_2F/text.inc +++ b/data/maps/PewterCity_Museum_2F/text.inc @@ -21,34 +21,34 @@ Text_SeismicTossTaught:: @ 8190B00 .string "I hope you won't toss in the towel.\n" .string "Keep it up.$" -gUnknown_8190B30:: @ 8190B30 +PewterCity_Museum_1F_Text_WhatsSpecialAboutMoonStone:: @ 8190B30 .string "MOON STONE, huh?\p" .string "What's so special about it?\n" .string "Looks like an ordinary rock to me.$" -gUnknown_8190B80:: @ 8190B80 +PewterCity_Museum_1F_Text_BoughtColorTVForMoonLanding:: @ 8190B80 .string "July 20, 1969!\p" .string "Humankind first set foot on the\n" .string "moon that day.\p" .string "I bought a color TV just so I\n" .string "could watch that news.$" -gUnknown_8190BF3:: @ 8190BF3 +PewterCity_Museum_1F_Text_RunningSpaceExhibitThisMonth:: @ 8190BF3 .string "This month, we're running a space\n" .string "exhibit.$" -gUnknown_8190C1E:: @ 8190C1E +PewterCity_Museum_1F_Text_AskedDaddyToCatchPikachu:: @ 8190C1E .string "I want a PIKACHU!\n" .string "It's so cute!\p" .string "I asked my daddy to catch me one!$" -gUnknown_8190C60:: @ 8190C60 +PewterCity_Museum_1F_Text_PikachuSoonIPromise:: @ 8190C60 .string "Yeah, a PIKACHU soon, I promise!$" -gUnknown_8190C81:: @ 8190C81 +PewterCity_Museum_1F_Text_SpaceShuttle:: @ 8190C81 .string "Space Shuttle$" -gUnknown_8190C8F:: @ 8190C8F +PewterCity_Museum_1F_Text_MeteoriteThatFellOnMtMoon:: @ 8190C8F .string "A meteorite that fell on MT. MOON.\n" .string "It is thought to be a MOON STONE.$" diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 4c223fd38..9de4e5b69 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_1F_EventScript_16A781", + "script": "PewterCity_PokemonCenter_1F_EventScript_Jigglypuff", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_1F_EventScript_16A778", + "script": "PewterCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_1F_EventScript_16A76F", + "script": "PewterCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_1F_EventScript_16A798", + "script": "PewterCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MysteryEventClub_EventScript_Man", + "script": "MysteryEventClub_EventScript_Woman", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_1F_EventScript_16A7A1", + "script": "PewterCity_PokemonCenter_1F_EventScript_GBAKid1", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_1F_EventScript_16A7AC", + "script": "PewterCity_PokemonCenter_1F_EventScript_GBAKid2", "flag": "0" } ], diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 6cf1f5137..5ec0e0cd9 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -7,39 +7,39 @@ PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B setrespawn SPAWN_PEWTER_CITY end -PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F +PewterCity_PokemonCenter_1F_EventScript_Nurse:: @ 816A76F lock faceplayer call EventScript_PkmnCenterNurse release end -PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778 - msgbox gUnknown_81916A9, MSGBOX_NPC +PewterCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816A778 + msgbox PewterCity_Museum_1F_Text_TeamRocketMtMoonImOnPhone, MSGBOX_NPC end -PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 +PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 lock faceplayer fadeoutbgm 0 playbgm MUS_PURIN, 0 - message Text_1916EA + message PewterCity_Museum_1F_Text_Jigglypuff waitmessage delay 455 playbgm MUS_POKECEN, 1 release end -PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798 - msgbox gUnknown_8191701, MSGBOX_NPC +PewterCity_PokemonCenter_1F_EventScript_Youngster:: @ 816A798 + msgbox PewterCity_Museum_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy, MSGBOX_NPC end -PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 +PewterCity_PokemonCenter_1F_EventScript_GBAKid1:: @ 816A7A1 lock - msgbox gUnknown_8191743 + msgbox PewterCity_Museum_1F_Text_TradingMyClefairyForPikachu release end -PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC - msgbox gUnknown_8191780, MSGBOX_NPC +PewterCity_PokemonCenter_1F_EventScript_GBAKid2:: @ 816A7AC + msgbox PewterCity_Museum_1F_Text_TradingPikachuWithKid, MSGBOX_NPC end diff --git a/data/maps/PewterCity_PokemonCenter_1F/text.inc b/data/maps/PewterCity_PokemonCenter_1F/text.inc index f297bfa51..ebcfae41f 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/text.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/text.inc @@ -1,25 +1,25 @@ -gUnknown_81916A9:: @ 81916A9 +PewterCity_Museum_1F_Text_TeamRocketMtMoonImOnPhone:: @ 81916A9 .string "What!?\p" .string "TEAM ROCKET is at MT. MOON?\n" .string "Huh?\p" .string "I'm on the phone!\n" .string "Scram!$" -Text_1916EA:: @ 81916EA +PewterCity_Museum_1F_Text_Jigglypuff:: @ 81916EA .string "JIGGLYPUFF: Puu pupuu!$" -gUnknown_8191701:: @ 8191701 +PewterCity_Museum_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy:: @ 8191701 .string "Yawn!\p" .string "When JIGGLYPUFF sings, POKéMON get\n" .string "drowsy…\p" .string "…Me, too…\n" .string "Snore…$" -gUnknown_8191743:: @ 8191743 +PewterCity_Museum_1F_Text_TradingMyClefairyForPikachu:: @ 8191743 .string "I really want a PIKACHU, so I'm\n" .string "trading my CLEFAIRY for one.$" -gUnknown_8191780:: @ 8191780 +PewterCity_Museum_1F_Text_TradingPikachuWithKid:: @ 8191780 .string "I'm trading POKéMON with that kid\n" .string "there.\p" .string "I had two PIKACHU, so I figured\n" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 88e1fa1f5..bf139e1a3 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -51,11 +51,11 @@ MtMoon_1F_EventScript_1ACE03:: @ 81ACE03 release end -PewterCity_Museum_1F_EventScript_1ACE1C:: @ 81ACE1C +PewterCity_Museum_1F_EventScript_PokemonJournalBrock:: @ 81ACE1C lockall famechecker FAMECHECKER_BROCK, 5 textcolor 3 - msgbox gUnknown_81B146A + msgbox PokemonJournal_Text_SpecialFeatureBrock releaseall end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index b409a8af9..d47a2d06c 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,6 +1,6 @@ .equ GAVE_PROFILE, VAR_TEMP_1 -MysteryEventClub_EventScript_Man:: @ 81BEE16 +MysteryEventClub_EventScript_Woman:: @ 81BEE16 lock faceplayer compare GAVE_PROFILE, TRUE diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 8da7dded8..0f178a6ee 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1373,7 +1373,7 @@ gFameCheckerFlavorTextOriginObjectName_Giovanni4:: @ 81B145F gFameCheckerFlavorTextOriginObjectName_Giovanni5:: @ 81B1463 .string "GIDEON$" -gUnknown_81B146A:: @ 81B146A +PokemonJournal_Text_SpecialFeatureBrock:: @ 81B146A .string "POKéMON JOURNAL\p" .string "Special Feature: PEWTER GYM\n" .string "LEADER BROCK!\p" |