From ef1f9ead0ba44c67185dccc616846646d7ce9257 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 23 Jan 2020 14:46:03 -0500 Subject: Document Trainer Tower scripts --- .../scripts.inc | 2 +- data/maps/RocketHideout_Elevator/scripts.inc | 2 +- data/maps/SevenIsland_TrainerTower/map.json | 2 +- data/maps/SevenIsland_TrainerTower_1F/map.json | 128 ----------- data/maps/SevenIsland_TrainerTower_1F/scripts.inc | 60 ------ data/maps/SevenIsland_TrainerTower_2F/map.json | 135 ------------ data/maps/SevenIsland_TrainerTower_2F/scripts.inc | 25 --- data/maps/SevenIsland_TrainerTower_3F/map.json | 135 ------------ data/maps/SevenIsland_TrainerTower_3F/scripts.inc | 25 --- data/maps/SevenIsland_TrainerTower_4F/map.json | 135 ------------ data/maps/SevenIsland_TrainerTower_4F/scripts.inc | 25 --- data/maps/SevenIsland_TrainerTower_5F/map.json | 135 ------------ data/maps/SevenIsland_TrainerTower_5F/scripts.inc | 25 --- data/maps/SevenIsland_TrainerTower_6F/map.json | 135 ------------ data/maps/SevenIsland_TrainerTower_6F/scripts.inc | 25 --- data/maps/SevenIsland_TrainerTower_7F/map.json | 135 ------------ data/maps/SevenIsland_TrainerTower_7F/scripts.inc | 25 --- data/maps/SevenIsland_TrainerTower_8F/map.json | 135 ------------ data/maps/SevenIsland_TrainerTower_8F/scripts.inc | 25 --- .../SevenIsland_TrainerTower_Elevator/map.json | 35 --- .../SevenIsland_TrainerTower_Elevator/scripts.inc | 80 ------- data/maps/SevenIsland_TrainerTower_Lobby/map.json | 125 ----------- .../SevenIsland_TrainerTower_Lobby/scripts.inc | 235 --------------------- data/maps/SevenIsland_TrainerTower_Lobby/text.inc | 118 ----------- data/maps/SevenIsland_TrainerTower_Roof/map.json | 48 ----- .../maps/SevenIsland_TrainerTower_Roof/scripts.inc | 8 - data/maps/SilphCo_Elevator/scripts.inc | 2 +- data/maps/TrainerTower_1F/map.json | 128 +++++++++++ data/maps/TrainerTower_1F/scripts.inc | 27 +++ data/maps/TrainerTower_2F/map.json | 135 ++++++++++++ data/maps/TrainerTower_2F/scripts.inc | 27 +++ data/maps/TrainerTower_3F/map.json | 135 ++++++++++++ data/maps/TrainerTower_3F/scripts.inc | 27 +++ data/maps/TrainerTower_4F/map.json | 135 ++++++++++++ data/maps/TrainerTower_4F/scripts.inc | 27 +++ data/maps/TrainerTower_5F/map.json | 135 ++++++++++++ data/maps/TrainerTower_5F/scripts.inc | 27 +++ data/maps/TrainerTower_6F/map.json | 135 ++++++++++++ data/maps/TrainerTower_6F/scripts.inc | 27 +++ data/maps/TrainerTower_7F/map.json | 135 ++++++++++++ data/maps/TrainerTower_7F/scripts.inc | 27 +++ data/maps/TrainerTower_8F/map.json | 135 ++++++++++++ data/maps/TrainerTower_8F/scripts.inc | 27 +++ data/maps/TrainerTower_Elevator/map.json | 35 +++ data/maps/TrainerTower_Elevator/scripts.inc | 80 +++++++ data/maps/TrainerTower_Lobby/map.json | 125 +++++++++++ data/maps/TrainerTower_Lobby/scripts.inc | 226 ++++++++++++++++++++ data/maps/TrainerTower_Lobby/text.inc | 120 +++++++++++ data/maps/TrainerTower_Roof/map.json | 48 +++++ data/maps/TrainerTower_Roof/scripts.inc | 10 + data/maps/map_groups.json | 22 +- 51 files changed, 1948 insertions(+), 1972 deletions(-) delete mode 100644 data/maps/SevenIsland_TrainerTower_1F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_1F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_2F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_2F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_3F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_3F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_4F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_4F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_5F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_5F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_6F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_6F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_7F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_7F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_8F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_8F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/text.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Roof/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_Roof/scripts.inc create mode 100644 data/maps/TrainerTower_1F/map.json create mode 100644 data/maps/TrainerTower_1F/scripts.inc create mode 100644 data/maps/TrainerTower_2F/map.json create mode 100644 data/maps/TrainerTower_2F/scripts.inc create mode 100644 data/maps/TrainerTower_3F/map.json create mode 100644 data/maps/TrainerTower_3F/scripts.inc create mode 100644 data/maps/TrainerTower_4F/map.json create mode 100644 data/maps/TrainerTower_4F/scripts.inc create mode 100644 data/maps/TrainerTower_5F/map.json create mode 100644 data/maps/TrainerTower_5F/scripts.inc create mode 100644 data/maps/TrainerTower_6F/map.json create mode 100644 data/maps/TrainerTower_6F/scripts.inc create mode 100644 data/maps/TrainerTower_7F/map.json create mode 100644 data/maps/TrainerTower_7F/scripts.inc create mode 100644 data/maps/TrainerTower_8F/map.json create mode 100644 data/maps/TrainerTower_8F/scripts.inc create mode 100644 data/maps/TrainerTower_Elevator/map.json create mode 100644 data/maps/TrainerTower_Elevator/scripts.inc create mode 100644 data/maps/TrainerTower_Lobby/map.json create mode 100644 data/maps/TrainerTower_Lobby/scripts.inc create mode 100644 data/maps/TrainerTower_Lobby/text.inc create mode 100644 data/maps/TrainerTower_Roof/map.json create mode 100644 data/maps/TrainerTower_Roof/scripts.inc (limited to 'data/maps') diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 14198db2f..5992525c9 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -4,7 +4,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_WantWhichFloor diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index f649e5c40..e797e98a9 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -5,7 +5,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 lockall goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B setvar VAR_0x8004, 2 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_WantWhichFloor diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 47fb5fa98..31a250297 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -51,7 +51,7 @@ "x": 58, "y": 7, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "dest_map": "MAP_TRAINER_TOWER_LOBBY", "dest_warp_id": 1 } ], diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json deleted file mode 100644 index 924dbbcba..000000000 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", - "name": "SevenIsland_TrainerTower_1F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "0x0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 0, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc deleted file mode 100644 index 4987c1142..000000000 --- a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc +++ /dev/null @@ -1,60 +0,0 @@ -SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_1F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_6F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_8F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8 - call EventScript_1C52F4 - end - -SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_6F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_8F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE - call EventScript_1C533B - end - -SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_6F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_8F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4 - call EventScript_1C5382 - end - -SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_6F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_8F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA - call EventScript_1C538C - end - -SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_6F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_8F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json deleted file mode 100644 index 6d0fbaa4c..000000000 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", - "name": "SevenIsland_TrainerTower_2F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc deleted file mode 100644 index 9e61d0dfd..000000000 --- a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_2F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6 - call EventScript_1C52F4 - end - -EventScript_1646FC:: @ 81646FC - call EventScript_1C533B - end - -EventScript_164702:: @ 8164702 - call EventScript_1C5382 - end - -EventScript_164708:: @ 8164708 - call EventScript_1C538C - end - -EventScript_16470E:: @ 816470E - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json deleted file mode 100644 index 780878898..000000000 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", - "name": "SevenIsland_TrainerTower_3F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc deleted file mode 100644 index e9afcff6c..000000000 --- a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_3F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724 - call EventScript_1C52F4 - end - -EventScript_16472A:: @ 816472A - call EventScript_1C533B - end - -EventScript_164730:: @ 8164730 - call EventScript_1C5382 - end - -EventScript_164736:: @ 8164736 - call EventScript_1C538C - end - -EventScript_16473C:: @ 816473C - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json deleted file mode 100644 index d4a021ff3..000000000 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", - "name": "SevenIsland_TrainerTower_4F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc deleted file mode 100644 index cfa0be11b..000000000 --- a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_4F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752 - call EventScript_1C52F4 - end - -EventScript_164758:: @ 8164758 - call EventScript_1C533B - end - -EventScript_16475E:: @ 816475E - call EventScript_1C5382 - end - -EventScript_164764:: @ 8164764 - call EventScript_1C538C - end - -EventScript_16476A:: @ 816476A - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json deleted file mode 100644 index 1ee41e1b4..000000000 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", - "name": "SevenIsland_TrainerTower_5F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc deleted file mode 100644 index 35ccdf129..000000000 --- a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_5F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780 - call EventScript_1C52F4 - end - -EventScript_164786:: @ 8164786 - call EventScript_1C533B - end - -EventScript_16478C:: @ 816478C - call EventScript_1C5382 - end - -EventScript_164792:: @ 8164792 - call EventScript_1C538C - end - -EventScript_164798:: @ 8164798 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json deleted file mode 100644 index abaab80d6..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", - "name": "SevenIsland_TrainerTower_6F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc deleted file mode 100644 index 361c92749..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_6F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE - call EventScript_1C52F4 - end - -EventScript_1647B4:: @ 81647B4 - call EventScript_1C533B - end - -EventScript_1647BA:: @ 81647BA - call EventScript_1C5382 - end - -EventScript_1647C0:: @ 81647C0 - call EventScript_1C538C - end - -EventScript_1647C6:: @ 81647C6 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json deleted file mode 100644 index 827c6c9ca..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", - "name": "SevenIsland_TrainerTower_7F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc deleted file mode 100644 index be0036605..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_7F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC - call EventScript_1C52F4 - end - -EventScript_1647E2:: @ 81647E2 - call EventScript_1C533B - end - -EventScript_1647E8:: @ 81647E8 - call EventScript_1C5382 - end - -EventScript_1647EE:: @ 81647EE - call EventScript_1C538C - end - -EventScript_1647F4:: @ 81647F4 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json deleted file mode 100644 index ed9ba908f..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", - "name": "SevenIsland_TrainerTower_8F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc deleted file mode 100644 index b51982f48..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_8F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A - call EventScript_1C52F4 - end - -EventScript_164810:: @ 8164810 - call EventScript_1C533B - end - -EventScript_164816:: @ 8164816 - call EventScript_1C5382 - end - -EventScript_16481C:: @ 816481C - call EventScript_1C538C - end - -EventScript_164822:: @ 8164822 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/SevenIsland_TrainerTower_Elevator/map.json deleted file mode 100644 index fef686312..000000000 --- a/data/maps/SevenIsland_TrainerTower_Elevator/map.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "name": "SevenIsland_TrainerTower_Elevator", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [], - "warp_events": [ - { - "x": 2, - "y": 5, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "bg_event_type_0", - "x": 0, - "y": 2, - "elevation": 0, - "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03" - } - ] -} diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc deleted file mode 100644 index f84c67295..000000000 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ /dev/null @@ -1,80 +0,0 @@ -SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 - .byte 0 - -SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 - lockall - setvar VAR_0x8004, 6 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special Special_DrawElevatorCurrentFloorWindow - message Text_WantWhichFloor - waitmessage - setvar VAR_0x8004, 6 - specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos - switch VAR_RESULT - case 0, EventScript_164B46 - case 1, EventScript_164B52 - end - -EventScript_164B46:: @ 8164B46 - multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE - goto EventScript_164B5E - end - -EventScript_164B52:: @ 8164B52 - multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE - goto EventScript_164B5E - end - -EventScript_164B5E:: @ 8164B5E - switch VAR_RESULT - case 0, EventScript_164BCD - case 1, EventScript_164B90 - case 2, EventScript_164BD3 - case 127, EventScript_164BD3 - end - -EventScript_164B90:: @ 8164B90 - setvar VAR_0x8006, 3 - setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - compare VAR_ELEVATOR_FLOOR, 3 - goto_if_eq EventScript_164BD3 - call EventScript_164BD8 - setvar VAR_ELEVATOR_FLOOR, 3 - special Special_CloseElevatorCurrentFloorWindow - delay 25 - applymovement OBJ_EVENT_ID_PLAYER, Movement_164BE5 - waitmovement 0 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - waitstate - releaseall - end - -EventScript_164BCD:: @ 8164BCD - goto EventScript_164BD3 - end - -EventScript_164BD3:: @ 8164BD3 - special Special_CloseElevatorCurrentFloorWindow - releaseall - end - -EventScript_164BD8:: @ 8164BD8 - special Special_CloseElevatorCurrentFloorWindow - closemessage - waitse - special Special_AnimateElevator - waitstate - setflag FLAG_TEMP_2 - return - -Movement_164BE5:: @ 8164BE5 - walk_in_place_fastest_down - delay_16 - walk_down - walk_right - walk_right - walk_down - step_end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json deleted file mode 100644 index 3f553ce47..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "name": "SevenIsland_TrainerTower_Lobby", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", - "x": 4, - "y": 9, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_16495D", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", - "x": 14, - "y": 9, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164992", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", - "x": 11, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164966", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", - "x": 12, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AE6", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", - "x": 2, - "y": 12, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AEF", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 9, - "y": 2, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", - "dest_warp_id": 1 - }, - { - "x": 9, - "y": 15, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", - "dest_warp_id": 0 - }, - { - "x": 17, - "y": 8, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 9, - "y": 7, - "elevation": 3, - "var": "VAR_MAP_SCENE_TRAINER_TOWER", - "var_value": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE" - } - ], - "bg_events": [ - { - "type": "bg_event_type_1", - "x": 8, - "y": 10, - "elevation": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8" - } - ] -} diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc deleted file mode 100644 index 0558b5a8b..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ /dev/null @@ -1,235 +0,0 @@ -SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Lobby_OnResume - map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, SevenIsland_TrainerTower_Lobby_OnReturnToField - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_Lobby_OnTransition - map_script MAP_SCRIPT_ON_LOAD, SevenIsland_TrainerTower_Lobby_OnLoad - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Lobby_OnFrame - .byte 0 - -SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 - setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 10 - special sub_815D9E8 - setvar VAR_0x8004, 18 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_eq EventScript_164886 - setvar VAR_TEMP_0, 0 - setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - -EventScript_164886:: @ 8164886 - end - -SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 - addobject 1 - addobject 2 - addobject 3 - addobject 4 - addobject 5 - end - -SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 - compare VAR_TEMP_D, 17 - call_if_eq EventScript_1648A3 - end - -EventScript_1648A3:: @ 81648A3 - setmetatile 17, 10, 647, 0 - return - -SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD - setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY - getplayerxy VAR_TEMP_D, VAR_RESULT - end - -SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6 - map_script_2 VAR_TEMP_0, 0, EventScript_1648ED - map_script_2 VAR_TEMP_D, 0x11, EventScript_1648C8 - .2byte 0 - -EventScript_1648C8:: @ 81648C8 - lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_1648EA - waitmovement 0 - setmetatile 17, 10, 692, 1 - special DrawWholeMapView - playse SE_TK_KASYA - waitse - setvar VAR_TEMP_D, 0 - releaseall - end - -Movement_1648EA:: @ 81648EA - walk_down - walk_down - step_end - -EventScript_1648ED:: @ 81648ED - setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 12 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_164920 - case 1, EventScript_164938 - case 2, EventScript_16495C - -EventScript_164920:: @ 8164920 - lock - faceplayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - textcolor 1 - msgbox gUnknown_817C937 - goto EventScript_16494B - -EventScript_164938:: @ 8164938 - lock - faceplayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - textcolor 1 - msgbox gUnknown_817C9C0 - -EventScript_16494B:: @ 816494B - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 - waitmovement 0 - setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 - release - -EventScript_16495C:: @ 816495C - end - -SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D - lock - faceplayer - call EventScript_PkmnCenterNurse - release - end - -SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 - lock - faceplayer - setvar VAR_0x8004, 20 - special sub_815D9E8 - compare VAR_RESULT, 1 - goto_if_eq EventScript_164988 - msgbox gUnknown_817C9A2 - goto EventScript_164990 - -EventScript_164988:: @ 8164988 - msgbox gUnknown_817CE1F - -EventScript_164990:: @ 8164990 - release - end - -SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 - goto_if_questlog EventScript_ReleaseEnd - lock - faceplayer - message Text_MayIHelpYou - waitmessage - pokemart Items_1649B8 - msgbox Text_PleaseComeAgain - release - end - - .align 2 -Items_1649B8:: @ 81649B8 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_HYPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end - -SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE - lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - textcolor 1 - msgbox gUnknown_817C794 - setvar VAR_0x8004, 17 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_eq EventScript_164A00 - msgbox gUnknown_817C7D9 - goto EventScript_164A08 - -EventScript_164A00:: @ 8164A00 - msgbox gUnknown_817C850 - -EventScript_164A08:: @ 8164A08 - message Text_17C88D - waitmessage - multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE - switch VAR_RESULT - case 0, EventScript_164A53 - case 1, EventScript_164ABF - case 2, EventScript_164A45 - case 127, EventScript_164ABF - end - -EventScript_164A45:: @ 8164A45 - msgbox gUnknown_817CCC9 - goto EventScript_164A08 - end - -EventScript_164A53:: @ 8164A53 - multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE - switch VAR_RESULT - case 0, EventScript_164AA0 - case 1, EventScript_164AA0 - case 2, EventScript_164AA0 - case 3, EventScript_164AA0 - case 4, EventScript_164ABF - case 127, EventScript_164ABF - end - -EventScript_164AA0:: @ 8164AA0 - copyvar VAR_0x8005, VAR_RESULT - setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 - special HealPlayerParty - msgbox gUnknown_817C8BF - setvar VAR_0x8004, 6 - special sub_815D9E8 - releaseall - end - -EventScript_164ABF:: @ 8164ABF - msgbox gUnknown_817C91D - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 - waitmovement 0 - releaseall - end - -Movement_164AD4:: @ 8164AD4 - face_right - step_end - -Movement_164AD6:: @ 8164AD6 - walk_down - step_end - -SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 - lockall - fadescreen FADE_TO_BLACK - setvar VAR_0x8004, 1 - special Special_BattleRecords - waitstate - releaseall - end - -SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 - msgbox gUnknown_817CE38, MSGBOX_NPC - end - -SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF - msgbox gUnknown_817CE9F, MSGBOX_NPC - end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc b/data/maps/SevenIsland_TrainerTower_Lobby/text.inc deleted file mode 100644 index bf1e73b91..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc +++ /dev/null @@ -1,118 +0,0 @@ -gUnknown_817C794:: @ 817C794 - .string "Hello!\p" - .string "Welcome to TRAINER TOWER where\n" - .string "TRAINERS gather from all over!$" - -gUnknown_817C7D9:: @ 817C7D9 - .string "TRAINERS from all over the world\n" - .string "gather here to battle.\p" - .string "Let me see…\p" - .string "Right now, there are TRAINERS only\n" - .string "up to Floor {STR_VAR_1}.$" - -gUnknown_817C850:: @ 817C850 - .string "TRAINERS are awaiting your\n" - .string "challenge up to the eighth floor.$" - -Text_17C88D:: @ 817C88D - .string "Would you like to challenge the\n" - .string "waiting TRAINERS?$" - -gUnknown_817C8BF:: @ 817C8BF - .string "Okay, I'll get the clock started,\n" - .string "so give it everything you have.\p" - .string "On your marks…\p" - .string "Get set…\p" - .string "Go!$" - -gUnknown_817C91D:: @ 817C91D - .string "Please do visit us again!$" - -gUnknown_817C937:: @ 817C937 - .string "That was too bad.\p" - .string "I think you put in a tremendous\n" - .string "effort in your battling.\p" - .string "Please come back and try again!$" - -gUnknown_817C9A2:: @ 817C9A2 - .string "I hope you give it your best.$" - -gUnknown_817C9C0:: @ 817C9C0 - .string "When the TRAINERS switch places,\n" - .string "the movement can be hectic.\p" - .string "To avoid the stampede, we moved\n" - .string "the reception counter here.\p" - .string "I'm sorry for the inconvenience.$" - -Text_17CA5A:: @ 817CA5A - .string "Hello…\p" - .string "I am the owner of this TOWER…\p" - .string "How the sky soars above this\n" - .string "rooftop…\p" - .string "The caress of the winds up here…\p" - .string "It's all so perfect…\p" - .string "The way you battled…\n" - .string "It, too, was perfection…$" - -Text_17CB09:: @ 817CB09 - .string "This is for you…$" - -Text_17CB1A:: @ 817CB1A - .string "Oh!\n" - .string "Stupendous!\p" - .string "It's marvelous how you've come up\n" - .string "here so quickly.\p" - .string "The fact is, you've done it in\n" - .string "record time…\p" - .string "I'll have your record posted at\n" - .string "the reception counter.$" - -Text_17CBC0:: @ 817CBC0 - .string "You seem to have taken your sweet\n" - .string "time getting here…$" - -Text_17CBF5:: @ 817CBF5 - .string "What I would like to see is a\n" - .string "better time out of you…\p" - .string "I'm counting on you.\p" - .string "Until then, farewell…$" - -Text_17CC56:: @ 817CC56 - .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" - -Text_17CC69:: @ 817CC69 - .string "せいせきひょうです$" - -Text_17CC73:: @ 817CC73 - .string "This is a two-on-two battle.\p" - .string "You may not battle unless you have\n" - .string "at least two POKéMON.$" - -gUnknown_817CCC9:: @ 817CCC9 - .string "Here at TRAINER TOWER, there is an\n" - .string "event called TIME ATTACK.\p" - .string "You will be timed on how quickly\n" - .string "you can get from the reception\l" - .string "counter to the OWNER on the roof.\p" - .string "The best times will be recorded on\n" - .string "the Time Board.\p" - .string "Try competing with friends to see\n" - .string "who can beat it the fastest.\p" - .string "You will not earn any EXP. Points\n" - .string "or money by beating TRAINERS here.$" - -gUnknown_817CE1F:: @ 817CE1F - .string "Thank you for competing!$" - -gUnknown_817CE38:: @ 817CE38 - .string "I'm here to see how good I am.\p" - .string "I wonder what kinds of TRAINERS\n" - .string "are waiting for me?\p" - .string "It's nerve-racking!$" - -gUnknown_817CE9F:: @ 817CE9F - .string "Gasp, gasp…\n" - .string "Gasp…\p" - .string "Never mind battling! These stairs…\n" - .string "They're tougher than any battle…$" - diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json deleted file mode 100644 index ee3dbe4c0..000000000 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "name": "SevenIsland_TrainerTower_Roof", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - } - ], - "warp_events": [ - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc deleted file mode 100644 index 6ae4ed2be..000000000 --- a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 - .byte 0 - -SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833 - call EventScript_1C53AA - end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 87ed62c9b..abc60756a 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -4,7 +4,7 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F lockall setvar VAR_0x8004, 1 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_WantWhichFloor diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json new file mode 100644 index 000000000..925dbdd69 --- /dev/null +++ b/data/maps/TrainerTower_1F/map.json @@ -0,0 +1,128 @@ +{ + "id": "MAP_TRAINER_TOWER_1F", + "name": "TrainerTower_1F", + "layout": "LAYOUT_TRAINER_TOWER_1F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_LOBBY", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 0, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_1F/scripts.inc b/data/maps/TrainerTower_1F/scripts.inc new file mode 100644 index 000000000..77917c4a4 --- /dev/null +++ b/data/maps/TrainerTower_1F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_1F_MapScripts:: @ 81646B8 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ All Trainer Tower floors/roof share these scripts for their object events + +TrainerTower_EventScript_DoublesTrainer1:: @ 81646C8 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_EventScript_SinglesTrainer:: @ 81646CE + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_EventScript_KnockoutTrainer:: @ 81646D4 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_EventScript_DoublesTrainer2:: @ 81646DA + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_EventScript_Owner:: @ 81646E0 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json new file mode 100644 index 000000000..e2e2f4c97 --- /dev/null +++ b/data/maps/TrainerTower_2F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_2F", + "name": "TrainerTower_2F", + "layout": "LAYOUT_TRAINER_TOWER_2F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_3F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_1F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_2F/scripts.inc b/data/maps/TrainerTower_2F/scripts.inc new file mode 100644 index 000000000..c34f36a34 --- /dev/null +++ b/data/maps/TrainerTower_2F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_2F_MapScripts:: @ 81646E6 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_2F_EventScript_DoublesTrainer1:: @ 81646F6 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_2F_EventScript_SinglesTrainer:: @ 81646FC + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_2F_EventScript_KnockoutTrainer:: @ 8164702 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_2F_EventScript_DoublesTrainer2:: @ 8164708 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_2F_EventScript_Owner:: @ 816470E + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json new file mode 100644 index 000000000..8db22b61d --- /dev/null +++ b/data/maps/TrainerTower_3F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_3F", + "name": "TrainerTower_3F", + "layout": "LAYOUT_TRAINER_TOWER_3F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_4F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_2F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_3F/scripts.inc b/data/maps/TrainerTower_3F/scripts.inc new file mode 100644 index 000000000..0c8d434eb --- /dev/null +++ b/data/maps/TrainerTower_3F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_3F_MapScripts:: @ 8164714 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_3F_EventScript_DoublesTrainer1:: @ 8164724 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_3F_EventScript_SinglesTrainer:: @ 816472A + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_3F_EventScript_KnockoutTrainer:: @ 8164730 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_3F_EventScript_DoublesTrainer2:: @ 8164736 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_3F_EventScript_Owner:: @ 816473C + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json new file mode 100644 index 000000000..32c868e91 --- /dev/null +++ b/data/maps/TrainerTower_4F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_4F", + "name": "TrainerTower_4F", + "layout": "LAYOUT_TRAINER_TOWER_4F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_5F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_3F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_4F/scripts.inc b/data/maps/TrainerTower_4F/scripts.inc new file mode 100644 index 000000000..6e0e7e09f --- /dev/null +++ b/data/maps/TrainerTower_4F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_4F_MapScripts:: @ 8164742 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_4F_EventScript_DoublesTrainer1:: @ 8164752 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_4F_EventScript_SinglesTrainer:: @ 8164758 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_4F_EventScript_KnockoutTrainer:: @ 816475E + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_4F_EventScript_DoublesTrainer2:: @ 8164764 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_4F_EventScript_Owner:: @ 816476A + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json new file mode 100644 index 000000000..7a32b597c --- /dev/null +++ b/data/maps/TrainerTower_5F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_5F", + "name": "TrainerTower_5F", + "layout": "LAYOUT_TRAINER_TOWER_5F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_6F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_4F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_5F/scripts.inc b/data/maps/TrainerTower_5F/scripts.inc new file mode 100644 index 000000000..71af237be --- /dev/null +++ b/data/maps/TrainerTower_5F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_5F_MapScripts:: @ 8164770 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_5F_EventScript_DoublesTrainer1:: @ 8164780 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_5F_EventScript_SinglesTrainer:: @ 8164786 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_5F_EventScript_KnockoutTrainer:: @ 816478C + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_5F_EventScript_DoublesTrainer2:: @ 8164792 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_5F_EventScript_Owner:: @ 8164798 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json new file mode 100644 index 000000000..05491cf05 --- /dev/null +++ b/data/maps/TrainerTower_6F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_6F", + "name": "TrainerTower_6F", + "layout": "LAYOUT_TRAINER_TOWER_6F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_7F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_5F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_6F/scripts.inc b/data/maps/TrainerTower_6F/scripts.inc new file mode 100644 index 000000000..8b9e1dd38 --- /dev/null +++ b/data/maps/TrainerTower_6F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_6F_MapScripts:: @ 816479E + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_6F_EventScript_DoublesTrainer1:: @ 81647AE + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_6F_EventScript_SinglesTrainer:: @ 81647B4 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_6F_EventScript_KnockoutTrainer:: @ 81647BA + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_6F_EventScript_DoublesTrainer2:: @ 81647C0 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_6F_EventScript_Owner:: @ 81647C6 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json new file mode 100644 index 000000000..76f2a53f4 --- /dev/null +++ b/data/maps/TrainerTower_7F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_7F", + "name": "TrainerTower_7F", + "layout": "LAYOUT_TRAINER_TOWER_7F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_8F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_6F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_7F/scripts.inc b/data/maps/TrainerTower_7F/scripts.inc new file mode 100644 index 000000000..de47276ca --- /dev/null +++ b/data/maps/TrainerTower_7F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_7F_MapScripts:: @ 81647CC + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_7F_EventScript_DoublesTrainer1:: @ 81647DC + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_7F_EventScript_SinglesTrainer:: @ 81647E2 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_7F_EventScript_KnockoutTrainer:: @ 81647E8 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_7F_EventScript_DoublesTrainer2:: @ 81647EE + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_7F_EventScript_Owner:: @ 81647F4 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json new file mode 100644 index 000000000..26cabfb06 --- /dev/null +++ b/data/maps/TrainerTower_8F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_8F", + "name": "TrainerTower_8F", + "layout": "LAYOUT_TRAINER_TOWER_8F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_ROOF", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_7F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_8F/scripts.inc b/data/maps/TrainerTower_8F/scripts.inc new file mode 100644 index 000000000..fc168780b --- /dev/null +++ b/data/maps/TrainerTower_8F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_8F_MapScripts:: @ 81647FA + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_8F_EventScript_DoublesTrainer1:: @ 816480A + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_8F_EventScript_SinglesTrainer:: @ 8164810 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_8F_EventScript_KnockoutTrainer:: @ 8164816 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_8F_EventScript_DoublesTrainer2:: @ 816481C + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_8F_EventScript_Owner:: @ 8164822 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json new file mode 100644 index 000000000..7d004c2df --- /dev/null +++ b/data/maps/TrainerTower_Elevator/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_TOWER_ELEVATOR", + "name": "TrainerTower_Elevator", + "layout": "LAYOUT_TRAINER_TOWER_ELEVATOR", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 0, + "script": "TrainerTower_Elevator_EventScript_FloorSelect" + } + ] +} diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc new file mode 100644 index 000000000..349667102 --- /dev/null +++ b/data/maps/TrainerTower_Elevator/scripts.inc @@ -0,0 +1,80 @@ +TrainerTower_Elevator_MapScripts:: @ 8164AF8 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03 + lockall + setvar VAR_0x8004, 6 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor + copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR + special Special_DrawElevatorCurrentFloorWindow + message Text_WantWhichFloor + waitmessage + setvar VAR_0x8004, 6 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos + switch VAR_RESULT + case 0, TrainerTower_Elevator_EventScript_FloorSelectFromRoof + case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby + end + +TrainerTower_Elevator_EventScript_FloorSelectFromRoof:: @ 8164B46 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE + goto TrainerTower_Elevator_EventScript_ChooseFloor + end + +TrainerTower_Elevator_EventScript_FloorSelectFromLobby:: @ 8164B52 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE + goto TrainerTower_Elevator_EventScript_ChooseFloor + end + +TrainerTower_Elevator_EventScript_ChooseFloor:: @ 8164B5E + switch VAR_RESULT + case 0, TrainerTower_Elevator_EventScript_SelectRoof + case 1, TrainerTower_Elevator_EventScript_SelectLobby + case 2, TrainerTower_Elevator_EventScript_CloseFloorSelect + case SCR_MENU_CANCEL, TrainerTower_Elevator_EventScript_CloseFloorSelect + end + +TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90 + setvar VAR_0x8006, 3 + setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8 + compare VAR_ELEVATOR_FLOOR, 3 + goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect + call TrainerTower_Elevator_EventScript_MoveElevator + setvar VAR_ELEVATOR_FLOOR, 3 + special Special_CloseElevatorCurrentFloorWindow + delay 25 + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator + waitmovement 0 + warp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8 + waitstate + releaseall + end + +TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD + goto TrainerTower_Elevator_EventScript_CloseFloorSelect + end + +TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3 + special Special_CloseElevatorCurrentFloorWindow + releaseall + end + +TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8 + special Special_CloseElevatorCurrentFloorWindow + closemessage + waitse + special Special_AnimateElevator + waitstate + setflag FLAG_TEMP_2 + return + +TrainerTower_Elevator_Movement_ExitElevator:: @ 8164BE5 + walk_in_place_fastest_down + delay_16 + walk_down + walk_right + walk_right + walk_down + step_end diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json new file mode 100644 index 000000000..23e8456c0 --- /dev/null +++ b/data/maps/TrainerTower_Lobby/map.json @@ -0,0 +1,125 @@ +{ + "id": "MAP_TRAINER_TOWER_LOBBY", + "name": "TrainerTower_Lobby", + "layout": "LAYOUT_TRAINER_TOWER_LOBBY", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_Nurse", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_MartClerk", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_Receptionist", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_CooltrainerF", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "x": 2, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_BaldingMan", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_1F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 8, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 3, + "var": "VAR_MAP_SCENE_TRAINER_TOWER", + "var_value": 0, + "script": "TrainerTower_Lobby_EventScript_EntryTrigger" + } + ], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 8, + "y": 10, + "elevation": 0, + "script": "TrainerTower_Lobby_EventScript_ShowRecords" + } + ] +} diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc new file mode 100644 index 000000000..0fc2422b6 --- /dev/null +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -0,0 +1,226 @@ +TrainerTower_Lobby_MapScripts:: @ 8164839 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_Lobby_OnTransition + map_script MAP_SCRIPT_ON_LOAD, TrainerTower_Lobby_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_Lobby_OnFrame + .byte 0 + +TrainerTower_Lobby_OnResume:: @ 8164853 + setvar VAR_TEMP_2, 0 + ttower_resumetimer + ttower_shouldexit + compare VAR_RESULT, FALSE + goto_if_eq TrainerTower_Lobby_OnResumeEnd + @ Never reached, above always FALSE + setvar VAR_TEMP_0, 0 + setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist +TrainerTower_Lobby_OnResumeEnd:: @ 8164886 + end + +TrainerTower_Lobby_OnReturnToField:: @ 8164887 + addobject 1 + addobject 2 + addobject 3 + addobject 4 + addobject 5 + end + +TrainerTower_Lobby_OnLoad:: @ 8164897 + compare VAR_TEMP_D, 17 + call_if_eq TrainerTower_Lobby_OpenCounterBarrier + end + +TrainerTower_Lobby_OpenCounterBarrier:: @ 81648A3 + setmetatile 17, 10, METATILE_TrainerTower_Floor_ShadeBottomLeft, 0 + return + +TrainerTower_Lobby_OnTransition:: @ 81648AD + setworldmapflag FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY + getplayerxy VAR_TEMP_D, VAR_RESULT + end + +TrainerTower_Lobby_OnFrame:: @ 81648B6 + map_script_2 VAR_TEMP_0, 0, TrainerTower_Lobby_EventScript_Enter + map_script_2 VAR_TEMP_D, 17, TrainerTower_Lobby_EventScript_ExitElevator + .2byte 0 + +TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8 + lockall + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator + waitmovement 0 + setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1 + special DrawWholeMapView + playse SE_TK_KASYA + waitse + setvar VAR_TEMP_D, 0 + releaseall + end + +TrainerTower_Lobby_Movement_ExitElevator:: @ 81648EA + walk_down + walk_down + step_end + +TrainerTower_Lobby_EventScript_Enter:: @ 81648ED + setvar VAR_TEMP_0, 1 + ttower_getchallengestatus + switch VAR_RESULT + case CHALLENGE_STATUS_LOST, TrainerTower_Lobby_EventScript_LostChallenge + case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938 + case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd + +TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920 + lock + faceplayer + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + textcolor 1 + msgbox TrainerTower_Lobby_Text_TooBadComeBackTryAgain + goto TrainerTower_Lobby_EventScript_ExitChallenge + +@ Presumably E-Reader related +TrainerTower_Lobby_EventScript_164938:: @ 8164938 + lock + faceplayer + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + textcolor 1 + msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch +TrainerTower_Lobby_EventScript_ExitChallenge:: @ 816494B + closemessage + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown + waitmovement 0 + setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 + release +TrainerTower_Lobby_EventScript_EnterEnd:: @ 816495C + end + +TrainerTower_Lobby_EventScript_Nurse:: @ 816495D + lock + faceplayer + call EventScript_PkmnCenterNurse + release + end + +TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966 + lock + faceplayer + ttower_getbeatchallenge + compare VAR_RESULT, TRUE + goto_if_eq TrainerTower_Lobby_EventScript_ThanksForCompeting + msgbox TrainerTower_Lobby_Text_GiveItYourBest + goto TrainerTower_Lobby_EventScript_ReceptionistEnd + +TrainerTower_Lobby_EventScript_ThanksForCompeting:: @ 8164988 + msgbox TrainerTower_Lobby_Text_ThanksForCompeting +TrainerTower_Lobby_EventScript_ReceptionistEnd:: @ 8164990 + release + end + +TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992 + goto_if_questlog EventScript_ReleaseEnd + lock + faceplayer + message Text_MayIHelpYou + waitmessage + pokemart TrainerTower_Lobby_Mart_Items + msgbox Text_PleaseComeAgain + release + end + + .align 2 +TrainerTower_Lobby_Mart_Items:: @ 81649B8 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE + lockall + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + textcolor 1 + msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower + ttower_getnumfloors + compare VAR_RESULT, FALSE + goto_if_eq TrainerTower_Lobby_EventScript_AllFloorsUsed + msgbox TrainerTower_Lobby_Text_TrainersUpToFloorNum + goto TrainerTower_Lobby_EventScript_AskEnterChallenge + +TrainerTower_Lobby_EventScript_AllFloorsUsed:: @ 8164A00 + msgbox TrainerTower_Lobby_Text_TrainersUpEighthFloor +TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08 + message TrainerTower_Lobby_Text_LikeToChallengeTrainers + waitmessage + multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE + switch VAR_RESULT + case 0, TrainerTower_Lobby_EventScript_ChooseChallenge + case 1, TrainerTower_Lobby_EventScript_DeclineChallenge + case 2, TrainerTower_Lobby_EventScript_ChallengeInfo + case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge + end + +TrainerTower_Lobby_EventScript_ChallengeInfo:: @ 8164A45 + msgbox TrainerTower_Lobby_Text_ExplainTrainerTower + goto TrainerTower_Lobby_EventScript_AskEnterChallenge + end + +TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53 + multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE + switch VAR_RESULT + case 0, TrainerTower_Lobby_EventScript_BeginChallenge + case 1, TrainerTower_Lobby_EventScript_BeginChallenge + case 2, TrainerTower_Lobby_EventScript_BeginChallenge + case 3, TrainerTower_Lobby_EventScript_BeginChallenge + case 4, TrainerTower_Lobby_EventScript_DeclineChallenge + case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge + end + +TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0 + copyvar VAR_0x8005, VAR_RESULT + setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 + special HealPlayerParty + msgbox TrainerTower_Lobby_Text_StartClockGetSetGo + ttower_startchallenge + releaseall + end + +TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF + msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain + closemessage + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown + waitmovement 0 + releaseall + end + +TrainerTower_Lobby_Movement_FaceReceptionist:: @ 8164AD4 + face_right + step_end + +TrainerTower_Lobby_Movement_WalkDown:: @ 8164AD6 + walk_down + step_end + +TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8 + lockall + fadescreen FADE_TO_BLACK + setvar VAR_0x8004, 1 + special Special_BattleRecords + waitstate + releaseall + end + +TrainerTower_Lobby_EventScript_CooltrainerF:: @ 8164AE6 + msgbox TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers, MSGBOX_NPC + end + +TrainerTower_Lobby_EventScript_BaldingMan:: @ 8164AEF + msgbox TrainerTower_Lobby_Text_StairsTougherThanAnyBattle, MSGBOX_NPC + end diff --git a/data/maps/TrainerTower_Lobby/text.inc b/data/maps/TrainerTower_Lobby/text.inc new file mode 100644 index 000000000..4e6bb8b07 --- /dev/null +++ b/data/maps/TrainerTower_Lobby/text.inc @@ -0,0 +1,120 @@ +@ All Trainer Tower text (Lobby and Roof) is interleaved here + +TrainerTower_Lobby_Text_WelcomeToTrainerTower:: @ 817C794 + .string "Hello!\p" + .string "Welcome to TRAINER TOWER where\n" + .string "TRAINERS gather from all over!$" + +TrainerTower_Lobby_Text_TrainersUpToFloorNum:: @ 817C7D9 + .string "TRAINERS from all over the world\n" + .string "gather here to battle.\p" + .string "Let me see…\p" + .string "Right now, there are TRAINERS only\n" + .string "up to Floor {STR_VAR_1}.$" + +TrainerTower_Lobby_Text_TrainersUpEighthFloor:: @ 817C850 + .string "TRAINERS are awaiting your\n" + .string "challenge up to the eighth floor.$" + +TrainerTower_Lobby_Text_LikeToChallengeTrainers:: @ 817C88D + .string "Would you like to challenge the\n" + .string "waiting TRAINERS?$" + +TrainerTower_Lobby_Text_StartClockGetSetGo:: @ 817C8BF + .string "Okay, I'll get the clock started,\n" + .string "so give it everything you have.\p" + .string "On your marks…\p" + .string "Get set…\p" + .string "Go!$" + +TrainerTower_Lobby_Text_PleaseVisitUsAgain:: @ 817C91D + .string "Please do visit us again!$" + +TrainerTower_Lobby_Text_TooBadComeBackTryAgain:: @ 817C937 + .string "That was too bad.\p" + .string "I think you put in a tremendous\n" + .string "effort in your battling.\p" + .string "Please come back and try again!$" + +TrainerTower_Lobby_Text_GiveItYourBest:: @ 817C9A2 + .string "I hope you give it your best.$" + +TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch:: @ 817C9C0 + .string "When the TRAINERS switch places,\n" + .string "the movement can be hectic.\p" + .string "To avoid the stampede, we moved\n" + .string "the reception counter here.\p" + .string "I'm sorry for the inconvenience.$" + +TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A + .string "Hello…\p" + .string "I am the owner of this TOWER…\p" + .string "How the sky soars above this\n" + .string "rooftop…\p" + .string "The caress of the winds up here…\p" + .string "It's all so perfect…\p" + .string "The way you battled…\n" + .string "It, too, was perfection…$" + +TrainerTower_Roof_Text_ThisIsForYou:: @ 817CB09 + .string "This is for you…$" + +TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A + .string "Oh!\n" + .string "Stupendous!\p" + .string "It's marvelous how you've come up\n" + .string "here so quickly.\p" + .string "The fact is, you've done it in\n" + .string "record time…\p" + .string "I'll have your record posted at\n" + .string "the reception counter.$" + +TrainerTower_Roof_Text_TookSweetTimeGettingHere:: @ 817CBC0 + .string "You seem to have taken your sweet\n" + .string "time getting here…$" + +TrainerTower_Roof_Text_IdLikeToSeeBetterTime:: @ 817CBF5 + .string "What I would like to see is a\n" + .string "better time out of you…\p" + .string "I'm counting on you.\p" + .string "Until then, farewell…$" + +TrainerTower_Text_XMinYZSec:: @ 817CC56 + .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" + +TrainerTower_Lobby_Text_HereAreTheResults:: @ 817CC69 + .string "せいせきひょうです$" + +TrainerTower_Lobby_Text_NeedTwoMonsForDouble:: @ 817CC73 + .string "This is a two-on-two battle.\p" + .string "You may not battle unless you have\n" + .string "at least two POKéMON.$" + +TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9 + .string "Here at TRAINER TOWER, there is an\n" + .string "event called TIME ATTACK.\p" + .string "You will be timed on how quickly\n" + .string "you can get from the reception\l" + .string "counter to the OWNER on the roof.\p" + .string "The best times will be recorded on\n" + .string "the Time Board.\p" + .string "Try competing with friends to see\n" + .string "who can beat it the fastest.\p" + .string "You will not earn any EXP. Points\n" + .string "or money by beating TRAINERS here.$" + +TrainerTower_Lobby_Text_ThanksForCompeting:: @ 817CE1F + .string "Thank you for competing!$" + +TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers:: @ 817CE38 + .string "I'm here to see how good I am.\p" + .string "I wonder what kinds of TRAINERS\n" + .string "are waiting for me?\p" + .string "It's nerve-racking!$" + +TrainerTower_Lobby_Text_StairsTougherThanAnyBattle:: @ 817CE9F + .string "Gasp, gasp…\n" + .string "Gasp…\p" + .string "Never mind battling! These stairs…\n" + .string "They're tougher than any battle…$" + diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json new file mode 100644 index 000000000..c9a98a144 --- /dev/null +++ b/data/maps/TrainerTower_Roof/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_TRAINER_TOWER_ROOF", + "name": "TrainerTower_Roof", + "layout": "LAYOUT_TRAINER_TOWER_ROOF", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + } + ], + "warp_events": [ + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_8F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_Roof/scripts.inc b/data/maps/TrainerTower_Roof/scripts.inc new file mode 100644 index 000000000..b338e3a62 --- /dev/null +++ b/data/maps/TrainerTower_Roof/scripts.inc @@ -0,0 +1,10 @@ +TrainerTower_Roof_MapScripts:: @ 8164828 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below script is unused, the identical version in the 1F script is used instead + +TrainerTower_Roof_EventScript_Owner:: @ 8164833 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 05f1cd544..3793fd9fc 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -178,17 +178,17 @@ ], "gMapGroup2": [ "NavelRock_Exterior", - "SevenIsland_TrainerTower_1F", - "SevenIsland_TrainerTower_2F", - "SevenIsland_TrainerTower_3F", - "SevenIsland_TrainerTower_4F", - "SevenIsland_TrainerTower_5F", - "SevenIsland_TrainerTower_6F", - "SevenIsland_TrainerTower_7F", - "SevenIsland_TrainerTower_8F", - "SevenIsland_TrainerTower_Roof", - "SevenIsland_TrainerTower_Lobby", - "SevenIsland_TrainerTower_Elevator", + "TrainerTower_1F", + "TrainerTower_2F", + "TrainerTower_3F", + "TrainerTower_4F", + "TrainerTower_5F", + "TrainerTower_6F", + "TrainerTower_7F", + "TrainerTower_8F", + "TrainerTower_Roof", + "TrainerTower_Lobby", + "TrainerTower_Elevator", "FiveIsland_LostCave_Entrance", "FiveIsland_LostCave_Room1", "FiveIsland_LostCave_Room2", -- cgit v1.2.3 From c0be66fc2e0ace7a9004fcbebe3a7595c30cda87 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 24 Jan 2020 14:42:46 -0500 Subject: Document Viridian City scripts and adjacent routes --- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 6 +- data/maps/PalletTown_ProfessorOaksLab/text.inc | 3 +- data/maps/Route1/map.json | 6 +- data/maps/Route1/scripts.inc | 20 +- data/maps/Route1/text.inc | 10 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 6 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 6 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 6 +- data/maps/Route16_NorthEntrance_2F/scripts.inc | 6 +- data/maps/Route2/map.json | 4 +- data/maps/Route2/scripts.inc | 8 +- data/maps/Route2/text.inc | 4 +- data/maps/Route21_North/text.inc | 48 ++++ data/maps/Route21_South/text.inc | 87 +++++++ data/maps/Route22/map.json | 14 +- data/maps/Route22/scripts.inc | 150 ++++++------ data/maps/Route22/text.inc | 265 +++++---------------- data/maps/Route2_EastBuilding/map.json | 4 +- data/maps/Route2_EastBuilding/scripts.inc | 38 +-- data/maps/Route2_EastBuilding/text.inc | 10 +- data/maps/Route2_House/map.json | 4 +- data/maps/Route2_House/scripts.inc | 20 +- data/maps/Route2_House/text.inc | 2 +- .../Route2_ViridianForest_NorthEntrance/map.json | 6 +- .../scripts.inc | 12 +- .../Route2_ViridianForest_NorthEntrance/text.inc | 6 +- .../Route2_ViridianForest_SouthEntrance/map.json | 4 +- .../scripts.inc | 8 +- .../Route2_ViridianForest_SouthEntrance/text.inc | 4 +- data/maps/ViridianCity/map.json | 28 +-- data/maps/ViridianCity/scripts.inc | 169 ++++++------- data/maps/ViridianCity/text.inc | 42 ++-- data/maps/ViridianCity_Gym/map.json | 24 +- data/maps/ViridianCity_Gym/scripts.inc | 94 ++++---- data/maps/ViridianCity_Gym/text.inc | 70 +++--- data/maps/ViridianCity_House1/map.json | 8 +- data/maps/ViridianCity_House1/scripts.inc | 16 +- data/maps/ViridianCity_House1/text.inc | 8 +- data/maps/ViridianCity_House2/map.json | 14 +- data/maps/ViridianCity_House2/scripts.inc | 90 +++---- data/maps/ViridianCity_House2/text.inc | 30 +-- data/maps/ViridianCity_Mart/map.json | 6 +- data/maps/ViridianCity_Mart/scripts.inc | 46 ++-- data/maps/ViridianCity_Mart/text.inc | 12 +- data/maps/ViridianCity_PokemonCenter_1F/map.json | 8 +- .../maps/ViridianCity_PokemonCenter_1F/scripts.inc | 14 +- data/maps/ViridianCity_PokemonCenter_1F/text.inc | 6 +- data/maps/ViridianForest/map.json | 26 +- data/maps/ViridianForest/scripts.inc | 62 ++--- data/maps/ViridianForest/text.inc | 46 ++-- 50 files changed, 791 insertions(+), 795 deletions(-) create mode 100644 data/maps/Route21_North/text.inc create mode 100644 data/maps/Route21_South/text.inc (limited to 'data/maps') diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index d28125f72..0e466abd3 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -346,7 +346,7 @@ EventScript_16939C:: @ 816939C end EventScript_1693AC:: @ 81693AC - trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A + trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory goto EventScript_1694C2 end @@ -402,7 +402,7 @@ EventScript_169414:: @ 8169414 end EventScript_169424:: @ 8169424 - trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A + trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory goto EventScript_1694C2 end @@ -461,7 +461,7 @@ EventScript_16948F:: @ 816948F end EventScript_16949F:: @ 816949F - trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A + trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory goto EventScript_1694C2 end diff --git a/data/maps/PalletTown_ProfessorOaksLab/text.inc b/data/maps/PalletTown_ProfessorOaksLab/text.inc index 3d0c7ba57..e437d4b39 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/text.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/text.inc @@ -36,7 +36,8 @@ Text_18DDEA:: @ 818DDEA .string "Unbelievable!\l" .string "I picked the wrong POKéMON!$" -Text_18DE1A:: @ 818DE1A +@ Also used for early Route 22 battle +Text_RivalVictory:: @ 818DE1A .string "{RIVAL}: Yeah!\n" .string "Am I great or what?$" diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 8d636de9a..1a2426066 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route1_EventScript_167EFE", + "script": "Route1_EventScript_MartClerk", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 3, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route1_EventScript_167F52", + "script": "Route1_EventScript_Boy", "flag": "0" } ], @@ -59,7 +59,7 @@ "x": 9, "y": 31, "elevation": 0, - "script": "Route1_EventScript_167F5B" + "script": "Route1_EventScript_RouteSign" } ] } diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 8d5617e3f..36a42f65e 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -1,11 +1,11 @@ Route1_MapScripts:: @ 8167EFD .byte 0 -Route1_EventScript_167EFE:: @ 8167EFE +Route1_EventScript_MartClerk:: @ 8167EFE lock faceplayer - goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48 - msgbox gUnknown_818329D + goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion + msgbox Route1_Text_WorkAtPokeMartTakeSample textcolor 3 checkitemspace ITEM_POTION, 1 compare VAR_RESULT, FALSE @@ -16,21 +16,21 @@ Route1_EventScript_167EFE:: @ 8167EFE waitmessage waitfanfare additem ITEM_POTION - msgbox gUnknown_8183387 + msgbox Route1_Text_PutPotionAway call EventScript_1A6675 setflag FLAG_GOT_POTION_ON_ROUTE_1 release end -EventScript_167F48:: @ 8167F48 - msgbox gUnknown_8183347 +Route1_EventScript_AlreadyGotPotion:: @ 8167F48 + msgbox Route1_Text_ComeSeeUsIfYouNeedPokeBalls release end -Route1_EventScript_167F52:: @ 8167F52 - msgbox gUnknown_81833B9, MSGBOX_NPC +Route1_EventScript_Boy:: @ 8167F52 + msgbox Route1_Text_CanJumpFromLedges, MSGBOX_NPC end -Route1_EventScript_167F5B:: @ 8167F5B - msgbox gUnknown_818343A, MSGBOX_SIGN +Route1_EventScript_RouteSign:: @ 8167F5B + msgbox Route1_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route1/text.inc b/data/maps/Route1/text.inc index 7b4150b03..57ebecb86 100644 --- a/data/maps/Route1/text.inc +++ b/data/maps/Route1/text.inc @@ -1,4 +1,4 @@ -gUnknown_818329D:: @ 818329D +Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D .string "Hi!\n" .string "I work at a POKéMON MART.\p" .string "It's part of a convenient chain\n" @@ -7,22 +7,22 @@ gUnknown_818329D:: @ 818329D .string "I know, I'll give you a sample.\n" .string "Here you go!$" -gUnknown_8183347:: @ 8183347 +Route1_Text_ComeSeeUsIfYouNeedPokeBalls:: @ 8183347 .string "Please come see us if you need\n" .string "POKé BALLS for catching POKéMON.$" -gUnknown_8183387:: @ 8183387 +Route1_Text_PutPotionAway:: @ 8183387 .string "{PLAYER} put the POTION away in\n" .string "the BAG's ITEMS POCKET.$" -gUnknown_81833B9:: @ 81833B9 +Route1_Text_CanJumpFromLedges:: @ 81833B9 .string "See those ledges along the road?\p" .string "It's a bit scary, but you can jump\n" .string "from them.\p" .string "You can get back to PALLET TOWN\n" .string "quicker that way.$" -gUnknown_818343A:: @ 818343A +Route1_Text_RouteSign:: @ 818343A .string "ROUTE 1\n" .string "PALLET TOWN - VIRIDIAN CITY$" diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index f81563b0c..56e0b448e 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -34,17 +34,17 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1A7AD1 + goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 compare VAR_0x8006, 20 - goto_if_lt EventScript_1A7ABD + goto_if_lt Aide_EventScript_HaventCaughtEnough msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1A7AC7 + goto_if_eq Aide_EventScript_NoRoomForItem giveitem_msg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE msgbox gUnknown_819E7AF diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 68b520e47..91a6d20bd 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -61,17 +61,17 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1A7AD1 + goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FE64 compare VAR_0x8006, 30 - goto_if_lt EventScript_1A7ABD + goto_if_lt Aide_EventScript_HaventCaughtEnough msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1A7AC7 + goto_if_eq Aide_EventScript_NoRoomForItem giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_GOT_ITEMFINDER msgbox gUnknown_819EB59 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index c4cc4b6fd..088a65876 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -24,17 +24,17 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1A7AD1 + goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_170145 compare VAR_0x8006, 50 - goto_if_lt EventScript_1A7ABD + goto_if_lt Aide_EventScript_HaventCaughtEnough msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1A7AC7 + goto_if_eq Aide_EventScript_NoRoomForItem giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE msgbox gUnknown_819F71F diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 2dfd8f1b0..7ccba34c8 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -24,17 +24,17 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1A7AD1 + goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F compare VAR_0x8006, 40 - goto_if_lt EventScript_1A7ABD + goto_if_lt Aide_EventScript_HaventCaughtEnough msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1A7AC7 + goto_if_eq Aide_EventScript_NoRoomForItem giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE msgbox gUnknown_819FC93 diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index ac504faae..86be51055 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -195,14 +195,14 @@ "x": 14, "y": 12, "elevation": 0, - "script": "Route2_EventScript_167F6E" + "script": "Route2_EventScript_DiglettsCaveSign" }, { "type": "bg_event_type_0", "x": 7, "y": 73, "elevation": 0, - "script": "Route2_EventScript_167F65" + "script": "Route2_EventScript_RouteSign" } ] } diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc index 75a3dd87b..2ecb31d72 100644 --- a/data/maps/Route2/scripts.inc +++ b/data/maps/Route2/scripts.inc @@ -1,10 +1,10 @@ Route2_MapScripts:: @ 8167F64 .byte 0 -Route2_EventScript_167F65:: @ 8167F65 - msgbox gUnknown_818345E, MSGBOX_SIGN +Route2_EventScript_RouteSign:: @ 8167F65 + msgbox Route2_Text_RouteSign, MSGBOX_SIGN end -Route2_EventScript_167F6E:: @ 8167F6E - msgbox gUnknown_8183482, MSGBOX_SIGN +Route2_EventScript_DiglettsCaveSign:: @ 8167F6E + msgbox Route2_Text_DiglettsCave, MSGBOX_SIGN end diff --git a/data/maps/Route2/text.inc b/data/maps/Route2/text.inc index 4197b7071..1ca497d6b 100644 --- a/data/maps/Route2/text.inc +++ b/data/maps/Route2/text.inc @@ -1,7 +1,7 @@ -gUnknown_818345E:: @ 818345E +Route2_Text_RouteSign:: @ 818345E .string "ROUTE 2\n" .string "VIRIDIAN CITY - PEWTER CITY$" -gUnknown_8183482:: @ 8183482 +Route2_Text_DiglettsCave:: @ 8183482 .string "DIGLETT'S CAVE$" diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc new file mode 100644 index 000000000..e8fc3223a --- /dev/null +++ b/data/maps/Route21_North/text.inc @@ -0,0 +1,48 @@ +Text_1882E1:: @ 81882E1 + .string "Strong TRAINERS and WATER POKéMON\n" + .string "are common sights in these parts.\p" + .string "They say that MISTY of the\n" + .string "CERULEAN GYM trains here.$" + +Text_18835A:: @ 818835A + .string "You want to know if the fish are\n" + .string "biting?$" + +Text_188383:: @ 8188383 + .string "Dang!$" + +Text_188389:: @ 8188389 + .string "I can't catch anything good.\n" + .string "Not one good POKéMON to be had!$" + +Text_1883C6:: @ 81883C6 + .string "I got a big haul!\n" + .string "Wanna go for it?$" + +Text_1883E9:: @ 81883E9 + .string "Heheh, MAGIKARP just don't make\n" + .string "the grade, do they?$" + +Text_18841D:: @ 818841D + .string "I seem to only catch MAGIKARP!$" + +Text_18843C:: @ 818843C + .string "The sea cleanses my body and soul!$" + +Text_18845F:: @ 818845F + .string "Ayah!$" + +Text_188465:: @ 8188465 + .string "The sea is great and all, but I\n" + .string "like the mountains, too.$" + +Text_18849E:: @ 818849E + .string "おれだって　たまには\n" + .string "およぎに　くるぜ！$" + +Text_1884B3:: @ 81884B3 + .string "ぐわわ！$" + +Text_1884B8:: @ 81884B8 + .string "うきやすそう　だと？\n" + .string "うるせー　おおきな　おせわだッ！$" diff --git a/data/maps/Route21_South/text.inc b/data/maps/Route21_South/text.inc new file mode 100644 index 000000000..8700006ef --- /dev/null +++ b/data/maps/Route21_South/text.inc @@ -0,0 +1,87 @@ +Text_1884D4:: @ 81884D4 + .string "I caught my POKéMON at sea.$" + +Text_1884F0:: @ 81884F0 + .string "Diver!!\n" + .string "Down!!$" + +Text_1884FF:: @ 81884FF + .string "Where'd you catch your POKéMON?$" + +Text_18851F:: @ 818851F + .string "Right now, I'm in a triathlon meet.$" + +Text_188543:: @ 8188543 + .string "Pant…\n" + .string "Pant… Pant…$" + +Text_188555:: @ 8188555 + .string "I'm beat! But, I still have the\n" + .string "bike race and marathon left!$" + +Text_188592:: @ 8188592 + .string "Ahh!\n" + .string "Feel the sun and the wind!$" + +Text_1885B2:: @ 81885B2 + .string "Yow!\n" + .string "I lost!$" + +Text_1885BF:: @ 81885BF + .string "I'm sunburnt to a crisp!$" + +Text_1885D8:: @ 81885D8 + .string "Hey, don't scare away the fish!$" + +Text_1885F8:: @ 81885F8 + .string "Sorry! I'm just so frustrated from\n" + .string "not catching anything.$" + +Text_188632:: @ 8188632 + .string "Sheesh, I haven't caught a thing.\n" + .string "Could this place actually be a\l" + .string "giant pool or something?$" + +Text_18868C:: @ 818868C + .string "Keep me company till I get a hit.$" + +Text_1886AE:: @ 81886AE + .string "That burned some time.$" + +Text_1886C5:: @ 81886C5 + .string "Oh wait!\n" + .string "I got a bite! Yeah!$" + +Text_1886E2:: @ 81886E2 + .string "LIL: Huh? A battle?\n" + .string "IAN, can't you do it alone?$" + +Text_188712:: @ 8188712 + .string "LIL: Oh, see?\n" + .string "We lost. Happy now?$" + +Text_188734:: @ 8188734 + .string "LIL: I'm tired.\n" + .string "Can't we go home already?$" + +Text_18875E:: @ 818875E + .string "LIL: Huh? A battle?\n" + .string "I can't be bothered to do it alone.\l" + .string "Bring two POKéMON, won't you?$" + +Text_1887B4:: @ 81887B4 + .string "IAN: My sis doesn't get enough\n" + .string "exercise, so I made her come.$" + +Text_1887F1:: @ 81887F1 + .string "IAN: Awww, Sis!\n" + .string "Get it together!$" + +Text_188812:: @ 8188812 + .string "IAN: Come on, Sis!\p" + .string "You're not going to lose weight\n" + .string "like this!$" + +Text_188850:: @ 8188850 + .string "IAN: We want a two-on-two battle.\n" + .string "So can you bring two POKéMON?$" diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index c6f903acc..e8695121f 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -62,7 +62,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, - "script": "Route22_EventScript_16828C" + "script": "Route22_EventScript_EarlyRivalTriggerTop" }, { "type": "trigger", @@ -71,7 +71,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, - "script": "Route22_EventScript_168298" + "script": "Route22_EventScript_EarlyRivalTriggerMid" }, { "type": "trigger", @@ -80,7 +80,7 @@ "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, - "script": "Route22_EventScript_1682AB" + "script": "Route22_EventScript_EarlyRivalTriggerBottom" }, { "type": "trigger", @@ -89,7 +89,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, - "script": "Route22_EventScript_1683ED" + "script": "Route22_EventScript_LateRivalTriggerTop" }, { "type": "trigger", @@ -98,7 +98,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, - "script": "Route22_EventScript_1683F9" + "script": "Route22_EventScript_LateRivalTriggerMid" }, { "type": "trigger", @@ -107,7 +107,7 @@ "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, - "script": "Route22_EventScript_16840C" + "script": "Route22_EventScript_LateRivalTriggerBottom" } ], "bg_events": [ @@ -116,7 +116,7 @@ "x": 7, "y": 12, "elevation": 0, - "script": "Route22_EventScript_1684E2" + "script": "Route22_EventScript_LeagueGateSign" } ] } diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 8036883f3..dbc10e129 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -1,100 +1,94 @@ Route22_MapScripts:: @ 816828B .byte 0 -Route22_EventScript_16828C:: @ 816828C +Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C lockall setvar VAR_TEMP_1, 0 - goto EventScript_1682BE - -EventScript_168297:: @ 8168297 + goto Route22_EventScript_EarlyRival end -Route22_EventScript_168298:: @ 8168298 +Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298 lockall setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 - goto EventScript_1682BE - -EventScript_1682AA:: @ 81682AA + goto Route22_EventScript_EarlyRival end -Route22_EventScript_1682AB:: @ 81682AB +Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB lockall setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 - goto EventScript_1682BE - -EventScript_1682BD:: @ 81682BD + goto Route22_EventScript_EarlyRival end -EventScript_1682BE:: @ 81682BE +Route22_EventScript_EarlyRival:: @ 81682BE textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 compare VAR_TEMP_1, 0 - call_if_eq EventScript_168350 + call_if_eq Route22_EventScript_EarlyRivalApproach compare VAR_TEMP_1, 1 - call_if_eq EventScript_168350 + call_if_eq Route22_EventScript_EarlyRivalApproach compare VAR_TEMP_1, 2 - call_if_eq EventScript_16835B + call_if_eq Route22_EventScript_EarlyRivalApproachBottom delay 6 - msgbox gUnknown_8188890 + msgbox Route22_Text_EarlyRivalIntro compare VAR_STARTER_MON, 2 - call_if_eq EventScript_16836D + call_if_eq Route22_EventScript_EarlyRivalSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_16837C + call_if_eq Route22_EventScript_EarlyRivalBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_16838B - msgbox gUnknown_8188974 + call_if_eq Route22_EventScript_EarlyRivalCharmander + msgbox Route22_Text_EarlyRivalPostBattle closemessage delay 10 playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_16839A + call_if_eq Route22_EventScript_EarlyRivalExit compare VAR_TEMP_1, 1 - call_if_eq EventScript_16839A + call_if_eq Route22_EventScript_EarlyRivalExit compare VAR_TEMP_1, 2 - call_if_eq EventScript_1683A5 + call_if_eq Route22_EventScript_EarlyRivalExitBottom fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_ROUTE22, 2 releaseall end -EventScript_168350:: @ 8168350 - applymovement 1, Movement_1683D1 +Route22_EventScript_EarlyRivalApproach:: @ 8168350 + applymovement 1, Route22_Movement_RivalApproach waitmovement 0 return -EventScript_16835B:: @ 816835B - applymovement 1, Movement_1683D9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3 +Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B + applymovement 1, Route22_Movement_RivalApproachBottom + applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return -EventScript_16836D:: @ 816836D - trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A +Route22_EventScript_EarlyRivalSquirtle:: @ 816836D + trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory return -EventScript_16837C:: @ 816837C - trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A +Route22_EventScript_EarlyRivalBulbasaur:: @ 816837C + trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory return -EventScript_16838B:: @ 816838B - trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A +Route22_EventScript_EarlyRivalCharmander:: @ 816838B + trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory return -EventScript_16839A:: @ 816839A - applymovement 1, Movement_1683B8 +Route22_EventScript_EarlyRivalExit:: @ 816839A + applymovement 1, Route22_Movement_EarlyRivalExit waitmovement 0 return -EventScript_1683A5:: @ 81683A5 - applymovement 1, Movement_1683C5 +Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5 + applymovement 1, Route22_Movement_EarlyRivalExitBottom waitmovement 0 return -Movement_1683B0:: @ 8 +Route22_Movement_UnusedRivalExit:: @ 8 walk_right walk_right walk_right @@ -104,7 +98,7 @@ Movement_1683B0:: @ 8 walk_right step_end -Movement_1683B8:: @ 81683B8 +Route22_Movement_EarlyRivalExit:: @ 81683B8 walk_down walk_right walk_right @@ -119,7 +113,7 @@ Movement_1683B8:: @ 81683B8 walk_down step_end -Movement_1683C5:: @ 81683C5 +Route22_Movement_EarlyRivalExitBottom:: @ 81683C5 walk_right walk_right walk_right @@ -133,7 +127,7 @@ Movement_1683C5:: @ 81683C5 walk_down step_end -Movement_1683D1:: @ 81683D1 +Route22_Movement_RivalApproach:: @ 81683D1 walk_right walk_right walk_right @@ -143,7 +137,7 @@ Movement_1683D1:: @ 81683D1 walk_right step_end -Movement_1683D9:: @ 81683D9 +Route22_Movement_RivalApproachBottom:: @ 81683D9 walk_right walk_right walk_right @@ -155,7 +149,7 @@ Movement_1683D9:: @ 81683D9 walk_in_place_fastest_down step_end -Movement_1683E3:: @ 81683E3 +Route22_Movement_PlayerFaceRival:: @ 81683E3 delay_16 delay_16 delay_16 @@ -167,55 +161,49 @@ Movement_1683E3:: @ 81683E3 walk_in_place_fastest_up step_end -Route22_EventScript_1683ED:: @ 81683ED +Route22_EventScript_LateRivalTriggerTop:: @ 81683ED lockall setvar VAR_TEMP_1, 0 - goto EventScript_16841F - -EventScript_1683F8:: @ 81683F8 + goto Route22_EventScript_LateRival end -Route22_EventScript_1683F9:: @ 81683F9 +Route22_EventScript_LateRivalTriggerMid:: @ 81683F9 lockall setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 - goto EventScript_16841F - -EventScript_16840B:: @ 816840B + goto Route22_EventScript_LateRival end -Route22_EventScript_16840C:: @ 816840C +Route22_EventScript_LateRivalTriggerBottom:: @ 816840C lockall setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 - goto EventScript_16841F - -EventScript_16841E:: @ 816841E + goto Route22_EventScript_LateRival end -EventScript_16841F:: @ 816841F +Route22_EventScript_LateRival:: @ 816841F textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 compare VAR_TEMP_1, 0 - call_if_eq EventScript_16849C + call_if_eq Route22_EventScript_LateRivalApproach compare VAR_TEMP_1, 1 - call_if_eq EventScript_16849C + call_if_eq Route22_EventScript_LateRivalApproach compare VAR_TEMP_1, 2 - call_if_eq EventScript_1684A7 - msgbox gUnknown_8188A3C + call_if_eq Route22_EventScript_LateRivalApproachBottom + msgbox Route22_Text_LateRivalIntro setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if_eq EventScript_1684B9 + call_if_eq Route22_EventScript_LateRivalSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_1684C4 + call_if_eq Route22_EventScript_LateRivalBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_1684CF - msgbox gUnknown_8188B29 + call_if_eq Route22_EventScript_LateRivalCharmander + msgbox Route22_Text_LateRivalPostBattle closemessage delay 10 playbgm MUS_RIVAL2, 0 - applymovement 1, Movement_1684DA + applymovement 1, Route22_Movement_LateRivalExit waitmovement 0 fadedefaultbgm removeobject 1 @@ -223,30 +211,30 @@ EventScript_16841F:: @ 816841F releaseall end -EventScript_16849C:: @ 816849C - applymovement 1, Movement_1683D1 +Route22_EventScript_LateRivalApproach:: @ 816849C + applymovement 1, Route22_Movement_RivalApproach waitmovement 0 return -EventScript_1684A7:: @ 81684A7 - applymovement 1, Movement_1683D9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3 +Route22_EventScript_LateRivalApproachBottom:: @ 81684A7 + applymovement 1, Route22_Movement_RivalApproachBottom + applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return -EventScript_1684B9:: @ 81684B9 - trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08 +Route22_EventScript_LateRivalSquirtle:: @ 81684B9 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Route22_Text_LateRivalDefeat return -EventScript_1684C4:: @ 81684C4 - trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08 +Route22_EventScript_LateRivalBulbasaur:: @ 81684C4 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Route22_Text_LateRivalDefeat return -EventScript_1684CF:: @ 81684CF - trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08 +Route22_EventScript_LateRivalCharmander:: @ 81684CF + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Route22_Text_LateRivalDefeat return -Movement_1684DA:: @ 81684DA +Route22_Movement_LateRivalExit:: @ 81684DA walk_left walk_left walk_left @@ -256,6 +244,6 @@ Movement_1684DA:: @ 81684DA walk_left step_end -Route22_EventScript_1684E2:: @ 81684E2 - msgbox gUnknown_8188BFF, MSGBOX_SIGN +Route22_EventScript_LeagueGateSign:: @ 81684E2 + msgbox Route22_Text_LeagueGateSign, MSGBOX_SIGN end diff --git a/data/maps/Route22/text.inc b/data/maps/Route22/text.inc index 7bfe6931b..72b4ca28b 100644 --- a/data/maps/Route22/text.inc +++ b/data/maps/Route22/text.inc @@ -1,201 +1,66 @@ -Text_1882E1:: @ 81882E1 - .string "Strong TRAINERS and WATER POKéMON\n" - .string "are common sights in these parts.\p" - .string "They say that MISTY of the\n" - .string "CERULEAN GYM trains here.$" - -Text_18835A:: @ 818835A - .string "You want to know if the fish are\n" - .string "biting?$" - -Text_188383:: @ 8188383 - .string "Dang!$" - -Text_188389:: @ 8188389 - .string "I can't catch anything good.\n" - .string "Not one good POKéMON to be had!$" - -Text_1883C6:: @ 81883C6 - .string "I got a big haul!\n" - .string "Wanna go for it?$" - -Text_1883E9:: @ 81883E9 - .string "Heheh, MAGIKARP just don't make\n" - .string "the grade, do they?$" - -Text_18841D:: @ 818841D - .string "I seem to only catch MAGIKARP!$" - -Text_18843C:: @ 818843C - .string "The sea cleanses my body and soul!$" - -Text_18845F:: @ 818845F - .string "Ayah!$" - -Text_188465:: @ 8188465 - .string "The sea is great and all, but I\n" - .string "like the mountains, too.$" - -Text_18849E:: @ 818849E - .string "おれだって　たまには\n" - .string "およぎに　くるぜ！$" - -Text_1884B3:: @ 81884B3 - .string "ぐわわ！$" - -Text_1884B8:: @ 81884B8 - .string "うきやすそう　だと？\n" - .string "うるせー　おおきな　おせわだッ！$" - -Text_1884D4:: @ 81884D4 - .string "I caught my POKéMON at sea.$" - -Text_1884F0:: @ 81884F0 - .string "Diver!!\n" - .string "Down!!$" - -Text_1884FF:: @ 81884FF - .string "Where'd you catch your POKéMON?$" - -Text_18851F:: @ 818851F - .string "Right now, I'm in a triathlon meet.$" - -Text_188543:: @ 8188543 - .string "Pant…\n" - .string "Pant… Pant…$" - -Text_188555:: @ 8188555 - .string "I'm beat! But, I still have the\n" - .string "bike race and marathon left!$" - -Text_188592:: @ 8188592 - .string "Ahh!\n" - .string "Feel the sun and the wind!$" - -Text_1885B2:: @ 81885B2 - .string "Yow!\n" - .string "I lost!$" - -Text_1885BF:: @ 81885BF - .string "I'm sunburnt to a crisp!$" - -Text_1885D8:: @ 81885D8 - .string "Hey, don't scare away the fish!$" - -Text_1885F8:: @ 81885F8 - .string "Sorry! I'm just so frustrated from\n" - .string "not catching anything.$" - -Text_188632:: @ 8188632 - .string "Sheesh, I haven't caught a thing.\n" - .string "Could this place actually be a\l" - .string "giant pool or something?$" - -Text_18868C:: @ 818868C - .string "Keep me company till I get a hit.$" - -Text_1886AE:: @ 81886AE - .string "That burned some time.$" - -Text_1886C5:: @ 81886C5 - .string "Oh wait!\n" - .string "I got a bite! Yeah!$" - -Text_1886E2:: @ 81886E2 - .string "LIL: Huh? A battle?\n" - .string "IAN, can't you do it alone?$" - -Text_188712:: @ 8188712 - .string "LIL: Oh, see?\n" - .string "We lost. Happy now?$" - -Text_188734:: @ 8188734 - .string "LIL: I'm tired.\n" - .string "Can't we go home already?$" - -Text_18875E:: @ 818875E - .string "LIL: Huh? A battle?\n" - .string "I can't be bothered to do it alone.\l" - .string "Bring two POKéMON, won't you?$" - -Text_1887B4:: @ 81887B4 - .string "IAN: My sis doesn't get enough\n" - .string "exercise, so I made her come.$" - -Text_1887F1:: @ 81887F1 - .string "IAN: Awww, Sis!\n" - .string "Get it together!$" - -Text_188812:: @ 8188812 - .string "IAN: Come on, Sis!\p" - .string "You're not going to lose weight\n" - .string "like this!$" - -Text_188850:: @ 8188850 - .string "IAN: We want a two-on-two battle.\n" - .string "So can you bring two POKéMON?$" - -gUnknown_8188890:: @ 8188890 - .string "{RIVAL}: Hey! {PLAYER}!\p" - .string "You're off to the POKéMON LEAGUE?\n" - .string "Forget about it!\p" - .string "You probably don't have any\n" - .string "BADGES, do you?\p" - .string "The guard won't let you through\n" - .string "without them.\p" - .string "By the way, did your POKéMON get\n" - .string "any stronger?$" - -Text_188959:: @ 8188959 - .string "Awww!\n" - .string "You just lucked out!$" - -gUnknown_8188974:: @ 8188974 - .string "I heard the POKéMON LEAGUE is\n" - .string "crawling with tough TRAINERS.\p" - .string "I have to figure out how to get\n" - .string "past them.\p" - .string "You should quit dawdling and get a\n" - .string "move on!$" - -Text_188A07:: @ 8188A07 - .string "{RIVAL}“なんだ？\n" - .string "ポケモン　2ひきも\l" - .string "もってるの　なぜか　だって？\p" - .string "おまえも\n" - .string "つかまえれば　いい　じゃん！$" - -gUnknown_8188A3C:: @ 8188A3C - .string "{RIVAL}: What? {PLAYER}!\n" - .string "What a surprise to see you here!\p" - .string "So you're going to the POKéMON\n" - .string "LEAGUE?\p" - .string "You collected all the BADGES, too?\n" - .string "That's cool!\p" - .string "Then I'll whip you, {PLAYER}, as a\n" - .string "warm-up for the POKéMON LEAGUE!\p" - .string "Come on!$" - -Text_188B08:: @ 8188B08 - .string "What!?\p" - .string "I was just careless, you!$" - -gUnknown_8188B29:: @ 8188B29 - .string "That loosened me up.\n" - .string "I'm ready for the POKéMON LEAGUE!\p" - .string "{PLAYER}, you need more practice.\p" - .string "But hey, you know that!\n" - .string "I'm out of here. Smell ya!$" - -Text_188BAF:: @ 8188BAF - .string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n" - .string "それで　がんばってるのかよ！\l" - .string "おれの　さいのうに　くらべりゃ\l" - .string "{PLAYER}は　まだまだ　だな！\p" - .string "もっと　れんしゅう　こいよ！\n" - .string "あははーッ！$" - -gUnknown_8188BFF:: @ 8188BFF - .string "POKéMON LEAGUE\n" - .string "Front Gate$" +Route22_Text_EarlyRivalIntro:: @ 8188890 + .string "{RIVAL}: Hey! {PLAYER}!\p" + .string "You're off to the POKéMON LEAGUE?\n" + .string "Forget about it!\p" + .string "You probably don't have any\n" + .string "BADGES, do you?\p" + .string "The guard won't let you through\n" + .string "without them.\p" + .string "By the way, did your POKéMON get\n" + .string "any stronger?$" + +Route22_Text_EarlyRivalDefeat:: @ 8188959 + .string "Awww!\n" + .string "You just lucked out!$" + +Route22_Text_EarlyRivalPostBattle:: @ 8188974 + .string "I heard the POKéMON LEAGUE is\n" + .string "crawling with tough TRAINERS.\p" + .string "I have to figure out how to get\n" + .string "past them.\p" + .string "You should quit dawdling and get a\n" + .string "move on!$" + +@ Translated in RB as "{RIVAL}: What? Why do I have 2 POKéMON? You should catch some more too!" +Route22_Text_RivalShouldCatchSomeMons:: @ 8188A07 + .string "{RIVAL}“なんだ？\n" + .string "ポケモン　2ひきも\l" + .string "もってるの　なぜか　だって？\p" + .string "おまえも\n" + .string "つかまえれば　いい　じゃん！$" + +Route22_Text_LateRivalIntro:: @ 8188A3C + .string "{RIVAL}: What? {PLAYER}!\n" + .string "What a surprise to see you here!\p" + .string "So you're going to the POKéMON\n" + .string "LEAGUE?\p" + .string "You collected all the BADGES, too?\n" + .string "That's cool!\p" + .string "Then I'll whip you, {PLAYER}, as a\n" + .string "warm-up for the POKéMON LEAGUE!\p" + .string "Come on!$" + +Route22_Text_LateRivalDefeat:: @ 8188B08 + .string "What!?\p" + .string "I was just careless, you!$" + +Route22_Text_LateRivalPostBattle:: @ 8188B29 + .string "That loosened me up.\n" + .string "I'm ready for the POKéMON LEAGUE!\p" + .string "{PLAYER}, you need more practice.\p" + .string "But hey, you know that!\n" + .string "I'm out of here. Smell ya!$" + +@ Translated in RB as "{RIVAL}: Hahaha! {PLAYER}! That's your best? You're nowhere near as good as me, pal! Go train some more! You loser!" +Route22_Text_LateRivalVictory:: @ 8188BAF + .string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n" + .string "それで　がんばってるのかよ！\l" + .string "おれの　さいのうに　くらべりゃ\l" + .string "{PLAYER}は　まだまだ　だな！\p" + .string "もっと　れんしゅう　こいよ！\n" + .string "あははーッ！$" + +Route22_Text_LeagueGateSign:: @ 8188BFF + .string "POKéMON LEAGUE\n" + .string "Front Gate$" diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 2367b0b91..e966962c6 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EastBuilding_EventScript_16F67F", + "script": "Route2_EastBuilding_EventScript_Aide", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EastBuilding_EventScript_16F714", + "script": "Route2_EastBuilding_EventScript_Rocker", "flag": "0" } ], diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index cba95dc0b..a94d72fd7 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -1,40 +1,42 @@ +.equ REQUIRED_SEEN_MONS, 10 + Route2_EastBuilding_MapScripts:: @ 816F67E .byte 0 -Route2_EastBuilding_EventScript_16F67F:: @ 816F67F +Route2_EastBuilding_EventScript_Aide:: @ 816F67F lock faceplayer - call EventScript_16F70B - goto_if_set FLAG_GOT_HM05, EventScript_16F701 - msgbox gUnknown_819D64F, MSGBOX_YESNO + call Route2_EastBuilding_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_HM05, Route2_EastBuilding_EventScript_AlreadyGotHM05 + msgbox Route2_EastBuilding_Text_GiveHM05IfSeen10Mons, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1A7AD1 + goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_16F70B - compare VAR_0x8006, 10 - goto_if_lt EventScript_1A7ABD - msgbox gUnknown_819D74E + call Route2_EastBuilding_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_SEEN_MONS + goto_if_lt Aide_EventScript_HaventCaughtEnough + msgbox Route2_EastBuilding_Text_GreatHereYouGo checkitemspace ITEM_HM05, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1A7AC7 - giveitem_msg gUnknown_819D7A1, ITEM_HM05 + goto_if_eq Aide_EventScript_NoRoomForItem + giveitem_msg Route2_EastBuilding_Text_ReceivedHM05FromAide, ITEM_HM05 setflag FLAG_GOT_HM05 - msgbox gUnknown_819D7C1 + msgbox Route2_EastBuilding_Text_ExplainHM05 release end -EventScript_16F701:: @ 816F701 - msgbox gUnknown_819D7C1 +Route2_EastBuilding_EventScript_AlreadyGotHM05:: @ 816F701 + msgbox Route2_EastBuilding_Text_ExplainHM05 release end -EventScript_16F70B:: @ 816F70B - getnumberstring 0, 10 +Route2_EastBuilding_EventScript_GetAideRequestInfo:: @ 816F70B + getnumberstring 0, REQUIRED_SEEN_MONS getitemname 1, ITEM_HM05 return -Route2_EastBuilding_EventScript_16F714:: @ 816F714 - msgbox gUnknown_819D81E, MSGBOX_NPC +Route2_EastBuilding_EventScript_Rocker:: @ 816F714 + msgbox Route2_EastBuilding_Text_CanGetThroughRockTunnel, MSGBOX_NPC end diff --git a/data/maps/Route2_EastBuilding/text.inc b/data/maps/Route2_EastBuilding/text.inc index 228cf3c4d..1de4b8fc7 100644 --- a/data/maps/Route2_EastBuilding/text.inc +++ b/data/maps/Route2_EastBuilding/text.inc @@ -1,4 +1,4 @@ -gUnknown_819D64F:: @ 819D64F +Route2_EastBuilding_Text_GiveHM05IfSeen10Mons:: @ 819D64F .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -10,23 +10,23 @@ gUnknown_819D64F:: @ 819D64F .string "Have you gathered data on at least\n" .string "ten kinds of POKéMON?$" -gUnknown_819D74E:: @ 819D74E +Route2_EastBuilding_Text_GreatHereYouGo:: @ 819D74E .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819D7A1:: @ 819D7A1 +Route2_EastBuilding_Text_ReceivedHM05FromAide:: @ 819D7A1 .string "{PLAYER} received HM05\n" .string "from the AIDE.$" -gUnknown_819D7C1:: @ 819D7C1 +Route2_EastBuilding_Text_ExplainHM05:: @ 819D7C1 .string "HM05 contains the hidden move\n" .string "FLASH.\p" .string "FLASH lights up even the darkest\n" .string "of caves and dungeons.$" -gUnknown_819D81E:: @ 819D81E +Route2_EastBuilding_Text_CanGetThroughRockTunnel:: @ 819D81E .string "Once a POKéMON learns FLASH, you\n" .string "can get through ROCK TUNNEL.$" diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 4c4b7e790..8f9785c33 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_House_EventScript_16F5F9", + "script": "Route2_House_EventScript_Scientist", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_House_EventScript_16F602", + "script": "Route2_House_EventScript_Reyley", "flag": "0" } ], diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 2cdc2d8ec..6c442958c 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -1,43 +1,43 @@ Route2_House_MapScripts:: @ 816F5F8 .byte 0 -Route2_House_EventScript_16F5F9:: @ 816F5F9 - msgbox gUnknown_819D5E7, MSGBOX_NPC +Route2_House_EventScript_Scientist:: @ 816F5F9 + msgbox Route2_House_Text_FaintedMonsCanUseFieldMoves, MSGBOX_NPC end -Route2_House_EventScript_16F602:: @ 816F602 +Route2_House_EventScript_Reyley:: @ 816F602 lock faceplayer setvar VAR_0x8008, INGAME_TRADE_MR_MIME call EventScript_GetInGameTradeSpeciesInfo - goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674 + goto_if_set FLAG_DID_MIMIEN_TRADE, Route2_House_EventScript_AlreadyTraded msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16F65C + goto_if_eq Route2_House_EventScript_DeclineTrade call EventScript_ChooseMonForInGameTrade compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_16F65C + goto_if_ge Route2_House_EventScript_DeclineTrade call EventScript_GetInGameTradeSpecies compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_16F666 + goto_if_ne Route2_House_EventScript_NotRequestedMon call EventScript_DoInGameTrade msgbox Trade_Text_HeyThanks setflag FLAG_DID_MIMIEN_TRADE release end -EventScript_16F65C:: @ 816F65C +Route2_House_EventScript_DeclineTrade:: @ 816F65C msgbox Trade_Text_AwwOhWell release end -EventScript_16F666:: @ 816F666 +Route2_House_EventScript_NotRequestedMon:: @ 816F666 getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -EventScript_16F674:: @ 816F674 +Route2_House_EventScript_AlreadyTraded:: @ 816F674 msgbox Trade_Text_IsntMyOldMonGreat release end diff --git a/data/maps/Route2_House/text.inc b/data/maps/Route2_House/text.inc index 5fde449d3..76267c113 100644 --- a/data/maps/Route2_House/text.inc +++ b/data/maps/Route2_House/text.inc @@ -1,4 +1,4 @@ -gUnknown_819D5E7:: @ 819D5E7 +Route2_House_Text_FaintedMonsCanUseFieldMoves:: @ 819D5E7 .string "A fainted POKéMON just has no\n" .string "energy left to battle.\p" .string "It can still use moves like CUT\n" diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 1d73befbd..7f4225d23 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F71E", + "script": "Route2_ViridianForest_NorthEntrance_EventScript_Youngster", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F727", + "script": "Route2_ViridianForest_NorthEntrance_EventScript_OldMan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F730", + "script": "Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF", "flag": "0" } ], diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc index 29e6bd757..756cf31d9 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc @@ -1,14 +1,14 @@ Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D .byte 0 -Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E - msgbox gUnknown_819D85C, MSGBOX_NPC +Route2_ViridianForest_NorthEntrance_EventScript_Youngster:: @ 816F71E + msgbox Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests, MSGBOX_NPC end -Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727 - msgbox gUnknown_819D8D0, MSGBOX_NPC +Route2_ViridianForest_NorthEntrance_EventScript_OldMan:: @ 816F727 + msgbox Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees, MSGBOX_NPC end -Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730 - msgbox gUnknown_819D93B, MSGBOX_NPC +Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF:: @ 816F730 + msgbox Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution, MSGBOX_NPC end diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/text.inc b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc index 630d39fc9..9fec461a8 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/text.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc @@ -1,16 +1,16 @@ -gUnknown_819D85C:: @ 819D85C +Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests:: @ 819D85C .string "Many POKéMON live only in forests \n" .string "and caves.\p" .string "You need to be persistent and look\n" .string "everywhere to get different kinds.$" -gUnknown_819D8D0:: @ 819D8D0 +Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees:: @ 819D8D0 .string "Have you noticed the skinny trees\n" .string "on the roadside?\p" .string "They can be cut down by a special\n" .string "POKéMON move, I hear.$" -gUnknown_819D93B:: @ 819D93B +Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution:: @ 819D93B .string "Do you know the evolution-cancel\n" .string "technique?\p" .string "When a POKéMON is evolving, you\n" diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 8d85f8f46..4e0ad0164 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5E6", + "script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman1", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5EF", + "script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman2", "flag": "0" } ], diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc index aea8bfaa4..2a60a3772 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc @@ -1,10 +1,10 @@ Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5 .byte 0 -Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6 - msgbox gUnknown_819D52C, MSGBOX_NPC +Route2_ViridianForest_SouthEntrance_EventScript_Woman1:: @ 816F5E6 + msgbox Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze, MSGBOX_NPC end -Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF - msgbox gUnknown_819D58B, MSGBOX_NPC +Route2_ViridianForest_SouthEntrance_EventScript_Woman2:: @ 816F5EF + msgbox Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite, MSGBOX_NPC end diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/text.inc b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc index c92538340..20e25429f 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/text.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc @@ -1,9 +1,9 @@ -gUnknown_819D52C:: @ 819D52C +Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze:: @ 819D52C .string "Are you going to VIRIDIAN FOREST?\n" .string "It's a natural maze in there.\l" .string "Be careful you don't get lost.$" -gUnknown_819D58B:: @ 819D58B +Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite:: @ 819D58B .string "RATTATA may be small, but don't\n" .string "underestimate its wicked bite.\p" .string "Have you caught one already?$" diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index ca30e0c6e..a83f47f5a 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -65,7 +65,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1659CA", + "script": "ViridianCity_EventScript_OldMan", "flag": "0" }, { @@ -78,7 +78,7 @@ "movement_range_y": 3, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1659F6", + "script": "ViridianCity_EventScript_TutorialOldMan", "flag": "0" }, { @@ -91,7 +91,7 @@ "movement_range_y": 3, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_165AC4", + "script": "ViridianCity_EventScript_Woman", "flag": "0" }, { @@ -104,7 +104,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_165A8F", + "script": "ViridianCity_EventScript_Youngster", "flag": "0" }, { @@ -117,7 +117,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1659C1", + "script": "ViridianCity_EventScript_Boy", "flag": "0" }, { @@ -192,7 +192,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", "var_value": 0, - "script": "ViridianCity_EventScript_165AF6" + "script": "ViridianCity_EventScript_RoadBlocked" }, { "type": "trigger", @@ -201,7 +201,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR", "var_value": 0, - "script": "ViridianCity_EventScript_16596D" + "script": "ViridianCity_EventScript_GymDoorLocked" }, { "type": "trigger", @@ -210,7 +210,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", "var_value": 1, - "script": "ViridianCity_EventScript_165B10" + "script": "ViridianCity_EventScript_TutorialTriggerLeft" }, { "type": "trigger", @@ -219,7 +219,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", "var_value": 1, - "script": "ViridianCity_EventScript_165B2E" + "script": "ViridianCity_EventScript_TutorialTriggerRight" } ], "bg_events": [ @@ -228,35 +228,35 @@ "x": 23, "y": 1, "elevation": 3, - "script": "ViridianCity_EventScript_16599D" + "script": "ViridianCity_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 32, "y": 10, "elevation": 0, - "script": "ViridianCity_EventScript_1659AF" + "script": "ViridianCity_EventScript_GymSign" }, { "type": "bg_event_type_0", "x": 20, "y": 31, "elevation": 0, - "script": "ViridianCity_EventScript_1659A6" + "script": "ViridianCity_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 20, "y": 16, "elevation": 0, - "script": "ViridianCity_EventScript_165994" + "script": "ViridianCity_EventScript_CitySign" }, { "type": "bg_event_type_0", "x": 36, "y": 10, "elevation": 0, - "script": "ViridianCity_EventScript_1659B8" + "script": "ViridianCity_EventScript_GymDoor" } ] } diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index c317a92eb..4fb140b24 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -1,3 +1,5 @@ +.equ LOCALID_TUTORIAL_MAN, 4 + ViridianCity_MapScripts:: @ 81658D3 map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition .byte 0 @@ -5,32 +7,32 @@ ViridianCity_MapScripts:: @ 81658D3 ViridianCity_OnTransition:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - call_if_eq EventScript_165920 + call_if_eq ViridianCity_EventScript_SetOldManBlockingRoad compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - call_if_eq EventScript_16590F + call_if_eq ViridianCity_EventScript_SetOldManStandingByRoad compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - call_if_ge EventScript_165909 + call_if_ge ViridianCity_EventScript_SetOldManNormal compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 - call_if_eq EventScript_165931 + call_if_eq ViridianCity_EventScript_TryUnlockGym end -EventScript_165909:: @ 8165909 +ViridianCity_EventScript_SetOldManNormal:: @ 8165909 setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 return -EventScript_16590F:: @ 816590F +ViridianCity_EventScript_SetOldManStandingByRoad:: @ 816590F setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 - setobjectxyperm 4, 21, 8 - setobjectmovementtype 4, 1 + setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 8 + setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_LOOK_AROUND return -EventScript_165920:: @ 8165920 - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_VIRIDIAN_DRUNK - setobjectxyperm 4, 21, 11 - setobjectmovementtype 4, 8 +ViridianCity_EventScript_SetOldManBlockingRoad:: @ 8165920 + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN + setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 11 + setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_FACE_DOWN return -EventScript_165931:: @ 8165931 +ViridianCity_EventScript_TryUnlockGym:: @ 8165931 goto_if_unset FLAG_BADGE02_GET, EventScript_Return goto_if_unset FLAG_BADGE03_GET, EventScript_Return goto_if_unset FLAG_BADGE04_GET, EventScript_Return @@ -40,106 +42,109 @@ EventScript_165931:: @ 8165931 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return -ViridianCity_EventScript_16596D:: @ 816596D +ViridianCity_EventScript_GymDoorLocked:: @ 816596D lockall textcolor 3 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 - msgbox gUnknown_817E2F5 + msgbox ViridianCity_Text_GymDoorsAreLocked closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_165992 + applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_JumpDownLedge waitmovement 0 releaseall end -Movement_165992:: @ 8165992 +ViridianCity_Movement_JumpDownLedge:: @ 8165992 jump_2_down step_end -ViridianCity_EventScript_165994:: @ 8165994 - msgbox gUnknown_817E1BB, MSGBOX_SIGN +ViridianCity_EventScript_CitySign:: @ 8165994 + msgbox ViridianCity_Text_CitySign, MSGBOX_SIGN end -ViridianCity_EventScript_16599D:: @ 816599D - msgbox gUnknown_817E1E7, MSGBOX_SIGN +ViridianCity_EventScript_TrainerTips1:: @ 816599D + msgbox ViridianCity_Text_CatchMonsForEasierBattles, MSGBOX_SIGN end -ViridianCity_EventScript_1659A6:: @ 81659A6 - msgbox gUnknown_817E24D, MSGBOX_SIGN +ViridianCity_EventScript_TrainerTips2:: @ 81659A6 + msgbox ViridianCity_Text_MovesLimitedByPP, MSGBOX_SIGN end -ViridianCity_EventScript_1659AF:: @ 81659AF - msgbox gUnknown_817E2DB, MSGBOX_SIGN +ViridianCity_EventScript_GymSign:: @ 81659AF + msgbox ViridianCity_Text_GymSign, MSGBOX_SIGN end -ViridianCity_EventScript_1659B8:: @ 81659B8 - msgbox gUnknown_817E2F5, MSGBOX_SIGN +ViridianCity_EventScript_GymDoor:: @ 81659B8 + msgbox ViridianCity_Text_GymDoorsAreLocked, MSGBOX_SIGN end -ViridianCity_EventScript_1659C1:: @ 81659C1 - msgbox gUnknown_817DABB, MSGBOX_NPC +ViridianCity_EventScript_Boy:: @ 81659C1 + msgbox ViridianCity_Text_CanCarryMonsAnywhere, MSGBOX_NPC end -ViridianCity_EventScript_1659CA:: @ 81659CA +@ Other old man, not the tutorial old man +ViridianCity_EventScript_OldMan:: @ 81659CA lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 - goto_if_eq EventScript_1659EC - msgbox gUnknown_817DB39 + goto_if_eq ViridianCity_EventScript_OldManGymLeaderReturned + msgbox ViridianCity_Text_GymClosedWonderWhoLeaderIs closemessage applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_1659EC:: @ 81659EC - msgbox gUnknown_817DB78 +ViridianCity_EventScript_OldManGymLeaderReturned:: @ 81659EC + msgbox ViridianCity_Text_ViridiansGymLeaderReturned release end -ViridianCity_EventScript_1659F6:: @ 81659F6 +ViridianCity_EventScript_TutorialOldMan:: @ 81659F6 lock faceplayer - goto_if_set FLAG_BADGE01_GET, EventScript_165A23 + goto_if_set FLAG_BADGE01_GET, ViridianCity_EventScript_AskIfTeachyTVHelpful compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - goto_if_ge EventScript_165A4A + goto_if_ge ViridianCity_EventScript_TutorialCompleted compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - goto_if_eq EventScript_165A54 + goto_if_eq ViridianCity_EventScript_TutorialStart compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if_eq EventScript_165A84 + goto_if_eq ViridianCity_EventScript_TutorialNotReady end -EventScript_165A23:: @ 8165A23 - msgbox gUnknown_817E046, MSGBOX_YESNO +ViridianCity_EventScript_AskIfTeachyTVHelpful:: @ 8165A23 + msgbox ViridianCity_Text_HowsTeachyTVHelping, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_165A40 - msgbox gUnknown_817E0EA + goto_if_eq ViridianCity_EventScript_TeachyTVNotHelpful + msgbox ViridianCity_Text_MyGrandsonOnTheShow release end -EventScript_165A40:: @ 8165A40 - msgbox gUnknown_817E14E +ViridianCity_EventScript_TeachyTVNotHelpful:: @ 8165A40 + msgbox ViridianCity_Text_TooBusyForTeachyTV release end -EventScript_165A4A:: @ 8165A4A - msgbox gUnknown_817DF61 +ViridianCity_EventScript_TutorialCompleted:: @ 8165A4A + msgbox ViridianCity_Text_WeakenMonsFirstToCatch release end -EventScript_165A54:: @ 8165A54 - call EventScript_165B4C +ViridianCity_EventScript_TutorialStart:: @ 8165A54 + call ViridianCity_EventScript_DoTutorialBattle release end -EventScript_165A5B:: @ 8165A5B - msgbox gUnknown_817DEEB +@ Unused +ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B + msgbox ViridianCity_Text_WatchThatToLearnBasics release end -EventScript_165A65:: @ 8165A65 - msgbox gUnknown_817DE9B +@ Unused. Starts battle after the post battle text, which is odd. +ViridianCity_EventScript_TutorialUnused:: @ 8165A65 + msgbox ViridianCity_Text_ThatWasEducationalTakeThis goto_if_questlog EventScript_ReleaseEnd special sub_8112364 special ScrSpecial_StartOldManTutorialBattle @@ -147,43 +152,43 @@ EventScript_165A65:: @ 8165A65 release end -EventScript_165A84:: @ 8165A84 - msgbox gUnknown_817DD03 +ViridianCity_EventScript_TutorialNotReady:: @ 8165A84 + msgbox ViridianCity_Text_ThisIsPrivateProperty closemessage release end -ViridianCity_EventScript_165A8F:: @ 8165A8F +ViridianCity_EventScript_Youngster:: @ 8165A8F lock faceplayer - msgbox gUnknown_817DB98, MSGBOX_YESNO + msgbox ViridianCity_Text_WantToKnowAboutCaterpillarMons, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_165AB0 + goto_if_eq ViridianCity_EventScript_YoungsterExplainCaterpillars compare VAR_RESULT, NO - goto_if_eq EventScript_165ABA + goto_if_eq ViridianCity_EventScript_YoungsterDeclineExplanation end -EventScript_165AB0:: @ 8165AB0 - msgbox gUnknown_817DBE4 +ViridianCity_EventScript_YoungsterExplainCaterpillars:: @ 8165AB0 + msgbox ViridianCity_Text_ExplainCaterpieWeedle release end -EventScript_165ABA:: @ 8165ABA - msgbox gUnknown_817DBD5 +ViridianCity_EventScript_YoungsterDeclineExplanation:: @ 8165ABA + msgbox ViridianCity_Text_OhOkayThen release end -ViridianCity_EventScript_165AC4:: @ 8165AC4 +ViridianCity_EventScript_Woman:: @ 8165AC4 lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if_eq EventScript_165ADB - msgbox gUnknown_817DC99 + goto_if_eq ViridianCity_EventScript_WomanRoadBlocked + msgbox ViridianCity_Text_GoShoppingInPewterOccasionally release end -EventScript_165ADB:: @ 8165ADB - msgbox gUnknown_817DC4E +ViridianCity_EventScript_WomanRoadBlocked:: @ 8165ADB + msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet closemessage applymovement 5, Movement_FaceOriginalDirection waitmovement 0 @@ -194,44 +199,44 @@ ViridianCity_EventScript_DreamEaterTutor:: @ 8165AF0 goto EventScript_DreamEaterTutor end -ViridianCity_EventScript_165AF6:: @ 8165AF6 +ViridianCity_EventScript_RoadBlocked:: @ 8165AF6 lockall textcolor 0 - msgbox gUnknown_817DD03 + msgbox ViridianCity_Text_ThisIsPrivateProperty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_165B0E + applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_WalkDown waitmovement 0 releaseall end -Movement_165B0E:: @ 8165B0E +ViridianCity_Movement_WalkDown:: @ 8165B0E walk_down step_end -ViridianCity_EventScript_165B10:: @ 8165B10 +ViridianCity_EventScript_TutorialTriggerLeft:: @ 8165B10 lockall textcolor 0 - applymovement 4, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - call EventScript_165B4C + call ViridianCity_EventScript_DoTutorialBattle release end -ViridianCity_EventScript_165B2E:: @ 8165B2E +ViridianCity_EventScript_TutorialTriggerRight:: @ 8165B2E lockall textcolor 0 - applymovement 4, Movement_WalkInPlaceFastestRight + applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestRight waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 - call EventScript_165B4C + call ViridianCity_EventScript_DoTutorialBattle release end -EventScript_165B4C:: @ 8165B4C - msgbox gUnknown_817DD4E +ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C + msgbox ViridianCity_Text_ShowYouHowToCatchMons closemessage goto_if_questlog EventScript_ReleaseEnd special sub_8112364 @@ -239,8 +244,8 @@ EventScript_165B4C:: @ 8165B4C waitstate lock faceplayer - msgbox gUnknown_817DE9B + msgbox ViridianCity_Text_ThatWasEducationalTakeThis setvar VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 giveitem ITEM_TEACHY_TV - msgbox gUnknown_817DEEB + msgbox ViridianCity_Text_WatchThatToLearnBasics return diff --git a/data/maps/ViridianCity/text.inc b/data/maps/ViridianCity/text.inc index 37b1d3c55..d029c942d 100644 --- a/data/maps/ViridianCity/text.inc +++ b/data/maps/ViridianCity/text.inc @@ -1,47 +1,47 @@ -gUnknown_817DABB:: @ 817DABB +ViridianCity_Text_CanCarryMonsAnywhere:: @ 817DABB .string "Those POKé BALLS at your waist!\n" .string "You have POKéMON, don't you?\p" .string "It's great that you can carry and\n" .string "use POKéMON anytime, anywhere.$" -gUnknown_817DB39:: @ 817DB39 +ViridianCity_Text_GymClosedWonderWhoLeaderIs:: @ 817DB39 .string "This POKéMON GYM is always closed.\p" .string "I wonder who the LEADER is?$" -gUnknown_817DB78:: @ 817DB78 +ViridianCity_Text_ViridiansGymLeaderReturned:: @ 817DB78 .string "VIRIDIAN GYM's LEADER returned!$" -gUnknown_817DB98:: @ 817DB98 +ViridianCity_Text_WantToKnowAboutCaterpillarMons:: @ 817DB98 .string "You want to know about the two\n" .string "kinds of caterpillar POKéMON?$" -gUnknown_817DBD5:: @ 817DBD5 +ViridianCity_Text_OhOkayThen:: @ 817DBD5 .string "Oh, okay then!$" -gUnknown_817DBE4:: @ 817DBE4 +ViridianCity_Text_ExplainCaterpieWeedle:: @ 817DBE4 .string "CATERPIE has no poison,\n" .string "but WEEDLE does.\p" .string "Watch that your POKéMON aren't\n" .string "stabbed by WEEDLE's POISON STING.$" -gUnknown_817DC4E:: @ 817DC4E +ViridianCity_Text_GrandpaHasntHadCoffeeYet:: @ 817DC4E .string "Oh, Grandpa!\n" .string "Don't be so mean!\p" .string "I'm so sorry.\n" .string "He hasn't had his coffee yet.$" -gUnknown_817DC99:: @ 817DC99 +ViridianCity_Text_GoShoppingInPewterOccasionally:: @ 817DC99 .string "I go shopping in PEWTER CITY\n" .string "occasionally.\p" .string "I have to take the winding trail in\n" .string "VIRIDIAN FOREST when I go.$" -gUnknown_817DD03:: @ 817DD03 +ViridianCity_Text_ThisIsPrivateProperty:: @ 817DD03 .string "I absolutely forbid you from\n" .string "going through here!\p" .string "This is private property!$" -gUnknown_817DD4E:: @ 817DD4E +ViridianCity_Text_ShowYouHowToCatchMons:: @ 817DD4E .string "Well, now, I've had my coffee, and\n" .string "that's what I need to get going!\p" .string "Hm?\n" @@ -58,18 +58,18 @@ gUnknown_817DD4E:: @ 817DD4E .string "I suppose I had better show you\n" .string "then!$" -gUnknown_817DE9B:: @ 817DE9B +ViridianCity_Text_ThatWasEducationalTakeThis:: @ 817DE9B .string "There! Now tell me, that was\n" .string "educational, was it not?\p" .string "And here, take this, too.$" -gUnknown_817DEEB:: @ 817DEEB +ViridianCity_Text_WatchThatToLearnBasics:: @ 817DEEB .string "If there's something you don't\n" .string "understand, watch that.\p" .string "It will teach you about the basics\n" .string "of being a POKéMON TRAINER.$" -gUnknown_817DF61:: @ 817DF61 +ViridianCity_Text_WeakenMonsFirstToCatch:: @ 817DF61 .string "Well, now, I've had my coffee, and\n" .string "that's what I need to get going!\p" .string "But I made it too strong.\n" @@ -79,7 +79,7 @@ gUnknown_817DF61:: @ 817DF61 .string "At first, focus on weakening the\n" .string "POKéMON before trying to catch it.$" -gUnknown_817E046:: @ 817E046 +ViridianCity_Text_HowsTeachyTVHelping:: @ 817E046 .string "Well, now, I've had my coffee, and\n" .string "that's what I need to get going!\p" .string "But I made it too strong.\n" @@ -87,39 +87,39 @@ gUnknown_817E046:: @ 817E046 .string "Incidentally, is my old TEACHY TV\n" .string "helping you?$" -gUnknown_817E0EA:: @ 817E0EA +ViridianCity_Text_MyGrandsonOnTheShow:: @ 817E0EA .string "Wahaha!\n" .string "It's my grandson on the show!\p" .string "Since he's the one doing the\n" .string "teaching, you're bound to learn.$" -gUnknown_817E14E:: @ 817E14E +ViridianCity_Text_TooBusyForTeachyTV:: @ 817E14E .string "Hm… You're too busy to not even\n" .string "have the time for TEACHY TV…\p" .string "Time is money, and neither should\n" .string "be ill spent…$" -gUnknown_817E1BB:: @ 817E1BB +ViridianCity_Text_CitySign:: @ 817E1BB .string "VIRIDIAN CITY \n" .string "The Eternally Green Paradise$" -gUnknown_817E1E7:: @ 817E1E7 +ViridianCity_Text_CatchMonsForEasierBattles:: @ 817E1E7 .string "TRAINER TIPS\p" .string "Catch POKéMON and expand your\n" .string "collection.\p" .string "The more you have, the easier it\n" .string "is to battle.$" -gUnknown_817E24D:: @ 817E24D +ViridianCity_Text_MovesLimitedByPP:: @ 817E24D .string "TRAINER TIPS\p" .string "The battle moves of POKéMON are\n" .string "limited by their POWER POINTS, PP.\p" .string "To replenish PP, rest your tired\n" .string "POKéMON at a POKéMON CENTER.$" -gUnknown_817E2DB:: @ 817E2DB +ViridianCity_Text_GymSign:: @ 817E2DB .string "VIRIDIAN CITY POKéMON GYM$" -gUnknown_817E2F5:: @ 817E2F5 +ViridianCity_Text_GymDoorsAreLocked:: @ 817E2F5 .string "VIRIDIAN GYM's doors are locked…$" diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 0297a31b1..b4c9a93e4 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "ViridianCity_Gym_EventScript_169FD6", + "script": "ViridianCity_Gym_EventScript_Takashi", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "ViridianCity_Gym_EventScript_16A004", + "script": "ViridianCity_Gym_EventScript_Yuji", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "ViridianCity_Gym_EventScript_169FA8", + "script": "ViridianCity_Gym_EventScript_Atsushi", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "ViridianCity_Gym_EventScript_169F7A", + "script": "ViridianCity_Gym_EventScript_Jason", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "ViridianCity_Gym_EventScript_169F91", + "script": "ViridianCity_Gym_EventScript_Cole", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "ViridianCity_Gym_EventScript_169FBF", + "script": "ViridianCity_Gym_EventScript_Kiyo", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "ViridianCity_Gym_EventScript_169FED", + "script": "ViridianCity_Gym_EventScript_Samuel", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_Gym_EventScript_169ECA", + "script": "ViridianCity_Gym_EventScript_Giovanni", "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "ViridianCity_Gym_EventScript_16A01B", + "script": "ViridianCity_Gym_EventScript_Warren", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_Gym_EventScript_16A032", + "script": "ViridianCity_Gym_EventScript_GymGuy", "flag": "0" } ], @@ -174,14 +174,14 @@ "x": 15, "y": 20, "elevation": 0, - "script": "ViridianCity_Gym_EventScript_16A05E" + "script": "ViridianCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 19, "y": 20, "elevation": 0, - "script": "ViridianCity_Gym_EventScript_16A05E" + "script": "ViridianCity_Gym_EventScript_GymStatue" }, { "type": "hidden_item", diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 0579e9e32..c14dceddf 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -1,11 +1,11 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9 .byte 0 -ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA +ViridianCity_Gym_EventScript_Giovanni:: @ 8169ECA famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_GIOVANNI, Text_18F352, Text_18F43F, EventScript_169F04, NO_MUSIC - goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, EventScript_169F2F - msgbox gUnknown_818F4A2 + trainerbattle_single TRAINER_LEADER_GIOVANNI, ViridianCity_Gym_Text_GiovanniIntro, ViridianCity_Gym_Text_GiovanniDefeat, ViridianCity_Gym_EventScript_DefeatedGiovanni, NO_MUSIC + goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, ViridianCity_Gym_EventScript_GiveTM26 + msgbox ViridianCity_Gym_Text_GiovanniPostBattle closemessage fadescreen FADE_TO_BLACK removeobject 8 @@ -13,94 +13,94 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA release end -EventScript_169F04:: @ 8169F04 +ViridianCity_Gym_EventScript_DefeatedGiovanni:: @ 8169F04 famechecker FAMECHECKER_GIOVANNI, 3 setflag FLAG_HIDE_MISC_KANTO_ROCKETS setflag FLAG_DEFEATED_LEADER_GIOVANNI setflag FLAG_BADGE08_GET setvar VAR_MAP_SCENE_ROUTE22, 3 set_gym_trainers 8 - goto EventScript_169F2F + goto ViridianCity_Gym_EventScript_GiveTM26 end -EventScript_169F2F:: @ 8169F2F - msgbox gUnknown_818F586 +ViridianCity_Gym_EventScript_GiveTM26:: @ 8169F2F + msgbox ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis checkitemspace ITEM_TM26, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_169F70 - giveitem_msg gUnknown_818F675, ITEM_TM26 + goto_if_eq ViridianCity_Gym_EventScript_NoRoomForTM26 + giveitem_msg ViridianCity_Gym_Text_ReceivedTM26FromGiovanni, ITEM_TM26 setflag FLAG_GOT_TM26_FROM_GIOVANNI - msgbox gUnknown_818F695 + msgbox ViridianCity_Gym_Text_ExplainTM26 release end -EventScript_169F70:: @ 8169F70 - msgbox gUnknown_818F71B +ViridianCity_Gym_EventScript_NoRoomForTM26:: @ 8169F70 + msgbox ViridianCity_Gym_Text_YouDoNotHaveSpace release end -ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A - trainerbattle_single TRAINER_TAMER_JASON, Text_18F7F3, Text_18F824 - msgbox gUnknown_818F840, MSGBOX_AUTOCLOSE +ViridianCity_Gym_EventScript_Jason:: @ 8169F7A + trainerbattle_single TRAINER_TAMER_JASON, ViridianCity_Gym_Text_JasonIntro, ViridianCity_Gym_Text_JasonDefeat + msgbox ViridianCity_Gym_Text_JasonPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_169F91:: @ 8169F91 - trainerbattle_single TRAINER_TAMER_COLE, Text_18F98A, Text_18F9BB - msgbox gUnknown_818F9CC, MSGBOX_AUTOCLOSE +ViridianCity_Gym_EventScript_Cole:: @ 8169F91 + trainerbattle_single TRAINER_TAMER_COLE, ViridianCity_Gym_Text_ColeIntro, ViridianCity_Gym_Text_ColeDefeat + msgbox ViridianCity_Gym_Text_ColePostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 - trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, Text_18F7AD, Text_18F7D6 - msgbox gUnknown_818F7DD, MSGBOX_AUTOCLOSE +ViridianCity_Gym_EventScript_Atsushi:: @ 8169FA8 + trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, ViridianCity_Gym_Text_AtsushiIntro, ViridianCity_Gym_Text_AtsushiDefeat + msgbox ViridianCity_Gym_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF - trainerbattle_single TRAINER_BLACK_BELT_KIYO, Text_18F86C, Text_18F899 - msgbox gUnknown_818F8A0, MSGBOX_AUTOCLOSE +ViridianCity_Gym_EventScript_Kiyo:: @ 8169FBF + trainerbattle_single TRAINER_BLACK_BELT_KIYO, ViridianCity_Gym_Text_KiyoIntro, ViridianCity_Gym_Text_KiyoDefeat + msgbox ViridianCity_Gym_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 - trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, Text_18F92C, Text_18F95A - msgbox gUnknown_818F960, MSGBOX_AUTOCLOSE +ViridianCity_Gym_EventScript_Takashi:: @ 8169FD6 + trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, ViridianCity_Gym_Text_TakashiIntro, ViridianCity_Gym_Text_TakashiDefeat + msgbox ViridianCity_Gym_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_169FED:: @ 8169FED - trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, Text_18F9E7, Text_18FA2D - msgbox gUnknown_818FA3B, MSGBOX_AUTOCLOSE +ViridianCity_Gym_EventScript_Samuel:: @ 8169FED + trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, ViridianCity_Gym_Text_SamuelIntro, ViridianCity_Gym_Text_SamuelDefeat + msgbox ViridianCity_Gym_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_16A004:: @ 816A004 - trainerbattle_single TRAINER_COOLTRAINER_YUJI, Text_18F73B, Text_18F769 - msgbox gUnknown_818F77B, MSGBOX_AUTOCLOSE +ViridianCity_Gym_EventScript_Yuji:: @ 816A004 + trainerbattle_single TRAINER_COOLTRAINER_YUJI, ViridianCity_Gym_Text_YujiIntro, ViridianCity_Gym_Text_YujiDefeat + msgbox ViridianCity_Gym_Text_YujiPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_16A01B:: @ 816A01B - trainerbattle_single TRAINER_COOLTRAINER_WARREN, Text_18F8CB, Text_18F8EE - msgbox gUnknown_818F8FE, MSGBOX_AUTOCLOSE +ViridianCity_Gym_EventScript_Warren:: @ 816A01B + trainerbattle_single TRAINER_COOLTRAINER_WARREN, ViridianCity_Gym_Text_WarrenIntro, ViridianCity_Gym_Text_WarrenDefeat + msgbox ViridianCity_Gym_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_16A032:: @ 816A032 +ViridianCity_Gym_EventScript_GymGuy:: @ 816A032 lock faceplayer - goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, EventScript_16A047 - msgbox gUnknown_818FA81 + goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, ViridianCity_Gym_EventScript_GymGuyPostVictory + msgbox ViridianCity_Gym_Text_GymGuyAdvice release end -EventScript_16A047:: @ 816A047 +ViridianCity_Gym_EventScript_GymGuyPostVictory:: @ 816A047 famechecker FAMECHECKER_GIOVANNI, 4 - msgbox gUnknown_818FB56 + msgbox ViridianCity_Gym_Text_GymGuyPostVictory release end -ViridianCity_Gym_EventScript_16A05E:: @ 816A05E +ViridianCity_Gym_EventScript_GymStatue:: @ 816A05E lockall - goto_if_set FLAG_BADGE08_GET, EventScript_16A072 - msgbox gUnknown_818FB8D + goto_if_set FLAG_BADGE08_GET, ViridianCity_Gym_EventScript_GymStatuePostVictory + msgbox ViridianCity_Gym_Text_GymStatue releaseall end -EventScript_16A072:: @ 816A072 - msgbox gUnknown_818FBC1 +ViridianCity_Gym_EventScript_GymStatuePostVictory:: @ 816A072 + msgbox ViridianCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/ViridianCity_Gym/text.inc b/data/maps/ViridianCity_Gym/text.inc index 7372bd6d3..38561c011 100644 --- a/data/maps/ViridianCity_Gym/text.inc +++ b/data/maps/ViridianCity_Gym/text.inc @@ -1,4 +1,4 @@ -Text_18F352:: @ 818F352 +ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352 .string "Fwahahaha!\n" .string "Welcome to my hideout!\p" .string "It shall be so until I can restore\n" @@ -9,14 +9,14 @@ Text_18F352:: @ 818F352 .string "Once more, you shall face\n" .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ROCKET}$" -Text_18F43F:: @ 818F43F +ViridianCity_Gym_Text_GiovanniDefeat:: @ 818F43F .string "Ha!\n" .string "That was a truly intense fight.\l" .string "You have won!\p" .string "As proof, here is the EARTHBADGE!\n" .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$" -gUnknown_818F4A2:: @ 818F4A2 +ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2 .string "Having lost in this fashion, \n" .string "I can't face my followers.\l" .string "I have betrayed their trust.\p" @@ -27,7 +27,7 @@ gUnknown_818F4A2:: @ 818F4A2 .string "Let us meet again someday!\n" .string "Farewell!$" -gUnknown_818F586:: @ 818F586 +ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis:: @ 818F586 .string "The EARTHBADGE makes POKéMON of\n" .string "any level obey without question.\p" .string "It is evidence of your mastery as\n" @@ -38,111 +38,111 @@ gUnknown_818F586:: @ 818F586 .string "Consider it a gift for your POKéMON\n" .string "LEAGUE challenge.$" -gUnknown_818F675:: @ 818F675 +ViridianCity_Gym_Text_ReceivedTM26FromGiovanni:: @ 818F675 .string "{PLAYER} received TM26\n" .string "from GIOVANNI.$" -gUnknown_818F695:: @ 818F695 +ViridianCity_Gym_Text_ExplainTM26:: @ 818F695 .string "TM26 contains EARTHQUAKE.\p" .string "It is a powerful attack that causes\n" .string "a massive tremor.\p" .string "I made it when I ran the GYM here,\n" .string "far too long ago… $" -gUnknown_818F71B:: @ 818F71B +ViridianCity_Gym_Text_YouDoNotHaveSpace:: @ 818F71B .string "You do not have space for this!$" -Text_18F73B:: @ 818F73B +ViridianCity_Gym_Text_YujiIntro:: @ 818F73B .string "Heh!\n" .string "You must be running out of steam\l" .string "by now!$" -Text_18F769:: @ 818F769 +ViridianCity_Gym_Text_YujiDefeat:: @ 818F769 .string "I ran out of gas!$" -gUnknown_818F77B:: @ 818F77B +ViridianCity_Gym_Text_YujiPostBattle:: @ 818F77B .string "You'll need power to keep up with\n" .string "our GYM LEADER.$" -Text_18F7AD:: @ 818F7AD +ViridianCity_Gym_Text_AtsushiIntro:: @ 818F7AD .string "Rrrroar!\n" .string "I'm working myself into a rage!$" -Text_18F7D6:: @ 818F7D6 +ViridianCity_Gym_Text_AtsushiDefeat:: @ 818F7D6 .string "Wargh!$" -gUnknown_818F7DD:: @ 818F7DD +ViridianCity_Gym_Text_AtsushiPostBattle:: @ 818F7DD .string "I'm still not worthy!$" -Text_18F7F3:: @ 818F7F3 +ViridianCity_Gym_Text_JasonIntro:: @ 818F7F3 .string "POKéMON and I, we make wonderful\n" .string "music together!$" -Text_18F824:: @ 818F824 +ViridianCity_Gym_Text_JasonDefeat:: @ 818F824 .string "You are in perfect harmony!$" -gUnknown_818F840:: @ 818F840 +ViridianCity_Gym_Text_JasonPostBattle:: @ 818F840 .string "Do you know the identity of our\n" .string "GYM LEADER?$" -Text_18F86C:: @ 818F86C +ViridianCity_Gym_Text_KiyoIntro:: @ 818F86C .string "Karate is the ultimate form of\n" .string "martial arts!$" -Text_18F899:: @ 818F899 +ViridianCity_Gym_Text_KiyoDefeat:: @ 818F899 .string "Aiyah!$" -gUnknown_818F8A0:: @ 818F8A0 +ViridianCity_Gym_Text_KiyoPostBattle:: @ 818F8A0 .string "If my POKéMON were as good at\n" .string "karate as I…$" -Text_18F8CB:: @ 818F8CB +ViridianCity_Gym_Text_WarrenIntro:: @ 818F8CB .string "The truly talented win with style.$" -Text_18F8EE:: @ 818F8EE +ViridianCity_Gym_Text_WarrenDefeat:: @ 818F8EE .string "I lost my grip!$" -gUnknown_818F8FE:: @ 818F8FE +ViridianCity_Gym_Text_WarrenPostBattle:: @ 818F8FE .string "The LEADER will scold me for\n" .string "losing this way…$" -Text_18F92C:: @ 818F92C +ViridianCity_Gym_Text_TakashiIntro:: @ 818F92C .string "I'm the KARATE KING!\n" .string "Your fate rests with me!$" -Text_18F95A:: @ 818F95A +ViridianCity_Gym_Text_TakashiDefeat:: @ 818F95A .string "Ayah!$" -gUnknown_818F960:: @ 818F960 +ViridianCity_Gym_Text_TakashiPostBattle:: @ 818F960 .string "The POKéMON LEAGUE?\n" .string "You? Don't get cocky!$" -Text_18F98A:: @ 818F98A +ViridianCity_Gym_Text_ColeIntro:: @ 818F98A .string "Your POKéMON will cower at the\n" .string "crack of my whip!$" -Text_18F9BB:: @ 818F9BB +ViridianCity_Gym_Text_ColeDefeat:: @ 818F9BB .string "Yowch!\n" .string "Whiplash!$" -gUnknown_818F9CC:: @ 818F9CC +ViridianCity_Gym_Text_ColePostBattle:: @ 818F9CC .string "Wait!\n" .string "I was just careless!$" -Text_18F9E7:: @ 818F9E7 +ViridianCity_Gym_Text_SamuelIntro:: @ 818F9E7 .string "VIRIDIAN GYM was closed for a\n" .string "long time.\p" .string "But now, our LEADER is back!$" -Text_18FA2D:: @ 818FA2D +ViridianCity_Gym_Text_SamuelDefeat:: @ 818FA2D .string "I was beaten?$" -gUnknown_818FA3B:: @ 818FA3B +ViridianCity_Gym_Text_SamuelPostBattle:: @ 818FA3B .string "You can go on to the POKéMON\n" .string "LEAGUE only by defeating our GYM\l" .string "LEADER!$" -gUnknown_818FA81:: @ 818FA81 +ViridianCity_Gym_Text_GymGuyAdvice:: @ 818FA81 .string "Yo!\n" .string "Champ in the making!\p" .string "Even I don't know the VIRIDIAN\n" @@ -153,17 +153,17 @@ gUnknown_818FA81:: @ 818FA81 .string "Also, I heard that the TRAINERS\n" .string "here like GROUND-type POKéMON.$" -gUnknown_818FB56:: @ 818FB56 +ViridianCity_Gym_Text_GymGuyPostVictory:: @ 818FB56 .string "Blow me away! GIOVANNI was the\n" .string "GYM LEADER of VIRIDIAN?$" -gUnknown_818FB8D:: @ 818FB8D +ViridianCity_Gym_Text_GymStatue:: @ 818FB8D .string "VIRIDIAN POKéMON GYM\n" .string "LEADER: ?\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_818FBC1:: @ 818FBC1 +ViridianCity_Gym_Text_GymStatuePlayerWon:: @ 818FBC1 .string "VIRIDIAN POKéMON GYM\n" .string "LEADER: GIOVANNI\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 1a960169e..167069bc6 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_House1_EventScript_169E9B", + "script": "ViridianCity_House1_EventScript_BaldingMan", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_House1_EventScript_169EA4", + "script": "ViridianCity_House1_EventScript_LittleGirl", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_House1_EventScript_169EAD", + "script": "ViridianCity_House1_EventScript_Speary", "flag": "0" } ], @@ -83,7 +83,7 @@ "x": 7, "y": 1, "elevation": 0, - "script": "ViridianCity_House1_EventScript_169EC0" + "script": "ViridianCity_House1_EventScript_NicknameSign" } ] } diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc index 446035efe..0af4621cf 100644 --- a/data/maps/ViridianCity_House1/scripts.inc +++ b/data/maps/ViridianCity_House1/scripts.inc @@ -1,24 +1,24 @@ ViridianCity_House1_MapScripts:: @ 8169E9A .byte 0 -ViridianCity_House1_EventScript_169E9B:: @ 8169E9B - msgbox gUnknown_818F292, MSGBOX_NPC +ViridianCity_House1_EventScript_BaldingMan:: @ 8169E9B + msgbox ViridianCity_House1_Text_NicknamingIsFun, MSGBOX_NPC end -ViridianCity_House1_EventScript_169EA4:: @ 8169EA4 - msgbox gUnknown_818F30F, MSGBOX_NPC +ViridianCity_House1_EventScript_LittleGirl:: @ 8169EA4 + msgbox ViridianCity_House1_Text_MyDaddyLovesMonsToo, MSGBOX_NPC end -ViridianCity_House1_EventScript_169EAD:: @ 8169EAD +ViridianCity_House1_EventScript_Speary:: @ 8169EAD lock faceplayer waitse playmoncry SPECIES_SPEAROW, 0 - msgbox gUnknown_818F32C + msgbox ViridianCity_House1_Text_Speary waitmoncry release end -ViridianCity_House1_EventScript_169EC0:: @ 8169EC0 - msgbox gUnknown_818F33D, MSGBOX_SIGN +ViridianCity_House1_EventScript_NicknameSign:: @ 8169EC0 + msgbox ViridianCity_House1_Text_SpearowNameSpeary, MSGBOX_SIGN end diff --git a/data/maps/ViridianCity_House1/text.inc b/data/maps/ViridianCity_House1/text.inc index c1ec37238..15b066efa 100644 --- a/data/maps/ViridianCity_House1/text.inc +++ b/data/maps/ViridianCity_House1/text.inc @@ -1,16 +1,16 @@ -gUnknown_818F292:: @ 818F292 +ViridianCity_House1_Text_NicknamingIsFun:: @ 818F292 .string "Coming up with nicknames is fun,\n" .string "but it's not so easy to do.\p" .string "Clever names are nice, but simple\n" .string "names are easier to remember.$" -gUnknown_818F30F:: @ 818F30F +ViridianCity_House1_Text_MyDaddyLovesMonsToo:: @ 818F30F .string "My daddy loves POKéMON, too.$" -gUnknown_818F32C:: @ 818F32C +ViridianCity_House1_Text_Speary:: @ 818F32C .string "SPEARY: Tetweet!$" -gUnknown_818F33D:: @ 818F33D +ViridianCity_House1_Text_SpearowNameSpeary:: @ 818F33D .string "SPEAROW\n" .string "Name: SPEARY$" diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 5190a5d28..dc80606ec 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_House2_EventScript_16A094", + "script": "ViridianCity_House2_EventScript_Woman", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_House2_EventScript_16A07D", + "script": "ViridianCity_House2_EventScript_Lass", "flag": "0" } ], @@ -70,35 +70,35 @@ "x": 4, "y": 4, "elevation": 0, - "script": "ViridianCity_House2_EventScript_16A0AB" + "script": "ViridianCity_House2_EventScript_Notebook" }, { "type": "bg_event_type_0", "x": 5, "y": 1, "elevation": 0, - "script": "ViridianCity_House2_EventScript_16A11D" + "script": "ViridianCity_House2_EventScript_Blackboard" }, { "type": "bg_event_type_0", "x": 4, "y": 1, "elevation": 0, - "script": "ViridianCity_House2_EventScript_16A11D" + "script": "ViridianCity_House2_EventScript_Blackboard" }, { "type": "bg_event_type_1", "x": 9, "y": 2, "elevation": 0, - "script": "ViridianCity_House2_EventScript_1ACD65" + "script": "ViridianCity_House2_EventScript_PokemonJournal" }, { "type": "bg_event_type_1", "x": 8, "y": 2, "elevation": 0, - "script": "ViridianCity_House2_EventScript_1ACD65" + "script": "ViridianCity_House2_EventScript_PokemonJournal" } ] } diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 6a0845622..0c08b447d 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -1,97 +1,97 @@ ViridianCity_House2_MapScripts:: @ 816A07C .byte 0 -ViridianCity_House2_EventScript_16A07D:: @ 816A07D +ViridianCity_House2_EventScript_Lass:: @ 816A07D lock faceplayer - msgbox gUnknown_818FC00 + msgbox ViridianCity_House2_Text_TryingToMemorizeNotes closemessage applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 release end -ViridianCity_House2_EventScript_16A094:: @ 816A094 +ViridianCity_House2_EventScript_Woman:: @ 816A094 lock faceplayer - msgbox gUnknown_818FC2B + msgbox ViridianCity_House2_Text_ReadBlackboardCarefully closemessage applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB +ViridianCity_House2_EventScript_Notebook:: @ 816A0AB lockall - msgbox gUnknown_818FC65 - msgbox gUnknown_818FF19, MSGBOX_YESNO + msgbox ViridianCity_House2_Text_NotebookFirstPage + msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16A11B - msgbox gUnknown_818FD23 - msgbox gUnknown_818FF19, MSGBOX_YESNO + goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook + msgbox ViridianCity_House2_Text_NotebookSecondPage + msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16A11B - msgbox gUnknown_818FDA8 - msgbox gUnknown_818FF19, MSGBOX_YESNO + goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook + msgbox ViridianCity_House2_Text_NotebookThirdPage + msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16A11B - msgbox gUnknown_818FE5C + goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook + msgbox ViridianCity_House2_Text_NotebookFourthPage applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 1 - msgbox gUnknown_818FF28 + msgbox ViridianCity_House2_Text_HeyDontLookAtMyNotes releaseall end -EventScript_16A11B:: @ 816A11B +ViridianCity_House2_EventScript_StopReadingNotebook:: @ 816A11B releaseall end -ViridianCity_House2_EventScript_16A11D:: @ 816A11D +ViridianCity_House2_EventScript_Blackboard:: @ 816A11D lockall - msgbox gUnknown_818FF4B - goto EventScript_16A12C + msgbox ViridianCity_House2_Text_BlackboardListsStatusProblems + goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -EventScript_16A12C:: @ 816A12C - message Text_18FF88 +ViridianCity_House2_EventScript_ChooseBlackboardTopic:: @ 816A12C + message ViridianCity_House2_Text_ReadWhichTopic waitmessage multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE switch VAR_RESULT - case 0, EventScript_16A18B - case 1, EventScript_16A1A7 - case 2, EventScript_16A1C3 - case 3, EventScript_16A199 - case 4, EventScript_16A1B5 - case 5, EventScript_16A1D1 - case 127, EventScript_16A1D1 + case 0, ViridianCity_House2_EventScript_ReadSleep + case 1, ViridianCity_House2_EventScript_ReadPoison + case 2, ViridianCity_House2_EventScript_ReadParalysis + case 3, ViridianCity_House2_EventScript_ReadBurn + case 4, ViridianCity_House2_EventScript_ReadFreeze + case 5, ViridianCity_House2_EventScript_ExitBlackboard + case 127, ViridianCity_House2_EventScript_ExitBlackboard end -EventScript_16A18B:: @ 816A18B - msgbox gUnknown_818FFA9 - goto EventScript_16A12C +ViridianCity_House2_EventScript_ReadSleep:: @ 816A18B + msgbox ViridianCity_House2_Text_ExplainSleep + goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -EventScript_16A199:: @ 816A199 - msgbox gUnknown_8190025 - goto EventScript_16A12C +ViridianCity_House2_EventScript_ReadBurn:: @ 816A199 + msgbox ViridianCity_House2_Text_ExplainBurn + goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -EventScript_16A1A7:: @ 816A1A7 - msgbox gUnknown_819009F - goto EventScript_16A12C +ViridianCity_House2_EventScript_ReadPoison:: @ 816A1A7 + msgbox ViridianCity_House2_Text_ExplainPoison + goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -EventScript_16A1B5:: @ 816A1B5 - msgbox gUnknown_819010F - goto EventScript_16A12C +ViridianCity_House2_EventScript_ReadFreeze:: @ 816A1B5 + msgbox ViridianCity_House2_Text_ExplainFreeze + goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -EventScript_16A1C3:: @ 816A1C3 - msgbox gUnknown_8190199 - goto EventScript_16A12C +ViridianCity_House2_EventScript_ReadParalysis:: @ 816A1C3 + msgbox ViridianCity_House2_Text_ExplainParalysis + goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -EventScript_16A1D1:: @ 816A1D1 +ViridianCity_House2_EventScript_ExitBlackboard:: @ 816A1D1 releaseall end diff --git a/data/maps/ViridianCity_House2/text.inc b/data/maps/ViridianCity_House2/text.inc index a575c0f34..176bb713a 100644 --- a/data/maps/ViridianCity_House2/text.inc +++ b/data/maps/ViridianCity_House2/text.inc @@ -1,13 +1,13 @@ -gUnknown_818FC00:: @ 818FC00 +ViridianCity_House2_Text_TryingToMemorizeNotes:: @ 818FC00 .string "Whew! I'm trying to memorize all my\n" .string "notes.$" -gUnknown_818FC2B:: @ 818FC2B +ViridianCity_House2_Text_ReadBlackboardCarefully:: @ 818FC2B .string "Okay!\p" .string "Be sure to read what's on the\n" .string "blackboard carefully!$" -gUnknown_818FC65:: @ 818FC65 +ViridianCity_House2_Text_NotebookFirstPage:: @ 818FC65 .string "Let's check out the notebook.\p" .string "First page…\p" .string "POKé BALLS are used to catch\n" @@ -17,14 +17,14 @@ gUnknown_818FC65:: @ 818FC65 .string "People who raise and battle\n" .string "with POKéMON are called TRAINERS.$" -gUnknown_818FD23:: @ 818FD23 +ViridianCity_House2_Text_NotebookSecondPage:: @ 818FD23 .string "Second page…\p" .string "A healthy POKéMON may be hard to\n" .string "catch, so weaken it first.\p" .string "Poison, burn, or cause another\n" .string "status problem to weaken it.$" -gUnknown_818FDA8:: @ 818FDA8 +ViridianCity_House2_Text_NotebookThirdPage:: @ 818FDA8 .string "Third page…\p" .string "POKéMON TRAINERS seek others to\n" .string "engage in POKéMON battles.\p" @@ -33,7 +33,7 @@ gUnknown_818FDA8:: @ 818FDA8 .string "Battles are constantly waged at\n" .string "POKéMON GYMS everywhere.$" -gUnknown_818FE5C:: @ 818FE5C +ViridianCity_House2_Text_NotebookFourthPage:: @ 818FE5C .string "Fourth page…\p" .string "The ultimate goal for all POKéMON\n" .string "TRAINERS is simple.\p" @@ -43,21 +43,21 @@ gUnknown_818FE5C:: @ 818FE5C .string "The ELITE FOUR of the POKéMON\n" .string "LEAGUE!$" -gUnknown_818FF19:: @ 818FF19 +ViridianCity_House2_Text_TurnThePage:: @ 818FF19 .string "Turn the page?$" -gUnknown_818FF28:: @ 818FF28 +ViridianCity_House2_Text_HeyDontLookAtMyNotes:: @ 818FF28 .string "GIRL: Hey!\n" .string "Don't look at my notes!$" -gUnknown_818FF4B:: @ 818FF4B +ViridianCity_House2_Text_BlackboardListsStatusProblems:: @ 818FF4B .string "The blackboard lists POKéMON\n" .string "STATUS problems during battles.$" -Text_18FF88:: @ 818FF88 +ViridianCity_House2_Text_ReadWhichTopic:: @ 818FF88 .string "Which topic do you want to read?$" -gUnknown_818FFA9:: @ 818FFA9 +ViridianCity_House2_Text_ExplainSleep:: @ 818FFA9 .string "A POKéMON can't attack if it's\n" .string "asleep.\p" .string "POKéMON will stay asleep even\n" @@ -65,19 +65,19 @@ gUnknown_818FFA9:: @ 818FFA9 .string "Use AWAKENING to awaken one\n" .string "from sleep.$" -gUnknown_8190025:: @ 8190025 +ViridianCity_House2_Text_ExplainBurn:: @ 8190025 .string "A burn reduces ATTACK power.\n" .string "It also causes ongoing HP loss.\p" .string "A burn remains after a battle.\n" .string "Use BURN HEAL to cure a burn.$" -gUnknown_819009F:: @ 819009F +ViridianCity_House2_Text_ExplainPoison:: @ 819009F .string "When poisoned, a POKéMON's health\n" .string "steadily drops.\p" .string "Poison lingers after battles.\n" .string "Use an ANTIDOTE to cure poison!$" -gUnknown_819010F:: @ 819010F +ViridianCity_House2_Text_ExplainFreeze:: @ 819010F .string "A frozen POKéMON becomes\n" .string "helplessly immobile.\p" .string "It stays frozen even after the\n" @@ -85,7 +85,7 @@ gUnknown_819010F:: @ 819010F .string "Use ICE HEAL to thaw out the\n" .string "suffering POKéMON.$" -gUnknown_8190199:: @ 8190199 +ViridianCity_House2_Text_ExplainParalysis:: @ 8190199 .string "Paralysis reduces SPEED and may\n" .string "prevent the POKéMON from moving.\p" .string "Paralysis remains after battles.\n" diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 09f58a9d5..5a4ae7bc0 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_Mart_EventScript_16A268", + "script": "ViridianCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_Mart_EventScript_16A2B7", + "script": "ViridianCity_Mart_EventScript_Youngster", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_Mart_EventScript_16A2AE", + "script": "ViridianCity_Mart_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 1f66937cf..5ad0d9a2f 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -4,36 +4,36 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 .byte 0 ViridianCity_Mart_OnLoad:: @ 816A1DE - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_16A1E8 + goto_if_unset FLAG_SYS_POKEDEX_GET, ViridianCity_Mart_EventScript_HideQuestionnaire end -EventScript_16A1E8:: @ 816A1E8 - setmetatile 1, 3, 703, 1 - setmetatile 1, 4, 704, 1 +ViridianCity_Mart_EventScript_HideQuestionnaire:: @ 816A1E8 + setmetatile 1, 3, METATILE_Shop_CounterMid_Top, 1 + setmetatile 1, 4, METATILE_Shop_CounterMid_Bottom, 1 end ViridianCity_Mart_OnFrame:: @ 816A1FB - map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205 + map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, ViridianCity_Mart_EventScript_ParcelScene .2byte 0 -EventScript_16A205:: @ 816A205 +ViridianCity_Mart_EventScript_ParcelScene:: @ 816A205 lockall textcolor 0 applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_819021A + msgbox ViridianCity_Mart_Text_YouCameFromPallet closemessage - applymovement 1, Movement_16A262 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16A25C + applymovement 1, ViridianCity_Mart_Movement_FacePlayer + applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Mart_Movement_ApproachCounter waitmovement 0 - msgbox gUnknown_819023A + msgbox ViridianCity_Mart_Text_TakeThisToProfOak setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - giveitem_msg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 + giveitem_msg ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk, ITEM_OAKS_PARCEL, 1, MUS_FAN5 setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end -Movement_16A25C:: @ 816A25C +ViridianCity_Mart_Movement_ApproachCounter:: @ 816A25C walk_up walk_up walk_up @@ -41,7 +41,7 @@ Movement_16A25C:: @ 816A25C walk_in_place_fastest_left step_end -Movement_16A262:: @ 816A262 +ViridianCity_Mart_Movement_FacePlayer:: @ 816A262 delay_16 delay_16 delay_16 @@ -49,21 +49,21 @@ Movement_16A262:: @ 816A262 walk_in_place_fastest_right step_end -ViridianCity_Mart_EventScript_16A268:: @ 816A268 +ViridianCity_Mart_EventScript_Clerk:: @ 816A268 lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if_eq EventScript_16A2A4 + goto_if_eq ViridianCity_Mart_EventScript_SayHiToOak goto_if_questlog EventScript_ReleaseEnd message Text_MayIHelpYou waitmessage - pokemart Items_16A298 + pokemart ViridianCity_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16A298:: @ 816A298 +ViridianCity_Mart_Items:: @ 816A298 .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE @@ -72,15 +72,15 @@ Items_16A298:: @ 816A298 release end -EventScript_16A2A4:: @ 816A2A4 - msgbox Text_1902BF +ViridianCity_Mart_EventScript_SayHiToOak:: @ 816A2A4 + msgbox ViridianCity_Mart_Text_SayHiToOakForMe release end -ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE - msgbox gUnknown_81902F5, MSGBOX_NPC +ViridianCity_Mart_EventScript_Woman:: @ 816A2AE + msgbox ViridianCity_Mart_Text_ShopDoesGoodBusinessInAntidotes, MSGBOX_NPC end -ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7 - msgbox gUnknown_819032C, MSGBOX_NPC +ViridianCity_Mart_EventScript_Youngster:: @ 816A2B7 + msgbox ViridianCity_Mart_Text_GotToBuySomePotions, MSGBOX_NPC end diff --git a/data/maps/ViridianCity_Mart/text.inc b/data/maps/ViridianCity_Mart/text.inc index a610e83cd..c54f4220a 100644 --- a/data/maps/ViridianCity_Mart/text.inc +++ b/data/maps/ViridianCity_Mart/text.inc @@ -1,25 +1,25 @@ -gUnknown_819021A:: @ 819021A +ViridianCity_Mart_Text_YouCameFromPallet:: @ 819021A .string "Hey!\n" .string "You came from PALLET TOWN?$" -gUnknown_819023A:: @ 819023A +ViridianCity_Mart_Text_TakeThisToProfOak:: @ 819023A .string "You know PROF. OAK, right?\p" .string "His order came in.\n" .string "Can I get you to take it to him?$" -gUnknown_8190289:: @ 8190289 +ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk:: @ 8190289 .string "{PLAYER} received OAK'S PARCEL\n" .string "from the POKéMON MART clerk.$" -Text_1902BF:: @ 81902BF +ViridianCity_Mart_Text_SayHiToOakForMe:: @ 81902BF .string "Okay, thanks! Please say hi to\n" .string "PROF. OAK for me, too.$" -gUnknown_81902F5:: @ 81902F5 +ViridianCity_Mart_Text_ShopDoesGoodBusinessInAntidotes:: @ 81902F5 .string "This shop does good business in\n" .string "ANTIDOTES, I've heard.$" -gUnknown_819032C:: @ 819032C +ViridianCity_Mart_Text_GotToBuySomePotions:: @ 819032C .string "I've got to buy some POTIONS.\p" .string "You never know when your POKéMON\n" .string "will need quick healing.$" diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 3e5822608..c531d4b59 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2CF", + "script": "ViridianCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2E1", + "script": "ViridianCity_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": "ViridianCity_PokemonCenter_1F_EventScript_16A2D8", + "script": "ViridianCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2EA", + "script": "ViridianCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 43e74ef4c..ca02e1113 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB setrespawn SPAWN_VIRIDIAN_CITY end -ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF +ViridianCity_PokemonCenter_1F_EventScript_Nurse:: @ 816A2CF lock faceplayer call EventScript_PkmnCenterNurse release end -ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8 - msgbox gUnknown_81903E5, MSGBOX_NPC +ViridianCity_PokemonCenter_1F_EventScript_Boy:: @ 816A2D8 + msgbox ViridianCity_PokemonCenter_1F_Text_PokeCenterInEveryTown, MSGBOX_NPC end -ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1 - msgbox gUnknown_8190384, MSGBOX_NPC +ViridianCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816A2E1 + msgbox ViridianCity_PokemonCenter_1F_Text_FeelFreeToUsePC, MSGBOX_NPC end -ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA - msgbox gUnknown_8190450, MSGBOX_NPC +ViridianCity_PokemonCenter_1F_EventScript_Youngster:: @ 816A2EA + msgbox ViridianCity_PokemonCenter_1F_Text_PokeCentersHealMons, MSGBOX_NPC end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/text.inc b/data/maps/ViridianCity_PokemonCenter_1F/text.inc index 18b535a45..f0e636704 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/text.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/text.inc @@ -1,16 +1,16 @@ -gUnknown_8190384:: @ 8190384 +ViridianCity_PokemonCenter_1F_Text_FeelFreeToUsePC:: @ 8190384 .string "Please feel free to use that PC in\n" .string "the corner.\p" .string "The receptionist told me so.\n" .string "It's so kind of her!$" -gUnknown_81903E5:: @ 81903E5 +ViridianCity_PokemonCenter_1F_Text_PokeCenterInEveryTown:: @ 81903E5 .string "There's a POKéMON CENTER in every\n" .string "town ahead.\p" .string "They charge no money, so don't\n" .string "be shy about healing POKéMON.$" -gUnknown_8190450:: @ 8190450 +ViridianCity_PokemonCenter_1F_Text_PokeCentersHealMons:: @ 8190450 .string "POKéMON CENTERS heal your tired,\n" .string "hurt, or fainted POKéMON.\p" .string "They make all POKéMON completely\n" diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 90f689a9f..463bc53f5 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_160529", + "script": "ViridianForest_EventScript_Youngster", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_160532", + "script": "ViridianForest_EventScript_Boy", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "ViridianForest_EventScript_160571", + "script": "ViridianForest_EventScript_Rick", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "ViridianForest_EventScript_160588", + "script": "ViridianForest_EventScript_Doug", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "ViridianForest_EventScript_16059F", + "script": "ViridianForest_EventScript_Sammy", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ViridianForest_EventScript_1605B6", + "script": "ViridianForest_EventScript_Anthony", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ViridianForest_EventScript_1605CD", + "script": "ViridianForest_EventScript_Charlie", "flag": "0" }, { @@ -208,42 +208,42 @@ "x": 39, "y": 59, "elevation": 3, - "script": "ViridianForest_EventScript_16053B" + "script": "ViridianForest_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 43, "y": 26, "elevation": 0, - "script": "ViridianForest_EventScript_16054D" + "script": "ViridianForest_EventScript_TrainerTips3" }, { "type": "bg_event_type_0", "x": 9, "y": 29, "elevation": 0, - "script": "ViridianForest_EventScript_160556" + "script": "ViridianForest_EventScript_TrainerTips4" }, { "type": "bg_event_type_0", "x": 6, "y": 12, "elevation": 0, - "script": "ViridianForest_EventScript_160568" + "script": "ViridianForest_EventScript_ExitSign" }, { "type": "bg_event_type_0", "x": 28, "y": 44, "elevation": 0, - "script": "ViridianForest_EventScript_160544" + "script": "ViridianForest_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 31, "y": 60, "elevation": 0, - "script": "ViridianForest_EventScript_16055F" + "script": "ViridianForest_EventScript_TrainerTips5" }, { "type": "hidden_item", diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index 6fb97d075..a54fa1377 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -6,59 +6,59 @@ ViridianForest_OnTransition:: @ 8160525 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST end -ViridianForest_EventScript_160529:: @ 8160529 - msgbox gUnknown_8172255, MSGBOX_NPC +ViridianForest_EventScript_Youngster:: @ 8160529 + msgbox ViridianForest_Text_FriendsItchingToBattle, MSGBOX_NPC end -ViridianForest_EventScript_160532:: @ 8160532 - msgbox gUnknown_8172559, MSGBOX_NPC +ViridianForest_EventScript_Boy:: @ 8160532 + msgbox ViridianForest_Text_RanOutOfPokeBalls, MSGBOX_NPC end -ViridianForest_EventScript_16053B:: @ 816053B - msgbox gUnknown_81725C7, MSGBOX_SIGN +ViridianForest_EventScript_TrainerTips1:: @ 816053B + msgbox ViridianForest_Text_AvoidGrassyAreasWhenWeak, MSGBOX_SIGN end -ViridianForest_EventScript_160544:: @ 8160544 - msgbox gUnknown_8172629, MSGBOX_SIGN +ViridianForest_EventScript_TrainerTips2:: @ 8160544 + msgbox ViridianForest_Text_UseAntidoteForPoison, MSGBOX_SIGN end -ViridianForest_EventScript_16054D:: @ 816054D - msgbox gUnknown_817265C, MSGBOX_SIGN +ViridianForest_EventScript_TrainerTips3:: @ 816054D + msgbox ViridianForest_Text_ContactOakViaPCToRatePokedex, MSGBOX_SIGN end -ViridianForest_EventScript_160556:: @ 8160556 - msgbox gUnknown_81726A3, MSGBOX_SIGN +ViridianForest_EventScript_TrainerTips4:: @ 8160556 + msgbox ViridianForest_Text_CantCatchOwnedMons, MSGBOX_SIGN end -ViridianForest_EventScript_16055F:: @ 816055F - msgbox gUnknown_817271D, MSGBOX_SIGN +ViridianForest_EventScript_TrainerTips5:: @ 816055F + msgbox ViridianForest_Text_WeakenMonsBeforeCapture, MSGBOX_SIGN end -ViridianForest_EventScript_160568:: @ 8160568 - msgbox gUnknown_8172773, MSGBOX_SIGN +ViridianForest_EventScript_ExitSign:: @ 8160568 + msgbox ViridianForest_Text_LeavingViridianForest, MSGBOX_SIGN end -ViridianForest_EventScript_160571:: @ 8160571 - trainerbattle_single TRAINER_BUG_CATCHER_RICK, Text_1722C7, Text_1722F9 - msgbox gUnknown_8172315, MSGBOX_AUTOCLOSE +ViridianForest_EventScript_Rick:: @ 8160571 + trainerbattle_single TRAINER_BUG_CATCHER_RICK, ViridianForest_Text_RickIntro, ViridianForest_Text_RickDefeat + msgbox ViridianForest_Text_RickPostBattle, MSGBOX_AUTOCLOSE end -ViridianForest_EventScript_160588:: @ 8160588 - trainerbattle_single TRAINER_BUG_CATCHER_DOUG, Text_17234A, Text_17237D - msgbox gUnknown_8172398, MSGBOX_AUTOCLOSE +ViridianForest_EventScript_Doug:: @ 8160588 + trainerbattle_single TRAINER_BUG_CATCHER_DOUG, ViridianForest_Text_DougIntro, ViridianForest_Text_DougDefeat + msgbox ViridianForest_Text_DougPostBattle, MSGBOX_AUTOCLOSE end -ViridianForest_EventScript_16059F:: @ 816059F - trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, Text_1723D4, Text_172402 - msgbox gUnknown_817241F, MSGBOX_AUTOCLOSE +ViridianForest_EventScript_Sammy:: @ 816059F + trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, ViridianForest_Text_SammyIntro, ViridianForest_Text_SammyDefeat + msgbox ViridianForest_Text_SammyPostBattle, MSGBOX_AUTOCLOSE end -ViridianForest_EventScript_1605B6:: @ 81605B6 - trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, Text_172482, Text_1724BF - msgbox gUnknown_81724DC, MSGBOX_AUTOCLOSE +ViridianForest_EventScript_Anthony:: @ 81605B6 + trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, ViridianForest_Text_AnthonyIntro, ViridianForest_Text_AnthonyDefeat + msgbox ViridianForest_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE end -ViridianForest_EventScript_1605CD:: @ 81605CD - trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, Text_1724F9, Text_17251B - msgbox gUnknown_8172527, MSGBOX_AUTOCLOSE +ViridianForest_EventScript_Charlie:: @ 81605CD + trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, ViridianForest_Text_CharlieIntro, ViridianForest_Text_CharlieDefeat + msgbox ViridianForest_Text_CharliePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/ViridianForest/text.inc b/data/maps/ViridianForest/text.inc index e3dc737a2..226d9f905 100644 --- a/data/maps/ViridianForest/text.inc +++ b/data/maps/ViridianForest/text.inc @@ -1,105 +1,105 @@ -gUnknown_8172255:: @ 8172255 +ViridianForest_Text_FriendsItchingToBattle:: @ 8172255 .string "I came here with some friends to\n" .string "catch us some BUG POKéMON!\p" .string "They're all itching to get into\n" .string "some POKéMON battles!$" -Text_1722C7:: @ 81722C7 +ViridianForest_Text_RickIntro:: @ 81722C7 .string "Hey! You have POKéMON!\n" .string "Come on!\l" .string "Let's battle 'em!$" -Text_1722F9:: @ 81722F9 +ViridianForest_Text_RickDefeat:: @ 81722F9 .string "No!\nCATERPIE can't hack it!$" -gUnknown_8172315:: @ 8172315 +ViridianForest_Text_RickPostBattle:: @ 8172315 .string "Ssh! You'll scare the bugs away.\n" .string "Another time, okay?$" -Text_17234A:: @ 817234A +ViridianForest_Text_DougIntro:: @ 817234A .string "Yo!\n" .string "You can't jam out if you're a\l" .string "POKéMON TRAINER!$" -Text_17237D:: @ 817237D +ViridianForest_Text_DougDefeat:: @ 817237D .string "Huh?\n" .string "I ran out of POKéMON!$" -gUnknown_8172398:: @ 8172398 +ViridianForest_Text_DougPostBattle:: @ 8172398 .string "That totally stinks! I'm going to\n" .string "catch some stronger ones!$" -Text_1723D4:: @ 81723D4 +ViridianForest_Text_SammyIntro:: @ 81723D4 .string "Hey, wait up!\n" .string "What's the hurry? Why the rush?$" -Text_172402:: @ 8172402 +ViridianForest_Text_SammyDefeat:: @ 8172402 .string "I give!\n" .string "You're good at this!$" -gUnknown_817241F:: @ 817241F +ViridianForest_Text_SammyPostBattle:: @ 817241F .string "Sometimes, you can find stuff on\n" .string "the ground.\p" .string "I'm looking for the stuff I\n" .string "dropped. Can you help me?$" -Text_172482:: @ 8172482 +ViridianForest_Text_AnthonyIntro:: @ 8172482 .string "I might be little, but I won't like\n" .string "it if you go easy on me!$" -Text_1724BF:: @ 81724BF +ViridianForest_Text_AnthonyDefeat:: @ 81724BF .string "Oh, boo.\n" .string "Nothing went right.$" -gUnknown_81724DC:: @ 81724DC +ViridianForest_Text_AnthonyPostBattle:: @ 81724DC .string "I lost some of my allowance…$" -Text_1724F9:: @ 81724F9 +ViridianForest_Text_CharlieIntro:: @ 81724F9 .string "Did you know that POKéMON evolve?$" -Text_17251B:: @ 817251B +ViridianForest_Text_CharlieDefeat:: @ 817251B .string "Oh!\n" .string "I lost!$" -gUnknown_8172527:: @ 8172527 +ViridianForest_Text_CharliePostBattle:: @ 8172527 .string "BUG POKéMON evolve quickly.\n" .string "They're a lot of fun!$" -gUnknown_8172559:: @ 8172559 +ViridianForest_Text_RanOutOfPokeBalls:: @ 8172559 .string "I was throwing POKé BALLS to\n" .string "catch POKéMON, and I ran out.\p" .string "That's why you can never have too\n" .string "many POKé BALLS.$" -gUnknown_81725C7:: @ 81725C7 +ViridianForest_Text_AvoidGrassyAreasWhenWeak:: @ 81725C7 .string "TRAINER TIPS\p" .string "If your POKéMON are weak and you\n" .string "want to avoid battles, stay away\l" .string "from grassy areas!$" -gUnknown_8172629:: @ 8172629 +ViridianForest_Text_UseAntidoteForPoison:: @ 8172629 .string "For poison, use ANTIDOTE!\n" .string "Get it at POKéMON MARTS!$" -gUnknown_817265C:: @ 817265C +ViridianForest_Text_ContactOakViaPCToRatePokedex:: @ 817265C .string "TRAINER TIPS\p" .string "Contact PROF. OAK via a PC to\n" .string "get your POKéDEX evaluated!$" -gUnknown_81726A3:: @ 81726A3 +ViridianForest_Text_CantCatchOwnedMons:: @ 81726A3 .string "TRAINER TIPS\p" .string "You can't catch a POKéMON that\n" .string "belongs to someone else.\p" .string "Throw POKé BALLS only at wild\n" .string "POKéMON to catch them!$" -gUnknown_817271D:: @ 817271D +ViridianForest_Text_WeakenMonsBeforeCapture:: @ 817271D .string "TRAINER TIPS\p" .string "Weaken POKéMON before attempting\n" .string "capture!\p" .string "When healthy, they may escape!$" -gUnknown_8172773:: @ 8172773 +ViridianForest_Text_LeavingViridianForest:: @ 8172773 .string "LEAVING VIRIDIAN FOREST\n" .string "PEWTER CITY AHEAD$" -- cgit v1.2.3 From 35c0e1f60abcd81543c596df8ede65b418e79bd9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 25 Jan 2020 02:05:30 -0500 Subject: Document Celadon City scripts --- data/maps/CeladonCity/map.json | 36 +- data/maps/CeladonCity/scripts.inc | 72 ++-- data/maps/CeladonCity/text.inc | 36 +- data/maps/CeladonCity_Condominiums_1F/map.json | 12 +- data/maps/CeladonCity_Condominiums_1F/scripts.inc | 36 +- data/maps/CeladonCity_Condominiums_1F/text.inc | 16 +- data/maps/CeladonCity_Condominiums_2F/map.json | 8 +- data/maps/CeladonCity_Condominiums_2F/scripts.inc | 4 +- data/maps/CeladonCity_Condominiums_2F/text.inc | 2 +- data/maps/CeladonCity_Condominiums_3F/map.json | 24 +- data/maps/CeladonCity_Condominiums_3F/scripts.inc | 44 +-- data/maps/CeladonCity_Condominiums_3F/text.inc | 18 +- data/maps/CeladonCity_Condominiums_Roof/map.json | 4 +- .../maps/CeladonCity_Condominiums_Roof/scripts.inc | 4 +- data/maps/CeladonCity_Condominiums_Roof/text.inc | 2 +- .../CeladonCity_Condominiums_RoofRoom/map.json | 10 +- .../CeladonCity_Condominiums_RoofRoom/scripts.inc | 86 ++--- .../CeladonCity_Condominiums_RoofRoom/text.inc | 18 +- data/maps/CeladonCity_DepartmentStore_1F/map.json | 6 +- .../CeladonCity_DepartmentStore_1F/scripts.inc | 12 +- data/maps/CeladonCity_DepartmentStore_1F/text.inc | 6 +- data/maps/CeladonCity_DepartmentStore_2F/map.json | 10 +- .../CeladonCity_DepartmentStore_2F/scripts.inc | 24 +- data/maps/CeladonCity_DepartmentStore_2F/text.inc | 12 +- data/maps/CeladonCity_DepartmentStore_3F/map.json | 30 +- .../CeladonCity_DepartmentStore_3F/scripts.inc | 44 +-- data/maps/CeladonCity_DepartmentStore_3F/text.inc | 50 ++- data/maps/CeladonCity_DepartmentStore_4F/map.json | 8 +- .../CeladonCity_DepartmentStore_4F/scripts.inc | 18 +- data/maps/CeladonCity_DepartmentStore_4F/text.inc | 29 +- data/maps/CeladonCity_DepartmentStore_5F/map.json | 10 +- .../CeladonCity_DepartmentStore_5F/scripts.inc | 24 +- data/maps/CeladonCity_DepartmentStore_5F/text.inc | 6 +- .../CeladonCity_DepartmentStore_Elevator/map.json | 4 +- .../scripts.inc | 94 +++-- .../maps/CeladonCity_DepartmentStore_Roof/map.json | 12 +- .../CeladonCity_DepartmentStore_Roof/scripts.inc | 250 +++++++------- .../maps/CeladonCity_DepartmentStore_Roof/text.inc | 36 +- data/maps/CeladonCity_GameCorner/map.json | 70 ++-- data/maps/CeladonCity_GameCorner/scripts.inc | 382 ++++++++++----------- data/maps/CeladonCity_GameCorner/text.inc | 70 ++-- .../maps/CeladonCity_GameCorner_PrizeRoom/map.json | 10 +- .../CeladonCity_GameCorner_PrizeRoom/scripts.inc | 258 +++++++------- .../maps/CeladonCity_GameCorner_PrizeRoom/text.inc | 18 +- data/maps/CeladonCity_Gym/map.json | 20 +- data/maps/CeladonCity_Gym/scripts.inc | 78 ++--- data/maps/CeladonCity_Gym/text.inc | 80 ++--- data/maps/CeladonCity_Hotel/map.json | 8 +- data/maps/CeladonCity_Hotel/scripts.inc | 16 +- data/maps/CeladonCity_Hotel/text.inc | 11 +- data/maps/CeladonCity_House1/map.json | 6 +- data/maps/CeladonCity_House1/scripts.inc | 12 +- data/maps/CeladonCity_House1/text.inc | 6 +- data/maps/CeladonCity_PokemonCenter_1F/map.json | 8 +- data/maps/CeladonCity_PokemonCenter_1F/scripts.inc | 14 +- data/maps/CeladonCity_PokemonCenter_1F/text.inc | 6 +- data/maps/CeladonCity_Restaurant/map.json | 10 +- data/maps/CeladonCity_Restaurant/scripts.inc | 34 +- data/maps/CeladonCity_Restaurant/text.inc | 16 +- 59 files changed, 1117 insertions(+), 1133 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 5a4644854..706d9fa35 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CFA", + "script": "CeladonCity_EventScript_RocketGrunt1", "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CC5", + "script": "CeladonCity_EventScript_FatMan", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CDC", + "script": "CeladonCity_EventScript_Poliwrath", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 4, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166C99", + "script": "CeladonCity_EventScript_LittleGirl", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 5, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CAD", + "script": "CeladonCity_EventScript_Woman", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CB6", + "script": "CeladonCity_EventScript_OldMan2", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166D03", + "script": "CeladonCity_EventScript_RocketGrunt2", "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CA2", + "script": "CeladonCity_EventScript_OldMan1", "flag": "0" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166D0C", + "script": "CeladonCity_EventScript_Boy", "flag": "0" }, { @@ -216,7 +216,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166D15", + "script": "CeladonCity_EventScript_SilphCoScientist", "flag": "FLAG_HIDE_CELADON_ROCKETS" } ], @@ -320,56 +320,56 @@ "x": 45, "y": 23, "elevation": 0, - "script": "CeladonCity_EventScript_166D5A" + "script": "CeladonCity_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 38, "y": 23, "elevation": 0, - "script": "CeladonCity_EventScript_166D63" + "script": "CeladonCity_EventScript_PrizeExchangeSign" }, { "type": "bg_event_type_0", "x": 33, "y": 23, "elevation": 0, - "script": "CeladonCity_EventScript_166D6C" + "script": "CeladonCity_EventScript_GameCornerSign" }, { "type": "bg_event_type_0", "x": 22, "y": 18, "elevation": 3, - "script": "CeladonCity_EventScript_166D27" + "script": "CeladonCity_EventScript_CitySign" }, { "type": "bg_event_type_0", "x": 26, "y": 11, "elevation": 0, - "script": "CeladonCity_EventScript_166D48" + "script": "CeladonCity_EventScript_MansionSign" }, { "type": "bg_event_type_0", "x": 33, "y": 16, "elevation": 0, - "script": "CeladonCity_EventScript_166D1E" + "script": "CeladonCity_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 18, "y": 14, "elevation": 3, - "script": "CeladonCity_EventScript_166D51" + "script": "CeladonCity_EventScript_DeptStoreSign" }, { "type": "bg_event_type_0", "x": 16, "y": 31, "elevation": 0, - "script": "CeladonCity_EventScript_166D30" + "script": "CeladonCity_EventScript_GymSign" }, { "type": "hidden_item", diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index b27d12178..a7d7eddc4 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -6,44 +6,44 @@ CeladonCity_OnTransition:: @ 8166C95 setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end -CeladonCity_EventScript_166C99:: @ 8166C99 - msgbox gUnknown_817FEC3, MSGBOX_NPC +CeladonCity_EventScript_LittleGirl:: @ 8166C99 + msgbox CeladonCity_Text_GotMyKoffingInCinnabar, MSGBOX_NPC end -CeladonCity_EventScript_166CA2:: @ 8166CA2 +CeladonCity_EventScript_OldMan1:: @ 8166CA2 lock - msgbox gUnknown_817FF1C + msgbox CeladonCity_Text_GymIsGreatFullOfWomen release end -CeladonCity_EventScript_166CAD:: @ 8166CAD - msgbox gUnknown_817FF4A, MSGBOX_NPC +CeladonCity_EventScript_Woman:: @ 8166CAD + msgbox CeladonCity_Text_GameCornerIsBadForCitysImage, MSGBOX_NPC end -CeladonCity_EventScript_166CB6:: @ 8166CB6 - msgbox gUnknown_817FFC5, MSGBOX_NPC +CeladonCity_EventScript_OldMan2:: @ 8166CB6 + msgbox CeladonCity_Text_BlewItAllAtSlots, MSGBOX_NPC end CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF goto EventScript_SoftboiledTutor end -CeladonCity_EventScript_166CC5:: @ 8166CC5 +CeladonCity_EventScript_FatMan:: @ 8166CC5 lock faceplayer - msgbox gUnknown_818001B + msgbox CeladonCity_Text_MyTrustedPalPoliwrath closemessage applymovement 2, Movement_FaceOriginalDirection waitmovement 0 release end -CeladonCity_EventScript_166CDC:: @ 8166CDC +CeladonCity_EventScript_Poliwrath:: @ 8166CDC lock faceplayer waitse playmoncry SPECIES_POLIWRATH, 0 - msgbox gUnknown_8180075 + msgbox CeladonCity_Text_Poliwrath closemessage waitmoncry applymovement 3, Movement_FaceOriginalDirection @@ -51,53 +51,53 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC release end -CeladonCity_EventScript_166CFA:: @ 8166CFA - msgbox gUnknown_81800C2, MSGBOX_NPC +CeladonCity_EventScript_RocketGrunt1:: @ 8166CFA + msgbox CeladonCity_Text_KeepOutOfTeamRocketsWay, MSGBOX_NPC end -CeladonCity_EventScript_166D03:: @ 8166D03 - msgbox gUnknown_818008C, MSGBOX_NPC +CeladonCity_EventScript_RocketGrunt2:: @ 8166D03 + msgbox CeladonCity_Text_GetLostOrIllPunchYou, MSGBOX_NPC end -CeladonCity_EventScript_166D0C:: @ 8166D0C - msgbox gUnknown_8180300, MSGBOX_NPC +CeladonCity_EventScript_Boy:: @ 8166D0C + msgbox CeladonCity_Text_ScaldedTongueOnTea, MSGBOX_NPC end -CeladonCity_EventScript_166D15:: @ 8166D15 - msgbox gUnknown_81804E1, MSGBOX_NPC +CeladonCity_EventScript_SilphCoScientist:: @ 8166D15 + msgbox CeladonCity_Text_SomeoneStoleSilphScope, MSGBOX_NPC end -CeladonCity_EventScript_166D1E:: @ 8166D1E - msgbox gUnknown_81800E1, MSGBOX_SIGN +CeladonCity_EventScript_TrainerTips1:: @ 8166D1E + msgbox CeladonCity_Text_ExplainXAccuracyDireHit, MSGBOX_SIGN end -CeladonCity_EventScript_166D27:: @ 8166D27 - msgbox gUnknown_818017A, MSGBOX_SIGN +CeladonCity_EventScript_CitySign:: @ 8166D27 + msgbox CeladonCity_Text_CitySign, MSGBOX_SIGN end -CeladonCity_EventScript_166D30:: @ 8166D30 +CeladonCity_EventScript_GymSign:: @ 8166D30 lockall famechecker FAMECHECKER_ERIKA, 0 - msgbox gUnknown_81801A2 + msgbox CeladonCity_Text_GymSign releaseall end -CeladonCity_EventScript_166D48:: @ 8166D48 - msgbox gUnknown_81801E5, MSGBOX_SIGN +CeladonCity_EventScript_MansionSign:: @ 8166D48 + msgbox CeladonCity_Text_MansionSign, MSGBOX_SIGN end -CeladonCity_EventScript_166D51:: @ 8166D51 - msgbox gUnknown_81801F5, MSGBOX_SIGN +CeladonCity_EventScript_DeptStoreSign:: @ 8166D51 + msgbox CeladonCity_Text_DeptStoreSign, MSGBOX_SIGN end -CeladonCity_EventScript_166D5A:: @ 8166D5A - msgbox gUnknown_8180224, MSGBOX_SIGN +CeladonCity_EventScript_TrainerTips2:: @ 8166D5A + msgbox CeladonCity_Text_GuardSpecProtectsFromStatus, MSGBOX_SIGN end -CeladonCity_EventScript_166D63:: @ 8166D63 - msgbox gUnknown_81802A4, MSGBOX_SIGN +CeladonCity_EventScript_PrizeExchangeSign:: @ 8166D63 + msgbox CeladonCity_Text_PrizeExchangeSign, MSGBOX_SIGN end -CeladonCity_EventScript_166D6C:: @ 8166D6C - msgbox gUnknown_81802CF, MSGBOX_SIGN +CeladonCity_EventScript_GameCornerSign:: @ 8166D6C + msgbox CeladonCity_Text_GameCornerSign, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc index 40f489e3c..a61cdba6d 100644 --- a/data/maps/CeladonCity/text.inc +++ b/data/maps/CeladonCity/text.inc @@ -1,40 +1,40 @@ -gUnknown_817FEC3:: @ 817FEC3 +CeladonCity_Text_GotMyKoffingInCinnabar:: @ 817FEC3 .string "I got my KOFFING in CINNABAR.\p" .string "It's usually nice, but it breathes\n" .string "poison when it's angry.$" -gUnknown_817FF1C:: @ 817FF1C +CeladonCity_Text_GymIsGreatFullOfWomen:: @ 817FF1C .string "Heheh! This GYM is great!\n" .string "It's full of women!$" -gUnknown_817FF4A:: @ 817FF4A +CeladonCity_Text_GameCornerIsBadForCitysImage:: @ 817FF4A .string "CELADON takes pride in its efforts\n" .string "to keep the city beautiful.\p" .string "That's why the new GAME CORNER is\n" .string "bad for our city's image.$" -gUnknown_817FFC5:: @ 817FFC5 +CeladonCity_Text_BlewItAllAtSlots:: @ 817FFC5 .string "Moan…\n" .string "I blew it all at the slots!\p" .string "I knew I should have cashed in my\n" .string "COINS for prizes!$" -gUnknown_818001B:: @ 818001B +CeladonCity_Text_MyTrustedPalPoliwrath:: @ 818001B .string "This is my trusted pal, POLIWRATH.\p" .string "It evolved from a POLIWHIRL when\n" .string "I used a WATER STONE.$" -gUnknown_8180075:: @ 8180075 +CeladonCity_Text_Poliwrath:: @ 8180075 .string "POLIWRATH: Ribi ribit!$" -gUnknown_818008C:: @ 818008C +CeladonCity_Text_GetLostOrIllPunchYou:: @ 818008C .string "What are you staring at?\n" .string "Get lost, or I'll punch you.$" -gUnknown_81800C2:: @ 81800C2 +CeladonCity_Text_KeepOutOfTeamRocketsWay:: @ 81800C2 .string "Keep out of TEAM ROCKET's way!$" -gUnknown_81800E1:: @ 81800E1 +CeladonCity_Text_ExplainXAccuracyDireHit:: @ 81800E1 .string "TRAINER TIPS\p" .string "X ACCURACY boosts the accuracy of\n" .string "techniques.\p" @@ -43,23 +43,23 @@ gUnknown_81800E1:: @ 81800E1 .string "Get your items at the CELADON\n" .string "DEPT. STORE!$" -gUnknown_818017A:: @ 818017A +CeladonCity_Text_CitySign:: @ 818017A .string "CELADON CITY\n" .string "The City of Rainbow Dreams$" -gUnknown_81801A2:: @ 81801A2 +CeladonCity_Text_GymSign:: @ 81801A2 .string "CELADON CITY POKéMON GYM\n" .string "LEADER: ERIKA\l" .string "The Nature-Loving Princess!$" -gUnknown_81801E5:: @ 81801E5 +CeladonCity_Text_MansionSign:: @ 81801E5 .string "CELADON MANSION$" -gUnknown_81801F5:: @ 81801F5 +CeladonCity_Text_DeptStoreSign:: @ 81801F5 .string "Find what you need at the\n" .string "CELADON DEPT. STORE!$" -gUnknown_8180224:: @ 8180224 +CeladonCity_Text_GuardSpecProtectsFromStatus:: @ 8180224 .string "TRAINER TIPS\p" .string "GUARD SPEC. protects POKéMON\n" .string "from status-reduction moves during\l" @@ -67,15 +67,15 @@ gUnknown_8180224:: @ 8180224 .string "Get your items at the\n" .string "CELADON DEPT. STORE!$" -gUnknown_81802A4:: @ 81802A4 +CeladonCity_Text_PrizeExchangeSign:: @ 81802A4 .string "COINS exchanged for prizes!\n" .string "PRIZE EXCHANGE$" -gUnknown_81802CF:: @ 81802CF +CeladonCity_Text_GameCornerSign:: @ 81802CF .string "ROCKET GAME CORNER\n" .string "The playground for grown-ups!$" -gUnknown_8180300:: @ 8180300 +CeladonCity_Text_ScaldedTongueOnTea:: @ 8180300 .string "Aaaagh, ow…\n" .string "I scalded my tongue!\p" .string "This nice old lady in the MANSION\n" @@ -104,7 +104,7 @@ Text_SoftboiledWhichMon:: @ 8180484 Text_SoftboiledTaught:: @ 81804C4 .string "I wish you the best of luck!$" -gUnknown_81804E1:: @ 81804E1 +CeladonCity_Text_SomeoneStoleSilphScope:: @ 81804E1 .string "Oh, what am I to do…\p" .string "Someone stole our SILPH SCOPE.\p" .string "The thief came running this way,\n" diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index a6f29e9d7..bcb4f815c 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C38E", + "script": "CeladonCity_Condominiums_1F_EventScript_Meowth", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3A1", + "script": "CeladonCity_Condominiums_1F_EventScript_Clefairy", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3B4", + "script": "CeladonCity_Condominiums_1F_EventScript_Nidoran", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C321", + "script": "CeladonCity_Condominiums_1F_EventScript_TeaWoman", "flag": "0" } ], @@ -117,14 +117,14 @@ "x": 8, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" } ] } diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 41912748b..0703d8cc4 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -1,63 +1,63 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 .byte 0 -CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 +CeladonCity_Condominiums_1F_EventScript_TeaWoman:: @ 816C321 lock faceplayer - goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374 - goto_if_set FLAG_GOT_TEA, EventScript_16C36A - msgbox gUnknown_81960C9 + goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea + goto_if_set FLAG_SYS_GAME_CLEAR, CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy + goto_if_set FLAG_GOT_TEA, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea + msgbox CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead setflag FLAG_GOT_TEA giveitem ITEM_TEA compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull - msgbox gUnknown_8196109 + msgbox CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea release end -EventScript_16C36A:: @ 816C36A - msgbox gUnknown_8196148 +CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea:: @ 816C36A + msgbox CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany release end -EventScript_16C374:: @ 816C374 +CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy:: @ 816C374 famechecker FAMECHECKER_DAISY, 4 setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF - msgbox gUnknown_8196188 + msgbox CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea release end -CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E +CeladonCity_Condominiums_1F_EventScript_Meowth:: @ 816C38E lock faceplayer waitse playmoncry SPECIES_MEOWTH, 0 - msgbox gUnknown_81960BB + msgbox CeladonCity_Condominiums_1F_Text_Meowth waitmoncry release end -CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1 +CeladonCity_Condominiums_1F_EventScript_Clefairy:: @ 816C3A1 lock faceplayer waitse playmoncry SPECIES_CLEFAIRY, 0 - msgbox gUnknown_819625B + msgbox CeladonCity_Condominiums_1F_Text_Clefairy waitmoncry release end -CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 +CeladonCity_Condominiums_1F_EventScript_Nidoran:: @ 816C3B4 lock faceplayer waitse playmoncry SPECIES_NIDORAN_F, 0 - msgbox gUnknown_8196272 + msgbox CeladonCity_Condominiums_1F_Text_Nidoran waitmoncry release end -CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 - msgbox gUnknown_8196287, MSGBOX_SIGN +CeladonCity_Condominiums_1F_EventScript_SuiteSign:: @ 816C3C7 + msgbox CeladonCity_Condominiums_1F_Text_ManagersSuite, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_1F/text.inc b/data/maps/CeladonCity_Condominiums_1F/text.inc index 7cfb9c2a1..fa0512f76 100644 --- a/data/maps/CeladonCity_Condominiums_1F/text.inc +++ b/data/maps/CeladonCity_Condominiums_1F/text.inc @@ -1,21 +1,21 @@ -gUnknown_81960BB:: @ 81960BB +CeladonCity_Condominiums_1F_Text_Meowth:: @ 81960BB .string "MEOWTH: Meow!$" -gUnknown_81960C9:: @ 81960C9 +CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead:: @ 81960C9 .string "You shouldn't spend all your money\n" .string "on drinks.\p" .string "Try this instead.$" -gUnknown_8196109:: @ 8196109 +CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea:: @ 8196109 .string "Nothing beats thirst like some hot\n" .string "TEA.\p" .string "It really is the best.$" -gUnknown_8196148:: @ 8196148 +CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany:: @ 8196148 .string "My dear POKéMON keep me company.\n" .string "MEOWTH even brings money home!$" -gUnknown_8196188:: @ 8196188 +CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea:: @ 8196188 .string "Oh, hello, dearie.\n" .string "Did you enjoy my TEA?\p" .string "By the way, dear. Are you, by any\n" @@ -25,13 +25,13 @@ gUnknown_8196188:: @ 8196188 .string "She visits the CELADON DEPT. STORE\n" .string "to buy some TEA.$" -gUnknown_819625B:: @ 819625B +CeladonCity_Condominiums_1F_Text_Clefairy:: @ 819625B .string "CLEFAIRY: Pi pippippi!$" -gUnknown_8196272:: @ 8196272 +CeladonCity_Condominiums_1F_Text_Nidoran:: @ 8196272 .string "NIDORAN♀: Kya kyaoo!$" -gUnknown_8196287:: @ 8196287 +CeladonCity_Condominiums_1F_Text_ManagersSuite:: @ 8196287 .string "CELADON MANSION\n" .string "Manager's Suite$" diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 33248a953..10e5eb1c6 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika", "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika", "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" } ], @@ -77,14 +77,14 @@ "x": 8, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" } ] } diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc index 53c0a90c0..9d952f2d7 100644 --- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -1,6 +1,6 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 .byte 0 -CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 - msgbox gUnknown_81962A7, MSGBOX_SIGN +CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign:: @ 816C3D1 + msgbox CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_2F/text.inc b/data/maps/CeladonCity_Condominiums_2F/text.inc index 1913e1529..30ab60a1d 100644 --- a/data/maps/CeladonCity_Condominiums_2F/text.inc +++ b/data/maps/CeladonCity_Condominiums_2F/text.inc @@ -1,3 +1,3 @@ -gUnknown_81962A7:: @ 81962A7 +CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom:: @ 81962A7 .string "GAME FREAK Meeting Room$" diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index e491e8112..4a1fb023c 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3DB", + "script": "CeladonCity_Condominiums_3F_EventScript_Programmer", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3F6", + "script": "CeladonCity_Condominiums_3F_EventScript_Designer", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3E4", + "script": "CeladonCity_Condominiums_3F_EventScript_GraphicArtist", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3ED", + "script": "CeladonCity_Condominiums_3F_EventScript_Writer", "flag": "0" } ], @@ -103,56 +103,56 @@ "x": 8, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { "type": "bg_event_type_1", "x": 1, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { "type": "bg_event_type_1", "x": 5, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" }, { "type": "bg_event_type_1", "x": 1, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { "type": "bg_event_type_1", "x": 0, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { "type": "bg_event_type_1", "x": 0, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { "type": "bg_event_type_1", "x": 4, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" } ] } diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index d7bb14293..878ed63e8 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -1,34 +1,34 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA .byte 0 -CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB - msgbox gUnknown_81962BF, MSGBOX_NPC +CeladonCity_Condominiums_3F_EventScript_Programmer:: @ 816C3DB + msgbox CeladonCity_Condominiums_3F_Text_ImTheProgrammer, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4 - msgbox gUnknown_81962D7, MSGBOX_NPC +CeladonCity_Condominiums_3F_EventScript_GraphicArtist:: @ 816C3E4 + msgbox CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED - msgbox gUnknown_81962FB, MSGBOX_NPC +CeladonCity_Condominiums_3F_EventScript_Writer:: @ 816C3ED + msgbox CeladonCity_Condominiums_3F_Text_IWroteTheStory, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 +CeladonCity_Condominiums_3F_EventScript_Designer:: @ 816C3F6 lock faceplayer specialvar VAR_RESULT, HasAllKantoMons - compare VAR_RESULT, 1 - goto_if_eq EventScript_16C412 - msgbox gUnknown_8196356 + compare VAR_RESULT, TRUE + goto_if_eq CeladonCity_Condominiums_3F_EventScript_CompletedPokedex + msgbox CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex release end -EventScript_16C412:: @ 816C412 - goto EventScript_16C418 +CeladonCity_Condominiums_3F_EventScript_CompletedPokedex:: @ 816C412 + goto CeladonCity_Condominiums_3F_EventScript_ShowDiploma end -EventScript_16C418:: @ 816C418 - message Text_1963CD +CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418 + message CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations waitmessage delay 60 goto_if_questlog EventScript_ReleaseEnd @@ -37,18 +37,18 @@ EventScript_16C418:: @ 816C418 release end -CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435 - msgbox gUnknown_81964A8, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign:: @ 816C435 + msgbox CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E - msgbox gUnknown_819640C, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_Computer1:: @ 816C43E + msgbox CeladonCity_Condominiums_3F_Text_ItsTheGameProgram, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 - msgbox gUnknown_819644B, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_Computer2:: @ 816C447 + msgbox CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 - msgbox gUnknown_8196478, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_Computer3:: @ 816C450 + msgbox CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_3F/text.inc b/data/maps/CeladonCity_Condominiums_3F/text.inc index 3f7179dfe..d4f91594a 100644 --- a/data/maps/CeladonCity_Condominiums_3F/text.inc +++ b/data/maps/CeladonCity_Condominiums_3F/text.inc @@ -1,42 +1,42 @@ -gUnknown_81962BF:: @ 81962BF +CeladonCity_Condominiums_3F_Text_ImTheProgrammer:: @ 81962BF .string "Me?\n" .string "I'm the programmer!$" -gUnknown_81962D7:: @ 81962D7 +CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist:: @ 81962D7 .string "I'm the graphic artist!\n" .string "I drew you!$" -gUnknown_81962FB:: @ 81962FB +CeladonCity_Condominiums_3F_Text_IWroteTheStory:: @ 81962FB .string "I wrote the story!\n" .string "Isn't ERIKA cute?\p" .string "I like MISTY a lot, too!\n" .string "Oh, and SABRINA, I like her!$" -gUnknown_8196356:: @ 8196356 +CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex:: @ 8196356 .string "Is that right?\p" .string "I'm the game designer!\p" .string "Filling up your POKéDEX is tough,\n" .string "but don't quit!\p" .string "When you finish, come tell me!$" -Text_1963CD:: @ 81963CD +CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations:: @ 81963CD .string "Wow! Excellent!\n" .string "You completed your POKéDEX!\l" .string "Congratulations!\l" .string "…$" -gUnknown_819640C:: @ 819640C +CeladonCity_Condominiums_3F_Text_ItsTheGameProgram:: @ 819640C .string "It's the game program! Messing with\n" .string "it could bug out the game!$" -gUnknown_819644B:: @ 819644B +CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame:: @ 819644B .string "Someone's playing a game instead of\n" .string "working!$" -gUnknown_8196478:: @ 8196478 +CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding:: @ 8196478 .string "It's the script!\n" .string "Better not look at the ending!$" -gUnknown_81964A8:: @ 81964A8 +CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom:: @ 81964A8 .string "GAME FREAK Development Room$" diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 7680f5f68..c929b62fc 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -43,14 +43,14 @@ "x": 4, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" }, { "type": "bg_event_type_0", "x": 3, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" } ] } diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc index 59631d86c..98013e38f 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -1,6 +1,6 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 .byte 0 -CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A - msgbox gUnknown_81964C4, MSGBOX_SIGN +CeladonCity_Condominiums_Roof_EventScript_Sign:: @ 816C45A + msgbox CeladonCity_Condominiums_Roof_Text_IKnowEverything, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_Roof/text.inc b/data/maps/CeladonCity_Condominiums_Roof/text.inc index 02398e70b..f3012fd31 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/text.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/text.inc @@ -1,3 +1,3 @@ -gUnknown_81964C4:: @ 81964C4 +CeladonCity_Condominiums_Roof_Text_IKnowEverything:: @ 81964C4 .string "I KNOW EVERYTHING!$" diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 717bfc4a1..d229e7fdd 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C464", + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D", + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall", "flag": "FLAG_HIDE_EEVEE_BALL" } ], @@ -70,21 +70,21 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { "type": "bg_event_type_0", "x": 5, "y": 1, "elevation": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { "type": "bg_event_type_0", "x": 4, "y": 4, "elevation": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519" + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet" } ] } diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 73c55afd8..3f3363674 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -1,109 +1,109 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 .byte 0 -CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 - msgbox gUnknown_81964D7, MSGBOX_NPC +CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt:: @ 816C464 + msgbox CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow, MSGBOX_NPC end -CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D +CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D lock faceplayer setvar VAR_TEMP_1, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_16C4A6 + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16C4DA + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon release end -EventScript_16C4A6:: @ 816C4A6 +CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 removeobject 2 playfanfare MUS_FANFA1 - message Text_196591 + message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C514 + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname - goto EventScript_16C514 + goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee end -EventScript_16C4DA:: @ 816C4DA +CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA removeobject 2 playfanfare MUS_FANFA1 - message Text_196591 + message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C509 + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC call EventScript_NameReceivedBoxMon - goto EventScript_16C509 + goto CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC end -EventScript_16C509:: @ 816C509 +CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC:: @ 816C509 call EventScript_TransferredToPC - goto EventScript_16C514 + goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee end -EventScript_16C514:: @ 816C514 +CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee:: @ 816C514 setflag FLAG_GOT_EEVEE release end -CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 - msgbox gUnknown_81967E3, MSGBOX_SIGN +CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet:: @ 816C519 + msgbox CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs, MSGBOX_SIGN end -CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 +CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard:: @ 816C522 lockall - msgbox gUnknown_81965C2 - message Text_1965F4 + msgbox CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture + message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading waitmessage setvar VAR_0x8004, 4 multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT - case 0, EventScript_16C5C0 - case 1, EventScript_16C5CE - case 2, EventScript_16C5DC - case 3, EventScript_16C5EA - case 127, EventScript_16C5EA + case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub + case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner + case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom + case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard + case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard end -EventScript_16C578:: @ 816C578 - message Text_1965F4 +CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading:: @ 816C578 + message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading waitmessage multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT - case 0, EventScript_16C5C0 - case 1, EventScript_16C5CE - case 2, EventScript_16C5DC - case 3, EventScript_16C5EA - case 127, EventScript_16C5EA + case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub + case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner + case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom + case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard + case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard end -EventScript_16C5C0:: @ 816C5C0 - msgbox gUnknown_8196617 - goto EventScript_16C578 +CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub:: @ 816C5C0 + msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub + goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -EventScript_16C5CE:: @ 816C5CE - msgbox gUnknown_8196695 - goto EventScript_16C578 +CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner:: @ 816C5CE + msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner + goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -EventScript_16C5DC:: @ 816C5DC - msgbox gUnknown_819673C - goto EventScript_16C578 +CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom:: @ 816C5DC + msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom + goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -EventScript_16C5EA:: @ 816C5EA +CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard:: @ 816C5EA releaseall end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc index bb09c8ce3..9e43f06ce 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc @@ -1,4 +1,4 @@ -gUnknown_81964D7:: @ 81964D7 +CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow:: @ 81964D7 .string "There is nothing that I don't know,\n" .string "like I wrote on the blackboard.\p" .string "I know about the world of POKéMON\n" @@ -6,27 +6,27 @@ gUnknown_81964D7:: @ 81964D7 .string "Get together with your friends and\n" .string "enjoy trading POKéMON!$" -Text_196591:: @ 8196591 +CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee:: @ 8196591 .string "{PLAYER} obtained an EEVEE!$" -Text_1965A7:: @ 81965A7 +CeladonCity_Condominiums_RoofRoom_Text_BoxIsFull:: @ 81965A7 .string "ポケモンが　いっぱいだ\n" .string "ボックスを　かえて　きなさい$" -gUnknown_81965C2:: @ 81965C2 +CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture:: @ 81965C2 .string "POKéMON Lecture\p" .string "Playing with the Wireless Adapter$" -Text_1965F4:: @ 81965F4 +CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading:: @ 81965F4 .string "Which heading do you want to read?$" -gUnknown_8196617:: @ 8196617 +CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub:: @ 8196617 .string "The POKéMON WIRELESS CLUB is\n" .string "upstairs at any POKéMON CENTER.\p" .string "Visit one to link up with friend(s)\n" .string "using your Wireless Adapter.$" -gUnknown_8196695:: @ 8196695 +CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner:: @ 8196695 .string "To link only with a friend, go to\n" .string "the DIRECT CORNER.\p" .string "It is the right counter at the\n" @@ -34,7 +34,7 @@ gUnknown_8196695:: @ 8196695 .string "Go into the TRADE CORNER or the\n" .string "COLOSSEUM with your friend.$" -gUnknown_819673C:: @ 819673C +CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom:: @ 819673C .string "To link and communicate with\n" .string "anyone, go to the UNION ROOM.\p" .string "It is the left counter at the\n" @@ -42,7 +42,7 @@ gUnknown_819673C:: @ 819673C .string "Go to the UNION ROOM and enjoy\n" .string "meeting other TRAINERS.$" -gUnknown_81967E3:: @ 81967E3 +CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs:: @ 81967E3 .string "It's a pamphlet on TMs.\p" .string "… …\p" .string "There are fifty TMs in all.\p" diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index afa57c1aa..d4e20b168 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAD9", + "script": "CeladonCity_DepartmentStore_1F_EventScript_Receptionist", "flag": "0" } ], @@ -92,14 +92,14 @@ "x": 9, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAE2" + "script": "CeladonCity_DepartmentStore_1F_EventScript_LayoutSign" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB" + "script": "CeladonCity_DepartmentStore_1F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc index 4e5bcc05e..08aa687f8 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -1,14 +1,14 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 .byte 0 -CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 - msgbox gUnknown_81954DD, MSGBOX_NPC +CeladonCity_DepartmentStore_1F_EventScript_Receptionist:: @ 816BAD9 + msgbox CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC end -CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 - msgbox gUnknown_8195537, MSGBOX_SIGN +CeladonCity_DepartmentStore_1F_EventScript_LayoutSign:: @ 816BAE2 + msgbox CeladonCity_DepartmentStore_1F_Text_FloorDescriptions, MSGBOX_SIGN end -CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB - msgbox gUnknown_81955B3, MSGBOX_SIGN +CeladonCity_DepartmentStore_1F_EventScript_FloorSign:: @ 816BAEB + msgbox CeladonCity_DepartmentStore_1F_Text_ServiceCounter, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_1F/text.inc b/data/maps/CeladonCity_DepartmentStore_1F/text.inc index e78a8c6d2..f1d1877e4 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/text.inc @@ -1,10 +1,10 @@ -gUnknown_81954DD:: @ 81954DD +CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore:: @ 81954DD .string "Hello!\n" .string "Welcome to CELADON DEPT. STORE.\p" .string "The board on the right describes\n" .string "the store layout.$" -gUnknown_8195537:: @ 8195537 +CeladonCity_DepartmentStore_1F_Text_FloorDescriptions:: @ 8195537 .string "1F: SERVICE COUNTER\p" .string "2F: TRAINER'S MARKET\p" .string "3F: TV GAME SHOP\p" @@ -12,6 +12,6 @@ gUnknown_8195537:: @ 8195537 .string "5F: DRUGSTORE\p" .string "ROOFTOP SQUARE: VENDING MACHINES$" -gUnknown_81955B3:: @ 81955B3 +CeladonCity_DepartmentStore_1F_Text_ServiceCounter:: @ 81955B3 .string "1F: SERVICE COUNTER$" diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index fdb27ab7e..e4e6f2f29 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BAFE", + "script": "CeladonCity_DepartmentStore_2F_EventScript_Lass", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB10", + "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkItems", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB4E", + "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053", + "script": "CeladonCity_DepartmentStore_2F_EventScript_Woman", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], @@ -96,7 +96,7 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07" + "script": "CeladonCity_DepartmentStore_2F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 24d4771b2..f7e89886d 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -1,31 +1,31 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 .byte 0 -CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 - msgbox gUnknown_81955C7, MSGBOX_NPC +CeladonCity_DepartmentStore_2F_EventScript_UnusedNPC:: @ 816BAF5 + msgbox CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel, MSGBOX_NPC end -CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE - msgbox gUnknown_819560F, MSGBOX_NPC +CeladonCity_DepartmentStore_2F_EventScript_Lass:: @ 816BAFE + msgbox CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings, MSGBOX_NPC end -CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 - msgbox gUnknown_8195638, MSGBOX_SIGN +CeladonCity_DepartmentStore_2F_EventScript_FloorSign:: @ 816BB07 + msgbox CeladonCity_DepartmentStore_2F_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 +CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: @ 816BB10 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BB38 + pokemart CeladonCity_DepartmentStore_2F_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16BB38:: @ 816BB38 +CeladonCity_DepartmentStore_2F_Items:: @ 816BB38 .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_REVIVE @@ -39,19 +39,19 @@ Items_16BB38:: @ 816BB38 release end -CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E +CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: @ 816BB4E goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BB74 + pokemart CeladonCity_DepartmentStore_2F_TMs msgbox Text_PleaseComeAgain release end .align 2 -Items_16BB74:: @ 816BB74 +CeladonCity_DepartmentStore_2F_TMs:: @ 816BB74 .2byte ITEM_TM05 .2byte ITEM_TM15 .2byte ITEM_TM28 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/text.inc b/data/maps/CeladonCity_DepartmentStore_2F/text.inc index 22bf6b36c..77466521a 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/text.inc @@ -1,13 +1,19 @@ -gUnknown_81955C7:: @ 81955C7 +CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel:: @ 81955C7 .string "SUPER REPEL keeps weak POKéMON at\n" .string "bay…\p" .string "Hmm, it's a more powerful REPEL.$" -gUnknown_819560F:: @ 819560F +CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings:: @ 819560F .string "For long outings, you should buy\n" .string "REVIVE.$" -gUnknown_8195638:: @ 8195638 +CeladonCity_DepartmentStore_2F_Text_FloorSign:: @ 8195638 .string "Top-Grade Items for TRAINERS!\p" .string "2F: TRAINER'S MARKET$" +CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes:: @ 819566B + .string "We have a customer, LANCE, who\n" + .string "occasionally comes.\p" + .string "He always buys capes.\p" + .string "I wonder… Does he have many\n" + .string "identical capes at home?$" diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 76bc95d25..37132845e 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB8B", + "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid1", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB9D", + "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid3", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB94", + "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid2", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBA6", + "script": "CeladonCity_DepartmentStore_3F_EventScript_LittleGirl", "flag": "0" } ], @@ -109,77 +109,77 @@ "x": 8, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBDC" + "script": "CeladonCity_DepartmentStore_3F_EventScript_FloorSign" }, { "type": "bg_event_type_1", "x": 2, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBB8" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV1" }, { "type": "bg_event_type_1", "x": 5, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBC1" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV2" }, { "type": "bg_event_type_1", "x": 2, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBCA" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV3" }, { "type": "bg_event_type_1", "x": 5, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBD3" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV4" }, { "type": "bg_event_type_0", "x": 1, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_0", "x": 1, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_0", "x": 4, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_0", "x": 4, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_1", "x": 2, "y": 4, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" }, { "type": "bg_event_type_1", "x": 0, "y": 4, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index f4faca037..e7af53078 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -5,46 +5,46 @@ CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85 goto EventScript_CounterTutor end -CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B - msgbox gUnknown_81956E9, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_GBAKid1:: @ 816BB8B + msgbox CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94 - msgbox gUnknown_8195769, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_GBAKid2:: @ 816BB94 + msgbox CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D - msgbox gUnknown_81957B0, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_GBAKid3:: @ 816BB9D + msgbox CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6 - msgbox gUnknown_8195823, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_LittleGirl:: @ 816BBA6 + msgbox CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF - msgbox gUnknown_8195863, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_SuperNES:: @ 816BBAF + msgbox CeladonCity_DepartmentStore_3F_Text_ItsSuperNES, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8 - msgbox gUnknown_8195875, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV1:: @ 816BBB8 + msgbox CeladonCity_DepartmentStore_3F_Text_AnRPG, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1 - msgbox gUnknown_8195897, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV2:: @ 816BBC1 + msgbox CeladonCity_DepartmentStore_3F_Text_SportsGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA - msgbox gUnknown_81958B8, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV3:: @ 816BBCA + msgbox CeladonCity_DepartmentStore_3F_Text_PuzzleGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3 - msgbox gUnknown_81958D8, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV4:: @ 816BBD3 + msgbox CeladonCity_DepartmentStore_3F_Text_FightingGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC - msgbox gUnknown_81958F6, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_FloorSign:: @ 816BBDC + msgbox CeladonCity_DepartmentStore_3F_Text_TVGameShop, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 - msgbox gUnknown_8195907, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_Poster:: @ 816BBE5 + msgbox CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_3F/text.inc b/data/maps/CeladonCity_DepartmentStore_3F/text.inc index 7d4db12cc..3533884a5 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/text.inc @@ -1,22 +1,15 @@ -Text_19566B:: @ 819566B - .string "We have a customer, LANCE, who\n" - .string "occasionally comes.\p" - .string "He always buys capes.\p" - .string "I wonder… Does he have many\n" - .string "identical capes at home?$" - -gUnknown_81956E9:: @ 81956E9 +CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer:: @ 81956E9 .string "Captured POKéMON are registered\n" .string "with an ID No. and the OT.\p" .string "OT stands for “Original TRAINER” -\n" .string "the TRAINER that caught it first.$" -gUnknown_8195769:: @ 8195769 +CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter:: @ 8195769 .string "All right!\p" .string "My buddy's going to trade me his\n" .string "KANGASKHAN for my HAUNTER!$" -gUnknown_81957B0:: @ 81957B0 +CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade:: @ 81957B0 .string "Come on, HAUNTER!\p" .string "I love HAUNTER!\n" .string "I collect them!\p" @@ -24,33 +17,54 @@ gUnknown_81957B0:: @ 81957B0 .string "HAUNTER turned into a different\n" .string "POKéMON while being traded!$" -gUnknown_8195823:: @ 8195823 +CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID:: @ 8195823 .string "You can identify POKéMON you get\n" .string "in trades by their ID Numbers.$" -gUnknown_8195863:: @ 8195863 +CeladonCity_DepartmentStore_3F_Text_ItsSuperNES:: @ 8195863 .string "It's a Super NES.$" -gUnknown_8195875:: @ 8195875 +CeladonCity_DepartmentStore_3F_Text_AnRPG:: @ 8195875 .string "An RPG!\n" .string "There's no time for that!$" -gUnknown_8195897:: @ 8195897 +CeladonCity_DepartmentStore_3F_Text_SportsGame:: @ 8195897 .string "A sports game!\n" .string "Dad'll like that!$" -gUnknown_81958B8:: @ 81958B8 +CeladonCity_DepartmentStore_3F_Text_PuzzleGame:: @ 81958B8 .string "A puzzle game!\n" .string "Looks addictive!$" -gUnknown_81958D8:: @ 81958D8 +CeladonCity_DepartmentStore_3F_Text_FightingGame:: @ 81958D8 .string "A fighting game!\n" .string "Looks tough!$" -gUnknown_81958F6:: @ 81958F6 +CeladonCity_DepartmentStore_3F_Text_TVGameShop:: @ 81958F6 .string "3F: TV GAME SHOP$" -gUnknown_8195907:: @ 8195907 +CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon:: @ 8195907 .string "Red and Green!\n" .string "Both are POKéMON!$" +Text_CounterTeach:: @ 8195928 + .string "Oh, hi!\n" + .string "I finally finished POKéMON.\p" + .string "Not done yet? How about I teach\n" + .string "you a good move?\p" + .string "The move I have in mind is\n" + .string "COUNTER.\p" + .string "Not like the one I'm leaning on,\n" + .string "mind you!$" + +Text_CounterDeclined:: @ 81959CC + .string "You're not interested? Come see\n" + .string "me if you change your mind.$" + +Text_CounterWhichMon:: @ 8195A08 + .string "Which POKéMON should I teach\n" + .string "COUNTER to?$" + +Text_CounterTaught:: @ 8195A31 + .string "Are you using that COUNTER move\n" + .string "I taught your POKéMON?$" diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 059ff30e3..d1130b058 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBEF", + "script": "CeladonCity_DepartmentStore_4F_EventScript_Man", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBF8", + "script": "CeladonCity_DepartmentStore_4F_EventScript_Youngster", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC0A", + "script": "CeladonCity_DepartmentStore_4F_EventScript_Clerk", "flag": "0" } ], @@ -83,7 +83,7 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01" + "script": "CeladonCity_DepartmentStore_4F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index f04968b1e..e9aba025a 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -1,31 +1,31 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE .byte 0 -CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF - msgbox gUnknown_8195A68, MSGBOX_NPC +CeladonCity_DepartmentStore_4F_EventScript_Man:: @ 816BBEF + msgbox CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent, MSGBOX_NPC end -CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8 - msgbox gUnknown_8195AC9, MSGBOX_NPC +CeladonCity_DepartmentStore_4F_EventScript_Youngster:: @ 816BBF8 + msgbox CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll, MSGBOX_NPC end -CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 - msgbox gUnknown_8195B5B, MSGBOX_SIGN +CeladonCity_DepartmentStore_4F_EventScript_FloorSign:: @ 816BC01 + msgbox CeladonCity_DepartmentStore_4F_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A +CeladonCity_DepartmentStore_4F_EventScript_Clerk:: @ 816BC0A goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BC30 + pokemart CeladonCity_DepartmentStore_4F_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16BC30:: @ 816BC30 +CeladonCity_DepartmentStore_4F_Items:: @ 816BC30 .2byte ITEM_POKE_DOLL .2byte ITEM_RETRO_MAIL .2byte ITEM_FIRE_STONE diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc index 426cc2c82..80121023e 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc @@ -1,41 +1,18 @@ -Text_CounterTeach:: @ 8195928 - .string "Oh, hi!\n" - .string "I finally finished POKéMON.\p" - .string "Not done yet? How about I teach\n" - .string "you a good move?\p" - .string "The move I have in mind is\n" - .string "COUNTER.\p" - .string "Not like the one I'm leaning on,\n" - .string "mind you!$" - -Text_CounterDeclined:: @ 81959CC - .string "You're not interested? Come see\n" - .string "me if you change your mind.$" - -Text_CounterWhichMon:: @ 8195A08 - .string "Which POKéMON should I teach\n" - .string "COUNTER to?$" - -Text_CounterTaught:: @ 8195A31 - .string "Are you using that COUNTER move\n" - .string "I taught your POKéMON?$" - -gUnknown_8195A68:: @ 8195A68 +CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent:: @ 8195A68 .string "I'm getting a present for my\n" .string "girlfriend.\p" .string "I guess a POKé DOLL will be it.\n" .string "It's the popular thing.$" -gUnknown_8195AC9:: @ 8195AC9 +CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll:: @ 8195AC9 .string "I heard something useful.\p" .string "If a wild POKéMON appears, you can\n" .string "distract it with a POKé DOLL.\p" .string "You can run away while the wild\n" .string "POKéMON is distracted.$" -gUnknown_8195B5B:: @ 8195B5B +CeladonCity_DepartmentStore_4F_Text_FloorSign:: @ 8195B5B .string "Express yourself with gifts!\n" .string "4F: WISE MAN GIFTS\p" .string "Evolution Special!\n" .string "Element STONES on sale now!$" - diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 65b0fe9bc..b90f5f8e9 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC41", + "script": "CeladonCity_DepartmentStore_5F_EventScript_Gentleman", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC4A", + "script": "CeladonCity_DepartmentStore_5F_EventScript_Sailor", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC5C", + "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC96", + "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins", "flag": "0" } ], @@ -96,7 +96,7 @@ "x": 8, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53" + "script": "CeladonCity_DepartmentStore_5F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 9056d2b2d..e854a6a65 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -1,31 +1,31 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 .byte 0 -CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 - msgbox gUnknown_8195BBA, MSGBOX_NPC +CeladonCity_DepartmentStore_5F_EventScript_Gentleman:: @ 816BC41 + msgbox CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers, MSGBOX_NPC end -CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A - msgbox gUnknown_8195CA0, MSGBOX_NPC +CeladonCity_DepartmentStore_5F_EventScript_Sailor:: @ 816BC4A + msgbox CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers, MSGBOX_NPC end -CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 - msgbox gUnknown_8195D14, MSGBOX_SIGN +CeladonCity_DepartmentStore_5F_EventScript_FloorSign:: @ 816BC53 + msgbox CeladonCity_DepartmentStore_5F_Text_Drugstore, MSGBOX_SIGN end -CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C +CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems:: @ 816BC5C goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BC84 + pokemart CeladonCity_DepartmentStore_5F_XItems msgbox Text_PleaseComeAgain release end .align 2 -Items_16BC84:: @ 816BC84 +CeladonCity_DepartmentStore_5F_XItems:: @ 816BC84 .2byte ITEM_X_ATTACK .2byte ITEM_X_DEFEND .2byte ITEM_X_SPEED @@ -37,19 +37,19 @@ Items_16BC84:: @ 816BC84 release end -CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 +CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins:: @ 816BC96 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BCBC + pokemart CeladonCity_DepartmentStore_5F_Vitamins msgbox Text_PleaseComeAgain release end .align 2 -Items_16BCBC:: @ 816BCBC +CeladonCity_DepartmentStore_5F_Vitamins:: @ 816BCBC .2byte ITEM_HP_UP .2byte ITEM_PROTEIN .2byte ITEM_IRON diff --git a/data/maps/CeladonCity_DepartmentStore_5F/text.inc b/data/maps/CeladonCity_DepartmentStore_5F/text.inc index b8cee5afa..638f07320 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/text.inc @@ -1,4 +1,4 @@ -gUnknown_8195BBA:: @ 8195BBA +CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers:: @ 8195BBA .string "POKéMON stat enhancers can be\n" .string "bought only here.\p" .string "HP UP increases the base HP of a\n" @@ -10,7 +10,7 @@ gUnknown_8195BBA:: @ 8195BBA .string "CARBOS enhances the base SPEED\n" .string "stat.$" -gUnknown_8195CA0:: @ 8195CA0 +CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers:: @ 8195CA0 .string "I'm here for POKéMON stat\n" .string "enhancers.\p" .string "PROTEIN increases the base ATTACK\n" @@ -18,6 +18,6 @@ gUnknown_8195CA0:: @ 8195CA0 .string "IRON increases the base DEFENSE\n" .string "stat.$" -gUnknown_8195D14:: @ 8195D14 +CeladonCity_DepartmentStore_5F_Text_Drugstore:: @ 8195D14 .string "5F: DRUGSTORE$" diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index a2a7d1b48..5fe6f9885 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -36,14 +36,14 @@ "x": 0, "y": 2, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" }, { "type": "bg_event_type_0", "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 14198db2f..7a3737610 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 .byte 0 -CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153 lockall setvar VAR_0x8004, 3 call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 @@ -12,107 +12,105 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 setvar VAR_0x8004, 3 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT - case 0, EventScript_16C1B7 - case 1, EventScript_16C1C3 - case 2, EventScript_16C1CF - case 3, EventScript_16C1DB - case 4, EventScript_16C1E7 + case 0, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F + case 1, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F + case 2, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F + case 3, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F + case 4, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F end -EventScript_16C1B7:: @ 816C1B7 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F:: @ 816C1B7 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 0, FALSE - goto EventScript_16C1F3 - -EventScript_16C1C2:: @ 816C1C2 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1C3:: @ 816C1C3 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F:: @ 816C1C3 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 1, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1CF:: @ 816C1CF +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F:: @ 816C1CF multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 2, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1DB:: @ 816C1DB +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F:: @ 816C1DB multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 3, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1E7:: @ 816C1E7 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F:: @ 816C1E7 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 4, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1F3:: @ 816C1F3 +CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor:: @ 816C1F3 switch VAR_RESULT - case 0, EventScript_16C2E6 - case 1, EventScript_16C2BE - case 2, EventScript_16C296 - case 3, EventScript_16C26E - case 4, EventScript_16C246 - case 5, EventScript_16C30E - case 127, EventScript_16C30E + case 0, CeladonCity_DepartmentStore_Elevator_EventScript_To5F + case 1, CeladonCity_DepartmentStore_Elevator_EventScript_To4F + case 2, CeladonCity_DepartmentStore_Elevator_EventScript_To3F + case 3, CeladonCity_DepartmentStore_Elevator_EventScript_To2F + case 4, CeladonCity_DepartmentStore_Elevator_EventScript_To1F + case 5, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + case 127, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C246:: @ 816C246 +CeladonCity_DepartmentStore_Elevator_EventScript_To1F:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 4 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 4 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C26E:: @ 816C26E +CeladonCity_DepartmentStore_Elevator_EventScript_To2F:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 5 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 5 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C296:: @ 816C296 +CeladonCity_DepartmentStore_Elevator_EventScript_To3F:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 6 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 6 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C2BE:: @ 816C2BE +CeladonCity_DepartmentStore_Elevator_EventScript_To4F:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 7 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 7 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C2E6:: @ 816C2E6 +CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 8 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 8 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C30E:: @ 816C30E +CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E special Special_CloseElevatorCurrentFloorWindow releaseall end -EventScript_16C313:: @ 816C313 +CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313 special Special_CloseElevatorCurrentFloorWindow closemessage waitse diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 71eea9cee..17077ebbd 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C022", + "script": "CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16BCCD", + "script": "CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl", "flag": "0" } ], @@ -56,28 +56,28 @@ "x": 14, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C02B" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_FloorSign" }, { "type": "bg_event_type_0", "x": 10, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { "type": "bg_event_type_0", "x": 11, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { "type": "bg_event_type_0", "x": 12, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 48f682567..bd05d824d 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -1,152 +1,152 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC .byte 0 -CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD +CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer - call EventScript_16BCF6 + call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks compare VAR_TEMP_1, 0 - goto_if_eq EventScript_16C00E - goto EventScript_16BD3E + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink + goto CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink end -EventScript_16BCF6:: @ 816BCF6 +CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks:: @ 816BCF6 setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_16BD2C + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater checkitem ITEM_SODA_POP, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_16BD32 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop checkitem ITEM_LEMONADE, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_16BD38 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade return -EventScript_16BD2C:: @ 816BD2C +CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater:: @ 816BD2C addvar VAR_TEMP_1, 1 return -EventScript_16BD32:: @ 816BD32 +CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop:: @ 816BD32 addvar VAR_TEMP_1, 2 return -EventScript_16BD38:: @ 816BD38 +CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade:: @ 816BD38 addvar VAR_TEMP_1, 4 return -EventScript_16BD3E:: @ 816BD3E - msgbox gUnknown_8195D22, MSGBOX_YESNO +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink:: @ 816BD3E + msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C00C + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink textcolor 3 - message Text_195D5F + message CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink waitmessage textcolor 1 switch VAR_TEMP_1 - case 1, EventScript_16BDAE - case 2, EventScript_16BDDA - case 3, EventScript_16BE06 - case 4, EventScript_16BE3D - case 5, EventScript_16BE69 - case 6, EventScript_16BEA0 - case 7, EventScript_16BED7 + case 1, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater + case 2, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop + case 3, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop + case 4, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade + case 5, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade + case 6, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade + case 7, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks end -EventScript_16BDAE:: @ 816BDAE +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater:: @ 816BDAE multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BDDA:: @ 816BDDA +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop:: @ 816BDDA multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP, FALSE switch VAR_RESULT - case 0, EventScript_16BF3A - case 1, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BE06:: @ 816BE06 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop:: @ 816BE06 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16BF3A - case 2, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BE3D:: @ 816BE3D +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade:: @ 816BE3D multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF5B - case 1, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BE69:: @ 816BE69 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade:: @ 816BE69 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16BF5B - case 2, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BEA0:: @ 816BEA0 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade:: @ 816BEA0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF3A - case 1, EventScript_16BF5B - case 2, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BED7:: @ 816BED7 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks:: @ 816BED7 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16BF3A - case 2, EventScript_16BF5B - case 3, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 2, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 3, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BF19:: @ 816BF19 +CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 - goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018 - msgbox gUnknown_8195D75 - goto EventScript_16BF7C + goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll + msgbox CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis + goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -EventScript_16BF3A:: @ 816BF3A +CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 - goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018 - msgbox gUnknown_8195E33 - goto EventScript_16BF7C + goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll + msgbox CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis + goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -EventScript_16BF5B:: @ 816BF5B +CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 - goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018 - msgbox gUnknown_8195EBF - goto EventScript_16BF7C + goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll + msgbox CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis + goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -EventScript_16BF7C:: @ 816BF7C +CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C getitemname 0, VAR_0x8008 getitemname 1, VAR_0x8009 removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C002 + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward additem VAR_0x8009 textcolor 3 playfanfare MUS_FANFA1 @@ -156,142 +156,142 @@ EventScript_16BF7C:: @ 816BF7C putitemaway VAR_0x8009 call EventScript_1A6675 compare VAR_0x8008, ITEM_FRESH_WATER - call_if_eq EventScript_16BFDE + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16 compare VAR_0x8008, ITEM_SODA_POP - call_if_eq EventScript_16BFEA + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20 compare VAR_0x8008, ITEM_LEMONADE - call_if_eq EventScript_16BFF6 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33 release end -EventScript_16BFDE:: @ 816BFDE +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16:: @ 816BFDE setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL - msgbox gUnknown_8195DD4 + msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM16 return -EventScript_16BFEA:: @ 816BFEA +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20:: @ 816BFEA setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL - msgbox gUnknown_8195E68 + msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM20 return -EventScript_16BFF6:: @ 816BFF6 +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33:: @ 816BFF6 setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL - msgbox gUnknown_8195EF4 + msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM33 return -EventScript_16C002:: @ 816C002 - msgbox gUnknown_8195F4F +CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward:: @ 816C002 + msgbox CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis release end -EventScript_16C00C:: @ 816C00C +CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink:: @ 816C00C release end -EventScript_16C00E:: @ 816C00E - msgbox gUnknown_8195FEF +CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink:: @ 816C00E + msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink release end -EventScript_16C018:: @ 816C018 - msgbox gUnknown_8195F6E +CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll:: @ 816C018 + msgbox CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll release end -CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 - msgbox gUnknown_8195F98, MSGBOX_NPC +CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM:: @ 816C022 + msgbox CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature, MSGBOX_NPC end -CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B - msgbox gUnknown_8196017, MSGBOX_SIGN +CeladonCity_DepartmentStore_Roof_EventScript_FloorSign:: @ 816C02B + msgbox CeladonCity_DepartmentStore_Roof_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 +CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine:: @ 816C034 lockall - message Text_196038 + message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave waitmessage showmoneybox 0, 0, 0 - goto EventScript_16C045 + goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink end -EventScript_16C045:: @ 816C045 +CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink:: @ 816C045 multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE copyvar VAR_TEMP_1, VAR_RESULT switch VAR_TEMP_1 - case 0, EventScript_16C083 - case 1, EventScript_16C094 - case 2, EventScript_16C0A5 - msgbox gUnknown_81960AE - goto EventScript_16C14D + case 0, CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop + case 2, CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade + msgbox CeladonCity_DepartmentStore_Roof_Text_NotThirsty + goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -EventScript_16C083:: @ 816C083 +CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater:: @ 816C083 setvar VAR_TEMP_0, ITEM_FRESH_WATER checkmoney 200, 0 - goto EventScript_16C0CB + goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -EventScript_16C094:: @ 816C094 +CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop:: @ 816C094 setvar VAR_TEMP_0, ITEM_SODA_POP checkmoney 300, 0 - goto EventScript_16C0CB + goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -EventScript_16C0A5:: @ 816C0A5 +CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade:: @ 816C0A5 setvar VAR_TEMP_0, ITEM_LEMONADE checkmoney 350, 0 - goto EventScript_16C0CB + goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -EventScript_16C0B6:: @ 816C0B6 +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater:: @ 816C0B6 removemoney 200, 0 return -EventScript_16C0BD:: @ 816C0BD +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop:: @ 816C0BD removemoney 300, 0 return -EventScript_16C0C4:: @ 816C0C4 +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade:: @ 816C0C4 removemoney 350, 0 return -EventScript_16C0CB:: @ 816C0CB +CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C131 + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C13F + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink compare VAR_TEMP_1, 0 - call_if_eq EventScript_16C0B6 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater compare VAR_TEMP_1, 1 - call_if_eq EventScript_16C0BD + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop compare VAR_TEMP_1, 2 - call_if_eq EventScript_16C0C4 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0, 0 getitemname 0, VAR_TEMP_0 playse SE_JIHANKI - msgbox gUnknown_8196076 + msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut additem VAR_TEMP_0 - goto EventScript_16C125 + goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink end -EventScript_16C125:: @ 816C125 - message Text_196038 +CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink:: @ 816C125 + message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave waitmessage - goto EventScript_16C045 + goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink end -EventScript_16C131:: @ 816C131 - msgbox gUnknown_819605E - goto EventScript_16C14D +CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney:: @ 816C131 + msgbox CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney + goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -EventScript_16C13F:: @ 816C13F - msgbox gUnknown_819608E - goto EventScript_16C14D +CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink:: @ 816C13F + msgbox CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff + goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -EventScript_16C14D:: @ 816C14D +CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine:: @ 816C14D hidemoneybox 0, 0 releaseall end diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc index 65b9a3162..2c6944373 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc @@ -1,12 +1,12 @@ -gUnknown_8195D22:: @ 8195D22 +CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: @ 8195D22 .string "I'm thirsty!\n" .string "I want something to drink!\p" .string "{SIZE}ÁGive her a drink?$" -Text_195D5F:: @ 8195D5F +CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: @ 8195D5F .string "Give her which drink?$" -gUnknown_8195D75:: @ 8195D75 +CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis:: @ 8195D75 .string "Yay!\p" .string "FRESH WATER!\p" .string "Thank you!\n" @@ -16,67 +16,67 @@ Text_ReceivedItemFromLittleGirl:: @ 8195DAD .string "{PLAYER} received a {STR_VAR_2}\n" .string "from the little girl.$" -gUnknown_8195DD4:: @ 8195DD4 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM16:: @ 8195DD4 .string "TM16 contains LIGHT SCREEN.\p" .string "It's a move that weakens the power\n" .string "of special attacks by your foe.$" -gUnknown_8195E33:: @ 8195E33 +CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis:: @ 8195E33 .string "Yay!\p" .string "SODA POP!\p" .string "Thank you!\n" .string "You can have this from me!$" -gUnknown_8195E68:: @ 8195E68 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM20:: @ 8195E68 .string "TM20 contains SAFEGUARD.\p" .string "It's a move that prevents status\n" .string "problems among your POKéMON.$" -gUnknown_8195EBF:: @ 8195EBF +CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis:: @ 8195EBF .string "Yay!\p" .string "LEMONADE!\p" .string "Thank you!\n" .string "You can have this from me!$" -gUnknown_8195EF4:: @ 8195EF4 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM33:: @ 8195EF4 .string "TM33 contains REFLECT.\p" .string "It's a move that weakens the power\n" .string "of physical attacks by your foe.$" -gUnknown_8195F4F:: @ 8195F4F +CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis:: @ 8195F4F .string "You don't have space for this!$" -gUnknown_8195F6E:: @ 8195F6E +CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll:: @ 8195F6E .string "No, thank you!\n" .string "I'm not thirsty after all!$" -gUnknown_8195F98:: @ 8195F98 +CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature:: @ 8195F98 .string "My sister is a TRAINER, believe it\n" .string "or not.\p" .string "But, she's so immature, she drives\n" .string "me nuts!$" -gUnknown_8195FEF:: @ 8195FEF +CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink:: @ 8195FEF .string "I'm thirsty!\n" .string "I want something to drink!$" -gUnknown_8196017:: @ 8196017 +CeladonCity_DepartmentStore_Roof_Text_FloorSign:: @ 8196017 .string "ROOFTOP SQUARE:\n" .string "VENDING MACHINES$" -Text_196038:: @ 8196038 +CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave:: @ 8196038 .string "A vending machine!\n" .string "What does it have?$" -gUnknown_819605E:: @ 819605E +CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney:: @ 819605E .string "Oops, not enough money!$" -gUnknown_8196076:: @ 8196076 +CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut:: @ 8196076 .string "A can of {STR_VAR_1} popped out!$" -gUnknown_819608E:: @ 819608E +CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff:: @ 819608E .string "There's no more room for stuff!$" -gUnknown_81960AE:: @ 81960AE +CeladonCity_DepartmentStore_Roof_Text_NotThirsty:: @ 81960AE .string "Not thirsty!$" diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 081d3fac9..79ba87c7f 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C684", + "script": "CeladonCity_GameCorner_EventScript_InfoClerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C68D", + "script": "CeladonCity_GameCorner_EventScript_CoinsClerk", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C7BA", + "script": "CeladonCity_GameCorner_EventScript_BaldingMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C7D7", + "script": "CeladonCity_GameCorner_EventScript_Woman1", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C7E7", + "script": "CeladonCity_GameCorner_EventScript_Fisher", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C857", + "script": "CeladonCity_GameCorner_EventScript_GymGuy", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C87E", + "script": "CeladonCity_GameCorner_EventScript_Woman2", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C88E", + "script": "CeladonCity_GameCorner_EventScript_OldMan", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C89E", + "script": "CeladonCity_GameCorner_EventScript_Scientist", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C8FE", + "script": "CeladonCity_GameCorner_EventScript_Gentleman", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16CAF5", + "script": "CeladonCity_GameCorner_EventScript_RocketGrunt", "flag": "FLAG_HIDE_GAME_CORNER_ROCKET" } ], @@ -314,168 +314,168 @@ "x": 0, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C95E" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine0" }, { "type": "bg_event_type_4", "x": 0, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9A4" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine1" }, { "type": "bg_event_type_4", "x": 0, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9B0" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine2" }, { "type": "bg_event_type_3", "x": 5, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9BC" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine3" }, { "type": "bg_event_type_3", "x": 5, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CB5A" + "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine1" }, { "type": "bg_event_type_3", "x": 5, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9D4" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine5" }, { "type": "bg_event_type_3", "x": 5, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9E0" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine6" }, { "type": "bg_event_type_4", "x": 6, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9EC" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine7" }, { "type": "bg_event_type_4", "x": 6, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9F8" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine8" }, { "type": "bg_event_type_4", "x": 6, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA04" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine9" }, { "type": "bg_event_type_3", "x": 11, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA10" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine10" }, { "type": "bg_event_type_3", "x": 11, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA1C" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine11" }, { "type": "bg_event_type_3", "x": 11, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA28" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine12" }, { "type": "bg_event_type_3", "x": 11, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA34" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine13" }, { "type": "bg_event_type_4", "x": 12, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA40" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine14" }, { "type": "bg_event_type_4", "x": 12, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CB63" + "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine2" }, { "type": "bg_event_type_4", "x": 12, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA58" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine16" }, { "type": "bg_event_type_4", "x": 12, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA64" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine17" }, { "type": "bg_event_type_3", "x": 17, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CB6C" + "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine3" }, { "type": "bg_event_type_3", "x": 17, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA7C" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine19" }, { "type": "bg_event_type_3", "x": 17, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA88" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine20" }, { "type": "bg_event_type_3", "x": 17, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA94" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine21" }, { "type": "bg_event_type_0", "x": 11, "y": 1, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CAAA" + "script": "CeladonCity_GameCorner_EventScript_Poster" }, { "type": "bg_event_type_3", "x": 17, "y": 13, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_1B2867" + "script": "CeladonCity_GameCorner_EventScript_PhotoPrinter" } ] } diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 20b2ba04c..c206f38b4 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -3,443 +3,443 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 .byte 0 CeladonCity_GameCorner_OnLoad:: @ 816C64C - call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656 + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_HideRocketHideout end -EventScript_16C656:: @ 816C656 - setmetatile 15, 2, 658, 0 - setmetatile 16, 2, 658, 0 - setmetatile 17, 2, 658, 0 - setmetatile 16, 3, 719, 1 - setmetatile 17, 3, 719, 1 +CeladonCity_GameCorner_EventScript_HideRocketHideout:: @ 816C656 + setmetatile 15, 2, METATILE_GameCorner_Floor_ShadeFull, 0 + setmetatile 16, 2, METATILE_GameCorner_Floor_ShadeFull, 0 + setmetatile 17, 2, METATILE_GameCorner_Floor_ShadeFull, 0 + setmetatile 16, 3, METATILE_GameCorner_PurpleWall_Floor, 1 + setmetatile 17, 3, METATILE_GameCorner_PurpleWall_Floor, 1 return -CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 - msgbox gUnknown_8196940, MSGBOX_NPC +CeladonCity_GameCorner_EventScript_InfoClerk:: @ 816C684 + msgbox CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor, MSGBOX_NPC end -CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D +CeladonCity_GameCorner_EventScript_CoinsClerk:: @ 816C68D goto_if_questlog EventScript_ReleaseEnd lock faceplayer showmoneybox 0, 0, 0 showcoinsbox 0, 5 - message Text_196984 + message CeladonCity_GameCorner_Text_WelcomeBuySomeCoins waitmessage multichoice 13, 0, MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER, FALSE copyvar VAR_0x8009, VAR_RESULT switch VAR_RESULT - case 0, EventScript_16C6E6 - case 1, EventScript_16C6E6 - case 2, EventScript_16C782 - case 127, EventScript_16C782 + case 0, CeladonCity_GameCorner_EventScript_BuyCoins + case 1, CeladonCity_GameCorner_EventScript_BuyCoins + case 2, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy + case 127, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy end -EventScript_16C6E6:: @ 816C6E6 - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790 +CeladonCity_GameCorner_EventScript_BuyCoins:: @ 816C6E6 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_ClerkNoCoinCase compare VAR_0x8009, 0 - goto_if_eq EventScript_16C734 + goto_if_eq CeladonCity_GameCorner_EventScript_Buy50Coins compare VAR_0x8009, 1 - goto_if_eq EventScript_16C706 + goto_if_eq CeladonCity_GameCorner_EventScript_Buy500Coins end -EventScript_16C706:: @ 816C706 +CeladonCity_GameCorner_EventScript_Buy500Coins:: @ 816C706 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9500 - goto_if_ge EventScript_16C79E + compare VAR_TEMP_1, (MAX_COINS + 1) - 500 + goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins checkmoney 10000, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C7AC + goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney addcoins 500 removemoney 10000, 0 - goto EventScript_16C762 + goto CeladonCity_GameCorner_EventScript_BoughtCoins end -EventScript_16C734:: @ 816C734 +CeladonCity_GameCorner_EventScript_Buy50Coins:: @ 816C734 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9950 - goto_if_ge EventScript_16C79E + compare VAR_TEMP_1, (MAX_COINS + 1) - 50 + goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins checkmoney 1000, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C7AC + goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney addcoins 50 removemoney 1000, 0 - goto EventScript_16C762 + goto CeladonCity_GameCorner_EventScript_BoughtCoins end -EventScript_16C762:: @ 816C762 +CeladonCity_GameCorner_EventScript_BoughtCoins:: @ 816C762 updatemoneybox 0, 0, 0 updatecoinsbox 0, 5 playse SE_SHOP - msgbox gUnknown_8196A62 - goto EventScript_16C77A + msgbox CeladonCity_GameCorner_Text_HereAreYourCoins + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C77A:: @ 816C77A +CeladonCity_GameCorner_EventScript_ClerkEnd:: @ 816C77A hidemoneybox 0, 0 hidecoinsbox 0, 5 release end -EventScript_16C782:: @ 816C782 - msgbox gUnknown_81969DC - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkDeclineBuy:: @ 816C782 + msgbox CeladonCity_GameCorner_Text_ComePlaySometime + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C790:: @ 816C790 - msgbox gUnknown_81969FB - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkNoCoinCase:: @ 816C790 + msgbox CeladonCity_GameCorner_Text_SorryDontHaveCoinCase + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C79E:: @ 816C79E - msgbox gUnknown_8196A26 - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins:: @ 816C79E + msgbox CeladonCity_GameCorner_Text_CoinCaseIsFull + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C7AC:: @ 816C7AC - msgbox gUnknown_8196A46 - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney:: @ 816C7AC + msgbox CeladonCity_GameCorner_Text_CantAffordCoins + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA +CeladonCity_GameCorner_EventScript_BaldingMan:: @ 816C7BA lock faceplayer - msgbox gUnknown_8196A82 - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C7CA:: @ 816C7CA +CeladonCity_GameCorner_EventScript_FaceSlotMachine:: @ 816C7CA closemessage applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection waitmovement 0 release end -CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 +CeladonCity_GameCorner_EventScript_Woman1:: @ 816C7D7 lock faceplayer - msgbox gUnknown_8196AC7 - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 +CeladonCity_GameCorner_EventScript_Fisher:: @ 816C7E7 lock faceplayer - goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849 - msgbox gUnknown_8196AF3 - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins + msgbox CeladonCity_GameCorner_Text_DoYouWantToPlay + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9990 - goto_if_ge EventScript_16C82B + compare VAR_TEMP_1, (MAX_COINS + 1) - 10 + goto_if_ge CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins addcoins 10 textcolor 3 - msgbox gUnknown_8196B0D + msgbox CeladonCity_GameCorner_Text_Received10CoinsFromMan playse SE_SHOP waitse setflag FLAG_GOT_10_COINS_FROM_GAMBLER - goto EventScript_16C7CA + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C82B:: @ 816C82B - msgbox gUnknown_8196B30 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins:: @ 816C82B + msgbox CeladonCity_GameCorner_Text_DontNeedMyCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C839:: @ 816C839 +CeladonCity_GameCorner_EventScript_GamblerNoCoinCase:: @ 816C839 textcolor 3 - msgbox gUnknown_8196F26 - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_DontHaveCoinCase + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C849:: @ 816C849 - msgbox gUnknown_8196B49 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins:: @ 816C849 + msgbox CeladonCity_GameCorner_Text_WinsComeAndGo + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 +CeladonCity_GameCorner_EventScript_GymGuy:: @ 816C857 lock faceplayer - goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870 - msgbox gUnknown_8196BAD - goto EventScript_16C7CA + goto_if_set FLAG_DEFEATED_ERIKA, CeladonCity_GameCorner_EventScript_GymGuyPostVictory + msgbox CeladonCity_GameCorner_Text_GymGuyAdvice + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C870:: @ 816C870 - msgbox gUnknown_8196CA1 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_GymGuyPostVictory:: @ 816C870 + msgbox CeladonCity_GameCorner_Text_RareMonsForCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C87E:: @ 816C87E +CeladonCity_GameCorner_EventScript_Woman2:: @ 816C87E lock faceplayer - msgbox gUnknown_8196B7B - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E +CeladonCity_GameCorner_EventScript_OldMan:: @ 816C88E lock faceplayer - msgbox gUnknown_8196CFE - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_SoEasyToGetHooked + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E +CeladonCity_GameCorner_EventScript_Scientist:: @ 816C89E lock faceplayer - goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0 - msgbox gUnknown_8196D2B - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins + msgbox CeladonCity_GameCorner_Text_WantSomeCoins + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9980 - goto_if_ge EventScript_16C8E2 + compare VAR_TEMP_1, (MAX_COINS + 1) - 20 + goto_if_ge CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins addcoins 20 textcolor 3 - msgbox gUnknown_8196D47 + msgbox CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy playse SE_SHOP waitse setflag FLAG_GOT_20_COINS_FROM_GAMBLER - goto EventScript_16C7CA + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C8E2:: @ 816C8E2 - msgbox gUnknown_8196D6F - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins:: @ 816C8E2 + msgbox CeladonCity_GameCorner_Text_YouHaveLotsOfCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C8F0:: @ 816C8F0 - msgbox gUnknown_8196D87 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins:: @ 816C8F0 + msgbox CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE +CeladonCity_GameCorner_EventScript_Gentleman:: @ 816C8FE lock faceplayer - goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950 - msgbox gUnknown_8196DB7 - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins + msgbox CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9980 - goto_if_ge EventScript_16C942 + compare VAR_TEMP_1, (MAX_COINS + 1) - 20 + goto_if_ge CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins addcoins 20 textcolor 3 - msgbox gUnknown_8196DF8 + msgbox CeladonCity_GameCorner_Text_Received20CoinsFromMan playse SE_SHOP waitse setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 - goto EventScript_16C7CA + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C942:: @ 816C942 - msgbox gUnknown_8196E1B - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins:: @ 816C942 + msgbox CeladonCity_GameCorner_Text_YouveGotPlentyCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C950:: @ 816C950 - msgbox gUnknown_8196E40 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins:: @ 816C950 + msgbox CeladonCity_GameCorner_Text_WatchReelsClosely + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C95E:: @ 816C95E +CeladonCity_GameCorner_EventScript_SlotMachine0:: @ 816C95E lockall setvar VAR_0x8004, 0 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16C96A:: @ 816C96A +CeladonCity_GameCorner_EventScript_DontPlaySlotMachine:: @ 816C96A releaseall end -EventScript_16C96C:: @ 816C96C - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0 - msgbox gUnknown_8196F46, MSGBOX_YESNO +CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase + msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C96A + goto_if_eq CeladonCity_GameCorner_EventScript_DontPlaySlotMachine setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 - dofieldeffect 64 - waitfieldeffect 64 + dofieldeffect FLDEFF_UNK_40 + waitfieldeffect FLDEFF_UNK_40 @ Smile icon? specialvar VAR_RESULT, Special_GetRandomSlotMachine playslotmachine VAR_RESULT releaseall end -CeladonCity_GameCorner_EventScript_16C9A4:: @ 816C9A4 +CeladonCity_GameCorner_EventScript_SlotMachine1:: @ 816C9A4 lockall setvar VAR_0x8004, 1 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9B0:: @ 816C9B0 +CeladonCity_GameCorner_EventScript_SlotMachine2:: @ 816C9B0 lockall setvar VAR_0x8004, 2 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9BC:: @ 816C9BC +CeladonCity_GameCorner_EventScript_SlotMachine3:: @ 816C9BC lockall setvar VAR_0x8004, 3 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16C9C8:: @ 816C9C8 +CeladonCity_GameCorner_EventScript_SlotMachine4:: @ 816C9C8 lockall setvar VAR_0x8004, 4 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9D4:: @ 816C9D4 +CeladonCity_GameCorner_EventScript_SlotMachine5:: @ 816C9D4 lockall setvar VAR_0x8004, 5 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9E0:: @ 816C9E0 +CeladonCity_GameCorner_EventScript_SlotMachine6:: @ 816C9E0 lockall setvar VAR_0x8004, 6 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9EC:: @ 816C9EC +CeladonCity_GameCorner_EventScript_SlotMachine7:: @ 816C9EC lockall setvar VAR_0x8004, 7 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9F8:: @ 816C9F8 +CeladonCity_GameCorner_EventScript_SlotMachine8:: @ 816C9F8 lockall setvar VAR_0x8004, 8 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA04:: @ 816CA04 +CeladonCity_GameCorner_EventScript_SlotMachine9:: @ 816CA04 lockall setvar VAR_0x8004, 9 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA10:: @ 816CA10 +CeladonCity_GameCorner_EventScript_SlotMachine10:: @ 816CA10 lockall setvar VAR_0x8004, 10 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA1C:: @ 816CA1C +CeladonCity_GameCorner_EventScript_SlotMachine11:: @ 816CA1C lockall setvar VAR_0x8004, 11 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA28:: @ 816CA28 +CeladonCity_GameCorner_EventScript_SlotMachine12:: @ 816CA28 lockall setvar VAR_0x8004, 12 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA34:: @ 816CA34 +CeladonCity_GameCorner_EventScript_SlotMachine13:: @ 816CA34 lockall setvar VAR_0x8004, 13 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA40:: @ 816CA40 +CeladonCity_GameCorner_EventScript_SlotMachine14:: @ 816CA40 lockall setvar VAR_0x8004, 14 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16CA4C:: @ 816CA4C +CeladonCity_GameCorner_EventScript_SlotMachine15:: @ 816CA4C lockall setvar VAR_0x8004, 15 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA58:: @ 816CA58 +CeladonCity_GameCorner_EventScript_SlotMachine16:: @ 816CA58 lockall setvar VAR_0x8004, 16 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA64:: @ 816CA64 +CeladonCity_GameCorner_EventScript_SlotMachine17:: @ 816CA64 lockall setvar VAR_0x8004, 17 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16CA70:: @ 816CA70 +CeladonCity_GameCorner_EventScript_SlotMachine18:: @ 816CA70 lockall setvar VAR_0x8004, 18 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA7C:: @ 816CA7C +CeladonCity_GameCorner_EventScript_SlotMachine19:: @ 816CA7C lockall setvar VAR_0x8004, 19 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA88:: @ 816CA88 +CeladonCity_GameCorner_EventScript_SlotMachine20:: @ 816CA88 lockall setvar VAR_0x8004, 20 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA94:: @ 816CA94 +CeladonCity_GameCorner_EventScript_SlotMachine21:: @ 816CA94 lockall setvar VAR_0x8004, 21 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16CAA0:: @ 816CAA0 - msgbox gUnknown_8196F0D +CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase:: @ 816CAA0 + msgbox CeladonCity_GameCorner_Text_CoinCaseIsRequired releaseall end -CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA +CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA lockall - msgbox gUnknown_8196EDC - call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE + msgbox CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_OpenRocketHideout releaseall end -EventScript_16CABE:: @ 816CABE +CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE playse SE_KI_GASYAN - setmetatile 15, 2, 669, 0 - setmetatile 16, 2, 670, 1 - setmetatile 17, 2, 671, 1 - setmetatile 16, 3, 678, 1 - setmetatile 17, 3, 679, 1 + setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0 + setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1 + setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1 + setmetatile 16, 3, METATILE_GameCorner_PurpleWall_StairsTop, 1 + setmetatile 17, 3, METATILE_GameCorner_PurpleWall_stairsBottom, 1 special DrawWholeMapView setflag FLAG_OPENED_ROCKET_HIDEOUT return -CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10 - msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE +CeladonCity_GameCorner_EventScript_RocketGrunt:: @ 816CAF5 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, CeladonCity_GameCorner_Text_GruntIntro, CeladonCity_GameCorner_Text_GruntDefeat, CeladonCity_GameCorner_Text_DefeatedGrunt + msgbox CeladonCity_GameCorner_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16CB10:: @ 816CB10 - msgbox gUnknown_8196E9B +CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10 + msgbox CeladonCity_GameCorner_Text_GruntPostBattle closemessage compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16CB34 + call_if_eq CeladonCity_GameCorner_Text_GruntExitWest compare VAR_FACING, DIR_WEST - call_if_ne EventScript_16CB3F + call_if_ne CeladonCity_GameCorner_Text_GruntExit removeobject 11 release end -EventScript_16CB34:: @ 816CB34 - applymovement 11, Movement_16CB4A +CeladonCity_GameCorner_Text_GruntExitWest:: @ 816CB34 + applymovement 11, CeladonCity_GameCorner_Movement_GruntExitWest waitmovement 0 return -EventScript_16CB3F:: @ 816CB3F - applymovement 11, Movement_16CB53 +CeladonCity_GameCorner_Text_GruntExit:: @ 816CB3F + applymovement 11, CeladonCity_GameCorner_Movement_GruntExit waitmovement 0 return -Movement_16CB4A:: @ 816CB4A +CeladonCity_GameCorner_Movement_GruntExitWest:: @ 816CB4A walk_down walk_right walk_right @@ -450,7 +450,7 @@ Movement_16CB4A:: @ 816CB4A walk_right step_end -Movement_16CB53:: @ 816CB53 +CeladonCity_GameCorner_Movement_GruntExit:: @ 816CB53 walk_right walk_right walk_right @@ -459,14 +459,14 @@ Movement_16CB53:: @ 816CB53 walk_right step_end -CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A - msgbox gUnknown_8196F64, MSGBOX_SIGN +CeladonCity_GameCorner_EventScript_UnusableSlotMachine1:: @ 816CB5A + msgbox CeladonCity_GameCorner_Text_OutOfOrder, MSGBOX_SIGN end -CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 - msgbox gUnknown_8196F81, MSGBOX_SIGN +CeladonCity_GameCorner_EventScript_UnusableSlotMachine2:: @ 816CB63 + msgbox CeladonCity_GameCorner_Text_OutToLunch, MSGBOX_SIGN end -CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C - msgbox gUnknown_8196FA0, MSGBOX_SIGN +CeladonCity_GameCorner_EventScript_UnusableSlotMachine3:: @ 816CB6C + msgbox CeladonCity_GameCorner_Text_SomeonesKeys, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_GameCorner/text.inc b/data/maps/CeladonCity_GameCorner/text.inc index a388a736f..6813330ab 100644 --- a/data/maps/CeladonCity_GameCorner/text.inc +++ b/data/maps/CeladonCity_GameCorner/text.inc @@ -1,60 +1,60 @@ -gUnknown_8196940:: @ 8196940 +CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor:: @ 8196940 .string "Welcome!\p" .string "You can exchange your COINS for\n" .string "fabulous prizes next door.$" -Text_196984:: @ 8196984 +CeladonCity_GameCorner_Text_WelcomeBuySomeCoins:: @ 8196984 .string "Welcome to ROCKET GAME CORNER!\p" .string "Do you need some game COINS?\n" .string "Would you like to buy some?$" -gUnknown_81969DC:: @ 81969DC +CeladonCity_GameCorner_Text_ComePlaySometime:: @ 81969DC .string "No?\n" .string "Please come play sometime!$" -gUnknown_81969FB:: @ 81969FB +CeladonCity_GameCorner_Text_SorryDontHaveCoinCase:: @ 81969FB .string "Oh, I'm sorry.\n" .string "You don't have a COIN CASE.$" -gUnknown_8196A26:: @ 8196A26 +CeladonCity_GameCorner_Text_CoinCaseIsFull:: @ 8196A26 .string "Whoops!\n" .string "Your COIN CASE is full.$" -gUnknown_8196A46:: @ 8196A46 +CeladonCity_GameCorner_Text_CantAffordCoins:: @ 8196A46 .string "You can't afford the COINS.$" -gUnknown_8196A62:: @ 8196A62 +CeladonCity_GameCorner_Text_HereAreYourCoins:: @ 8196A62 .string "Thank you.\n" .string "Here are your COINS!$" -gUnknown_8196A82:: @ 8196A82 +CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace:: @ 8196A82 .string "Keep this quiet.\p" .string "It's rumored that this place is run\n" .string "by TEAM ROCKET.$" -gUnknown_8196AC7:: @ 8196AC7 +CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds:: @ 8196AC7 .string "I think these machines have\n" .string "different odds.$" -gUnknown_8196AF3:: @ 8196AF3 +CeladonCity_GameCorner_Text_DoYouWantToPlay:: @ 8196AF3 .string "Kid, do you want to play?$" -gUnknown_8196B0D:: @ 8196B0D +CeladonCity_GameCorner_Text_Received10CoinsFromMan:: @ 8196B0D .string "{PLAYER} received 10 COINS\n" .string "from the man.$" -gUnknown_8196B30:: @ 8196B30 +CeladonCity_GameCorner_Text_DontNeedMyCoins:: @ 8196B30 .string "You don't need my COINS!$" -gUnknown_8196B49:: @ 8196B49 +CeladonCity_GameCorner_Text_WinsComeAndGo:: @ 8196B49 .string "Wins seem to come and go.\n" .string "Nothing's a sure thing.$" -gUnknown_8196B7B:: @ 8196B7B +CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck:: @ 8196B7B .string "These slot games…\n" .string "Win or lose, it's only by luck.$" -gUnknown_8196BAD:: @ 8196BAD +CeladonCity_GameCorner_Text_GymGuyAdvice:: @ 8196BAD .string "Hey!\p" .string "You have better things to do,\n" .string "champ in the making!\p" @@ -66,83 +66,83 @@ gUnknown_8196BAD:: @ 8196BAD .string "But she's not one to be taken\n" .string "lightly!$" -gUnknown_8196CA1:: @ 8196CA1 +CeladonCity_GameCorner_Text_RareMonsForCoins:: @ 8196CA1 .string "They offer rare POKéMON that can\n" .string "be exchanged for your COINS.\p" .string "But, I just can't seem to win!$" -gUnknown_8196CFE:: @ 8196CFE +CeladonCity_GameCorner_Text_SoEasyToGetHooked:: @ 8196CFE .string "Games are scary!\n" .string "It's so easy to get hooked!$" -gUnknown_8196D2B:: @ 8196D2B +CeladonCity_GameCorner_Text_WantSomeCoins:: @ 8196D2B .string "What's up?\n" .string "Want some COINS?$" -gUnknown_8196D47:: @ 8196D47 +CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy:: @ 8196D47 .string "{PLAYER} received 20 COINS\n" .string "from the nice guy.$" -gUnknown_8196D6F:: @ 8196D6F +CeladonCity_GameCorner_Text_YouHaveLotsOfCoins:: @ 8196D6F .string "You have lots of COINS!$" -gUnknown_8196D87:: @ 8196D87 +CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant:: @ 8196D87 .string "Darn! I need more COINS for the\n" .string "POKéMON I want!$" -gUnknown_8196DB7:: @ 8196DB7 +CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo:: @ 8196DB7 .string "Hey, what? You're throwing me off!\n" .string "Here are some COINS, so shoo!$" -gUnknown_8196DF8:: @ 8196DF8 +CeladonCity_GameCorner_Text_Received20CoinsFromMan:: @ 8196DF8 .string "{PLAYER} received 20 COINS\n" .string "from the man.$" -gUnknown_8196E1B:: @ 8196E1B +CeladonCity_GameCorner_Text_YouveGotPlentyCoins:: @ 8196E1B .string "You've got plenty of your own\n" .string "COINS!$" -gUnknown_8196E40:: @ 8196E40 +CeladonCity_GameCorner_Text_WatchReelsClosely:: @ 8196E40 .string "The trick is to watch the reels\n" .string "closely.$" -Text_196E69:: @ 8196E69 +CeladonCity_GameCorner_Text_GruntIntro:: @ 8196E69 .string "I'm guarding this poster!\n" .string "Go away, or else!$" -Text_196E95:: @ 8196E95 +CeladonCity_GameCorner_Text_GruntDefeat:: @ 8196E95 .string "Dang!$" -gUnknown_8196E9B:: @ 8196E9B +CeladonCity_GameCorner_Text_GruntPostBattle:: @ 8196E9B .string "The TEAM ROCKET HIDEOUT might\n" .string "be discovered!\p" .string "I better tell BOSS!$" -gUnknown_8196EDC:: @ 8196EDC +CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt:: @ 8196EDC .string "Hey!\p" .string "A switch behind the poster!?\n" .string "Let's push it!$" -gUnknown_8196F0D:: @ 8196F0D +CeladonCity_GameCorner_Text_CoinCaseIsRequired:: @ 8196F0D .string "A COIN CASE is required…$" -gUnknown_8196F26:: @ 8196F26 +CeladonCity_GameCorner_Text_DontHaveCoinCase:: @ 8196F26 .string "Oops!\n" .string "Don't have the COIN CASE!$" -gUnknown_8196F46:: @ 8196F46 +CeladonCity_GameCorner_Text_SlotMachineWantToPlay:: @ 8196F46 .string "A slot machine!\n" .string "Want to play?$" -gUnknown_8196F64:: @ 8196F64 +CeladonCity_GameCorner_Text_OutOfOrder:: @ 8196F64 .string "OUT OF ORDER\n" .string "This is broken.$" -gUnknown_8196F81:: @ 8196F81 +CeladonCity_GameCorner_Text_OutToLunch:: @ 8196F81 .string "OUT TO LUNCH\n" .string "This is reserved.$" -gUnknown_8196FA0:: @ 8196FA0 +CeladonCity_GameCorner_Text_SomeonesKeys:: @ 8196FA0 .string "Someone's keys!\n" .string "They'll be back.$" diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index c873cd0bb..99a1a54d4 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems", "flag": "0" } ], diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 329f829d3..ca8119594 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -1,44 +1,44 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 .byte 0 -CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 - msgbox gUnknown_8196FC1, MSGBOX_NPC +CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan:: @ 816CB76 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon, MSGBOX_NPC end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F - msgbox gUnknown_8196FFF, MSGBOX_NPC +CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan:: @ 816CB7F + msgbox CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday, MSGBOX_NPC end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons:: @ 816CB88 lock faceplayer - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 - msgbox gUnknown_8197057 - goto EventScript_16CBB2 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon end -EventScript_16CBB2:: @ 816CBB2 - message Text_19707A +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon:: @ 816CBB2 + message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 11, 0, MULTICHOICE_GAME_CORNER_POKEMON_PRIZES, FALSE switch VAR_RESULT - case 0, EventScript_16CC15 - case 1, EventScript_16CC25 - case 2, EventScript_16CC35 - case 3, EventScript_16CC45 - case 4, EventScript_16CC55 - case 5, EventScript_16CC10 - case 127, EventScript_16CC10 + case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_Abra + case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy + case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir + case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini + case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon + case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CC10:: @ 816CC10 +CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange:: @ 816CC10 hidecoinsbox 0, 0 release end -EventScript_16CC15:: @ 816CC15 +CeladonCity_GameCorner_PrizeRoom_EventScript_Abra:: @ 816CC15 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_ABRA setvar VAR_TEMP_2, 180 @@ -48,10 +48,10 @@ EventScript_16CC15:: @ 816CC15 setvar VAR_TEMP_2, 120 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC25:: @ 816CC25 +CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy:: @ 816CC25 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_CLEFAIRY setvar VAR_TEMP_2, 500 @@ -61,10 +61,10 @@ EventScript_16CC25:: @ 816CC25 setvar VAR_TEMP_2, 750 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC35:: @ 816CC35 +CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir:: @ 816CC35 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_DRATINI setvar VAR_TEMP_2, 2800 @@ -74,10 +74,10 @@ EventScript_16CC35:: @ 816CC35 setvar VAR_TEMP_2, 2500 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC45:: @ 816CC45 +CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini:: @ 816CC45 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_SCYTHER setvar VAR_TEMP_2, 5500 @@ -87,10 +87,10 @@ EventScript_16CC45:: @ 816CC45 setvar VAR_TEMP_2, 4600 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC55:: @ 816CC55 +CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon:: @ 816CC55 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_PORYGON setvar VAR_TEMP_2, 9999 @@ -100,28 +100,28 @@ EventScript_16CC55:: @ 816CC55 setvar VAR_TEMP_2, 6500 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC65:: @ 816CC65 +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon:: @ 816CC65 getspeciesname 0, VAR_TEMP_1 - msgbox gUnknown_819709D, MSGBOX_YESNO + msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CC10 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if_lt EventScript_16CDA5 + goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins textcolor 3 switch VAR_TEMP_1 - case SPECIES_ABRA, EventScript_16CCD4 - case SPECIES_CLEFAIRY, EventScript_16CCE9 - case SPECIES_DRATINI, EventScript_16CCFE - case SPECIES_SCYTHER, EventScript_16CD13 - case SPECIES_PORYGON, EventScript_16CD28 - case SPECIES_PINSIR, EventScript_16CD3D + case SPECIES_ABRA, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra + case SPECIES_CLEFAIRY, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy + case SPECIES_DRATINI, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini + case SPECIES_SCYTHER, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther + case SPECIES_PORYGON, CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon + case SPECIES_PINSIR, CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir end -EventScript_16CCD4:: @ 816CCD4 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: @ 816CCD4 .ifdef FIRERED givemon VAR_TEMP_1, 9, ITEM_NONE .else @@ -129,10 +129,10 @@ EventScript_16CCD4:: @ 816CCD4 givemon VAR_TEMP_1, 7, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CCE9:: @ 816CCE9 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: @ 816CCE9 .ifdef FIRERED givemon VAR_TEMP_1, 8, ITEM_NONE .else @@ -140,10 +140,10 @@ EventScript_16CCE9:: @ 816CCE9 givemon VAR_TEMP_1, 12, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CCFE:: @ 816CCFE +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini:: @ 816CCFE .ifdef FIRERED givemon VAR_TEMP_1, 18, ITEM_NONE .else @@ -151,15 +151,15 @@ EventScript_16CCFE:: @ 816CCFE givemon VAR_TEMP_1, 24, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD13:: @ 816CD13 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther:: @ 816CD13 givemon VAR_TEMP_1, 25, ITEM_NONE - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD28:: @ 816CD28 +CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon:: @ 816CD28 .ifdef FIRERED givemon VAR_TEMP_1, 26, ITEM_NONE .else @@ -167,50 +167,50 @@ EventScript_16CD28:: @ 816CD28 givemon VAR_TEMP_1, 18, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD3D:: @ 816CD3D +CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir:: @ 816CD3D givemon VAR_TEMP_1, 18, ITEM_NONE - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD52:: @ 816CD52 +CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon:: @ 816CD52 compare VAR_RESULT, 0 - goto_if_eq EventScript_16CDB3 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16CDE0 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC compare VAR_RESULT, 2 - goto_if_eq EventScript_16CD74 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull end -EventScript_16CD74:: @ 816CD74 +CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull:: @ 816CD74 textcolor 3 msgbox Text_NoMoreRoomForPokemon hidecoinsbox 0, 0 release end -EventScript_16CD83:: @ 816CD83 +CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon:: @ 816CD83 getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT call EventScript_ChangePokemonNickname - goto EventScript_16CC10 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CD99:: @ 816CD99 +CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase:: @ 816CD99 textcolor 3 - msgbox gUnknown_819703E + msgbox CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired release end -EventScript_16CDA5:: @ 816CDA5 - msgbox gUnknown_81970D5 - goto EventScript_16CC10 +CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins:: @ 816CDA5 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CDB3:: @ 816CDB3 +CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 @@ -220,11 +220,11 @@ EventScript_16CDB3:: @ 816CDB3 waitfanfare msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16CD83 - goto EventScript_16CC10 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CDE0:: @ 816CDE0 +CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 @@ -234,161 +234,161 @@ EventScript_16CDE0:: @ 816CDE0 waitfanfare msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CE12 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC call EventScript_NameReceivedBoxMon - goto EventScript_16CE12 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC end -EventScript_16CE12:: @ 816CE12 +CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC:: @ 816CE12 call EventScript_TransferredToPC - goto EventScript_16CC10 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs:: @ 816CE1D lock faceplayer - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 - msgbox gUnknown_8197057 - goto EventScript_16CE47 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM end -EventScript_16CE47:: @ 816CE47 - message Text_19707A +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM:: @ 816CE47 + message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 11, 0, MULTICHOICE_GAME_CORNER_TMPRIZES, FALSE switch VAR_RESULT - case 0, EventScript_16CEA5 - case 1, EventScript_16CEB9 - case 2, EventScript_16CECD - case 3, EventScript_16CEE1 - case 4, EventScript_16CEF5 - case 5, EventScript_16CC10 - case 127, EventScript_16CC10 + case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_TM13 + case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_TM23 + case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_TM24 + case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_TM30 + case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_TM35 + case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CEA5:: @ 816CEA5 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM13:: @ 816CEA5 setvar VAR_TEMP_1, ITEM_TM13 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_ICE_BEAM - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CEB9:: @ 816CEB9 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM23:: @ 816CEB9 setvar VAR_TEMP_1, ITEM_TM23 setvar VAR_TEMP_2, 3500 getmovename 1, MOVE_IRON_TAIL - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CECD:: @ 816CECD +CeladonCity_GameCorner_PrizeRoom_EventScript_TM24:: @ 816CECD setvar VAR_TEMP_1, ITEM_TM24 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_THUNDERBOLT - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CEE1:: @ 816CEE1 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM30:: @ 816CEE1 setvar VAR_TEMP_1, ITEM_TM30 setvar VAR_TEMP_2, 4500 getmovename 1, MOVE_SHADOW_BALL - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CEF5:: @ 816CEF5 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM35:: @ 816CEF5 setvar VAR_TEMP_1, ITEM_TM35 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_FLAMETHROWER - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CF09:: @ 816CF09 - msgbox gUnknown_81970B2, MSGBOX_YESNO +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM:: @ 816CF09 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CC10 - goto EventScript_16CF3F + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize end -EventScript_16CF22:: @ 816CF22 +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem:: @ 816CF22 getitemname 0, VAR_TEMP_1 - msgbox gUnknown_819709D, MSGBOX_YESNO + msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CC10 - goto EventScript_16CF3F + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize end -EventScript_16CF3F:: @ 816CF3F +CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize:: @ 816CF3F getitemname 0, VAR_TEMP_1 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if_lt EventScript_16CDA5 + goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins checkitemspace VAR_TEMP_1, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16CF79 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull removecoins VAR_TEMP_2 updatecoinsbox 0, 5 giveitem VAR_TEMP_1 - goto EventScript_16CC10 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CF79:: @ 816CF79 +CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull:: @ 816CF79 textcolor 3 msgbox Text_TooBadBagFull hidecoinsbox 0, 0 release end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems:: @ 816CF88 lock faceplayer - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 - msgbox gUnknown_8197057 - goto EventScript_16CFB2 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem end -EventScript_16CFB2:: @ 816CFB2 - message Text_19707A +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem:: @ 816CFB2 + message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 10, 0, MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES, FALSE switch VAR_RESULT - case 0, EventScript_16D010 - case 1, EventScript_16D020 - case 2, EventScript_16D030 - case 3, EventScript_16D040 - case 4, EventScript_16D050 - case 5, EventScript_16CC10 - case 127, EventScript_16CC10 + case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall + case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed + case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal + case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater + case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute + case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16D010:: @ 816D010 +CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall:: @ 816D010 setvar VAR_TEMP_1, ITEM_SMOKE_BALL setvar VAR_TEMP_2, 800 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D020:: @ 816D020 +CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed:: @ 816D020 setvar VAR_TEMP_1, ITEM_MIRACLE_SEED setvar VAR_TEMP_2, 1000 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D030:: @ 816D030 +CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal:: @ 816D030 setvar VAR_TEMP_1, ITEM_CHARCOAL setvar VAR_TEMP_2, 1000 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D040:: @ 816D040 +CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater:: @ 816D040 setvar VAR_TEMP_1, ITEM_MYSTIC_WATER setvar VAR_TEMP_2, 1000 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D050:: @ 816D050 +CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute:: @ 816D050 setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE setvar VAR_TEMP_2, 1600 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc index a5a21b9bc..140c98958 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc @@ -1,31 +1,31 @@ -gUnknown_8196FC1:: @ 8196FC1 +CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon:: @ 8196FC1 .string "I sure do fancy that PORYGON!\n" .string "But, it's hard to win at slots!$" -gUnknown_8196FFF:: @ 8196FFF +CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday:: @ 8196FFF .string "Gahaha! I raked it in today!\n" .string "If only every day were like this…$" -gUnknown_819703E:: @ 819703E +CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired:: @ 819703E .string "A COIN CASE is required…$" -gUnknown_8197057:: @ 8197057 +CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes:: @ 8197057 .string "We exchange your COINS for prizes.$" -Text_19707A:: @ 819707A +CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize:: @ 819707A .string "Which prize would you like?$" -gUnknown_8197096:: @ 8197096 +CeladonCity_GameCorner_PrizeRoom_Text_HereYouGo:: @ 8197096 .string "はい どうぞ$" -gUnknown_819709D:: @ 819709D +CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize:: @ 819709D .string "So, you want the {STR_VAR_1}?$" -gUnknown_81970B2:: @ 81970B2 +CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM:: @ 81970B2 .string "Okay, a TM of {STR_VAR_2}\n" .string "is what you want?$" -gUnknown_81970D5:: @ 81970D5 +CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: @ 81970D5 .string "Sorry, you'll need more COINS\n" .string "than that.$" diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 88187cdc9..f0a86b8e5 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "CeladonCity_Gym_EventScript_16D111", + "script": "CeladonCity_Gym_EventScript_Kay", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "CeladonCity_Gym_EventScript_16D163", + "script": "CeladonCity_Gym_EventScript_Bridget", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "CeladonCity_Gym_EventScript_16D14C", + "script": "CeladonCity_Gym_EventScript_Tina", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "CeladonCity_Gym_EventScript_16D17A", + "script": "CeladonCity_Gym_EventScript_Tamia", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "CeladonCity_Gym_EventScript_16D19E", + "script": "CeladonCity_Gym_EventScript_Lori", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "CeladonCity_Gym_EventScript_16D128", + "script": "CeladonCity_Gym_EventScript_Lisa", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Gym_EventScript_16D061", + "script": "CeladonCity_Gym_EventScript_Erika", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "CeladonCity_Gym_EventScript_16D1B5", + "script": "CeladonCity_Gym_EventScript_Mary", "flag": "0" }, { @@ -187,14 +187,14 @@ "x": 4, "y": 16, "elevation": 0, - "script": "CeladonCity_Gym_EventScript_16D1CC" + "script": "CeladonCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 8, "y": 16, "elevation": 0, - "script": "CeladonCity_Gym_EventScript_16D1CC" + "script": "CeladonCity_Gym_EventScript_GymStatue" } ] } diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 60a945e21..8291ad757 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -1,85 +1,85 @@ CeladonCity_Gym_MapScripts:: @ 816D060 .byte 0 -CeladonCity_Gym_EventScript_16D061:: @ 816D061 +CeladonCity_Gym_EventScript_Erika:: @ 816D061 famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC - goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6 + trainerbattle_single TRAINER_LEADER_ERIKA, CeladonCity_Gym_Text_ErikaIntro, CeladonCity_Gym_Text_ErikaDefeat, CeladonCity_Gym_EventScript_DefeatedErika, NO_MUSIC + goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, CeladonCity_Gym_EventScript_GiveTM19 famechecker FAMECHECKER_ERIKA, 4 - msgbox gUnknown_81972B8 + msgbox CeladonCity_Gym_Text_ErikaPostBattle release end -EventScript_16D0A0:: @ 816D0A0 +CeladonCity_Gym_EventScript_DefeatedErika:: @ 816D0A0 famechecker FAMECHECKER_ERIKA, 1 clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS setflag FLAG_DEFEATED_ERIKA setflag FLAG_BADGE04_GET set_gym_trainers 4 - goto EventScript_16D0C6 + goto CeladonCity_Gym_EventScript_GiveTM19 end -EventScript_16D0C6:: @ 816D0C6 - msgbox gUnknown_8197327 +CeladonCity_Gym_EventScript_GiveTM19:: @ 816D0C6 + msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis checkitemspace ITEM_TM19, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16D107 - giveitem_msg gUnknown_81973BA, ITEM_TM19 + goto_if_eq CeladonCity_Gym_EventScript_NoRoomForTM19 + giveitem_msg CeladonCity_Gym_Text_ReceivedTM19FromErika, ITEM_TM19 setflag FLAG_GOT_TM19_FROM_ERIKA - msgbox gUnknown_81973D7 + msgbox CeladonCity_Gym_Text_ExplainTM19 release end -EventScript_16D107:: @ 816D107 - msgbox gUnknown_819745D +CeladonCity_Gym_EventScript_NoRoomForTM19:: @ 816D107 + msgbox CeladonCity_Gym_Text_ShouldMakeRoomForThis release end -CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4 - msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Kay:: @ 816D111 + trainerbattle_single TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat + msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF +CeladonCity_Gym_EventScript_Lisa:: @ 816D128 + trainerbattle_single TRAINER_LASS_LISA, CeladonCity_Gym_Text_LisaIntro, CeladonCity_Gym_Text_LisaDefeat famechecker FAMECHECKER_ERIKA, 2 - msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE + msgbox CeladonCity_Gym_Text_LisaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB - msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Tina:: @ 816D14C + trainerbattle_single TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat + msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C - msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Bridget:: @ 816D163 + trainerbattle_single TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat + msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660 +CeladonCity_Gym_EventScript_Tamia:: @ 816D17A + trainerbattle_single TRAINER_BEAUTY_TAMIA, CeladonCity_Gym_Text_TamiaIntro, CeladonCity_Gym_Text_TamiaDefeat famechecker FAMECHECKER_ERIKA, 3 - msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE + msgbox CeladonCity_Gym_Text_TamiaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A - msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Lori:: @ 816D19E + trainerbattle_single TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat + msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832 - msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Mary:: @ 816D1B5 + trainerbattle_single TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat + msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC +CeladonCity_Gym_EventScript_GymStatue:: @ 816D1CC lockall - goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0 - msgbox gUnknown_8197874 + goto_if_set FLAG_BADGE04_GET, CeladonCity_Gym_EventScript_GymStatuePostVictory + msgbox CeladonCity_Gym_Text_GymStatue releaseall end -EventScript_16D1E0:: @ 816D1E0 - msgbox gUnknown_81978AB +CeladonCity_Gym_EventScript_GymStatuePostVictory:: @ 816D1E0 + msgbox CeladonCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 02c39a95c..02ded4fb0 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -1,168 +1,156 @@ -gUnknown_81970FE:: @ 81970FE - .string "おきゃくさん もう もてないよ$" @ I'm sorry I don't have any more +Text_SorryDontHaveAnyMore:: @ 81970FE + .string "おきゃくさん もう もてないよ$" -gUnknown_819710E:: @ 819710E - .string "あっ そう$" @ I see +Text_ISee:: @ 819710E + .string "あっ そう$" -Text_197114:: @ 8197114 +CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 .string "Hello…\n" .string "Lovely weather, isn't it?\l" .string "It's so pleasant…\p" - .string "…Oh, dear…\n" .string "I must have dozed off. Welcome.\p" - .string "My name is ERIKA.\n" .string "I am the LEADER of CELADON GYM.\p" - .string "I am a student of the art of\n" .string "flower arranging.\p" - .string "My POKéMON are solely of the\n" .string "GRASS type.\p" - .string "…Oh, I'm sorry, I had no idea that\n" .string "you wished to challenge me.\p" - .string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$" -Text_197260:: @ 8197260 +CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260 .string "Oh!\n" .string "I concede defeat.\l" .string "You are remarkably strong.\p" - .string "I must confer on you the\n" .string "RAINBOWBADGE.$" -gUnknown_81972B8:: @ 81972B8 +CeladonCity_Gym_Text_ErikaPostBattle:: @ 81972B8 .string "You are cataloging POKéMON?\n" .string "I must say I'm impressed.\p" - .string "I would never collect POKéMON if\n" .string "they were unattractive.$" -gUnknown_8197327:: @ 8197327 +CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis:: @ 8197327 .string "The RAINBOWBADGE will make\n" .string "POKéMON up to Lv. 50 obey.\p" - .string "It also allows POKéMON to use\n" .string "STRENGTH in and out of battle.\p" - .string "Please also take this with you.$" -gUnknown_81973BA:: @ 81973BA +CeladonCity_Gym_Text_ReceivedTM19FromErika:: @ 81973BA .string "{PLAYER} received TM19\n" .string "from ERIKA.$" -gUnknown_81973D7:: @ 81973D7 +CeladonCity_Gym_Text_ExplainTM19:: @ 81973D7 .string "TM19 contains GIGA DRAIN.\p" - .string "Half the damage it inflicts is\n" .string "drained to heal your POKéMON.\p" - .string "Wouldn't you agree that it's a\n" .string "wonderful move?$" -gUnknown_819745D:: @ 819745D +CeladonCity_Gym_Text_ShouldMakeRoomForThis:: @ 819745D .string "You should make room for this.$" -Text_19747C:: @ 819747C +CeladonCity_Gym_Text_KayIntro:: @ 819747C .string "I should tell you about this GYM.\p" .string "Only real ladies are allowed in\n" .string "here!$" -Text_1974C4:: @ 81974C4 +CeladonCity_Gym_Text_KayDefeat:: @ 81974C4 .string "You're too rough!$" -gUnknown_81974D6:: @ 81974D6 +CeladonCity_Gym_Text_KayPostBattle:: @ 81974D6 .string "Bleaah!\n" .string "I hope ERIKA wipes you out!$" -Text_1974FA:: @ 81974FA +CeladonCity_Gym_Text_BridgetIntro:: @ 81974FA .string "Oh, welcome.\n" .string "I was getting bored.$" -Text_19751C:: @ 819751C +CeladonCity_Gym_Text_BridgetDefeat:: @ 819751C .string "My makeup!$" -gUnknown_8197527:: @ 8197527 +CeladonCity_Gym_Text_BridgetPostBattle:: @ 8197527 .string "GRASS-type POKéMON are tough\n" .string "against the WATER type.\p" .string "They also have an edge on ROCK-\n" .string "and GROUND-type POKéMON.$" -Text_197595:: @ 8197595 +CeladonCity_Gym_Text_TinaIntro:: @ 8197595 .string "…Weren't you peeking in here\n" .string "earlier?$" -Text_1975BB:: @ 81975BB +CeladonCity_Gym_Text_TinaDefeat:: @ 81975BB .string "You're an eye-opener!$" -gUnknown_81975D1:: @ 81975D1 +CeladonCity_Gym_Text_TinaPostBattle:: @ 81975D1 .string "Oh, you were looking at ERIKA…\n" .string "You weren't looking at me…$" -Text_19760B:: @ 819760B +CeladonCity_Gym_Text_TamiaIntro:: @ 819760B .string "Look, look!\n" .string "See my POKéMON!\p" .string "I like the GRASS type.\n" .string "I like how they're easy to raise.$" -Text_197660:: @ 8197660 +CeladonCity_Gym_Text_TamiaDefeat:: @ 8197660 .string "No!$" -gUnknown_8197664:: @ 8197664 +CeladonCity_Gym_Text_TamiaPostBattle:: @ 8197664 .string "We only use GRASS-type POKéMON at\n" .string "our GYM.\p" .string "Why? We also use them for making\n" .string "flower arrangements!$" -Text_1976C5:: @ 81976C5 +CeladonCity_Gym_Text_LisaIntro:: @ 81976C5 .string "Oh, hey!\p" .string "We don't like BUG- or FIRE-type\n" .string "POKéMON in here!$" -Text_1976FF:: @ 81976FF +CeladonCity_Gym_Text_LisaDefeat:: @ 81976FF .string "Oh!\n" .string "You!$" -gUnknown_8197708:: @ 8197708 +CeladonCity_Gym_Text_LisaPostBattle:: @ 8197708 .string "Our LEADER ERIKA might be quiet,\n" .string "but she's famous around here.$" -Text_197747:: @ 8197747 +CeladonCity_Gym_Text_LoriIntro:: @ 8197747 .string "Pleased to meet you.\n" .string "My hobby is POKéMON training.$" -Text_19777A:: @ 819777A +CeladonCity_Gym_Text_LoriDefeat:: @ 819777A .string "Oh!\n" .string "Splendid!$" -gUnknown_8197788:: @ 8197788 +CeladonCity_Gym_Text_LoriPostBattle:: @ 8197788 .string "I have a blind date coming up.\n" .string "I have to learn to be polite,\l" .string "especially if I have to battle.$" -Text_1977E5:: @ 81977E5 +CeladonCity_Gym_Text_MaryIntro:: @ 81977E5 .string "Welcome to CELADON GYM!\p" .string "You'd better not underestimate\n" .string "the nice ladies here.$" -Text_197832:: @ 8197832 +CeladonCity_Gym_Text_MaryDefeat:: @ 8197832 .string "Oh!\n" .string "Beaten!$" -gUnknown_819783E:: @ 819783E +CeladonCity_Gym_Text_MaryPostBattle:: @ 819783E .string "I didn't bring my best POKéMON.\n" .string "Wait until next time!$" -gUnknown_8197874:: @ 8197874 +CeladonCity_Gym_Text_GymStatue:: @ 8197874 .string "CELADON POKéMON GYM\n" .string "LEADER: ERIKA\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_81978AB:: @ 81978AB +CeladonCity_Gym_Text_GymStatuePlayerWon:: @ 81978AB .string "CELADON POKéMON GYM\n" .string "LEADER: ERIKA\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 6ab82e945..80b4df1cd 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D284", + "script": "CeladonCity_Hotel_EventScript_Receptionist", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D28D", + "script": "CeladonCity_Hotel_EventScript_Beauty", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D296", + "script": "CeladonCity_Hotel_EventScript_BeautyBoyfriend", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D29F", + "script": "CeladonCity_Hotel_EventScript_BeautyBrother", "flag": "0" } ], diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc index 4f136bad3..be366a705 100644 --- a/data/maps/CeladonCity_Hotel/scripts.inc +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -1,18 +1,18 @@ CeladonCity_Hotel_MapScripts:: @ 816D283 .byte 0 -CeladonCity_Hotel_EventScript_16D284:: @ 816D284 - msgbox gUnknown_8197B77, MSGBOX_NPC +CeladonCity_Hotel_EventScript_Receptionist:: @ 816D284 + msgbox CeladonCity_Hotel_Text_ThisHotelIsForPeople, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D - msgbox gUnknown_8197BBE, MSGBOX_NPC +CeladonCity_Hotel_EventScript_Beauty:: @ 816D28D + msgbox CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_16D296:: @ 816D296 - msgbox gUnknown_8197C0C, MSGBOX_NPC +CeladonCity_Hotel_EventScript_BeautyBoyfriend:: @ 816D296 + msgbox CeladonCity_Hotel_Text_WhyDidSheBringBrother, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F - msgbox gUnknown_8197C30, MSGBOX_NPC +CeladonCity_Hotel_EventScript_BeautyBrother:: @ 816D29F + msgbox CeladonCity_Hotel_Text_SisBroughtMeOnVacation, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc index b1c989120..3932c4633 100644 --- a/data/maps/CeladonCity_Hotel/text.inc +++ b/data/maps/CeladonCity_Hotel/text.inc @@ -1,21 +1,22 @@ -Text_197B6F:: @ 8197B6F +@ Odd, doesnt seem to be corresponding text in RB. Unclear what this was meant for +Text_BuddhistAltar:: @ 8197B6F .string "ぶつだん　だ‥$" -gUnknown_8197B77:: @ 8197B77 +CeladonCity_Hotel_Text_ThisHotelIsForPeople:: @ 8197B77 .string "POKéMON?\n" .string "No, this is a hotel for people.\p" .string "We're full up, unfortunately.$" -gUnknown_8197BBE:: @ 8197BBE +CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend:: @ 8197BBE .string "I'm on vacation with my brother and\n" .string "boyfriend.\p" .string "CELADON is such a pretty city!$" -gUnknown_8197C0C:: @ 8197C0C +CeladonCity_Hotel_Text_WhyDidSheBringBrother:: @ 8197C0C .string "Why?\n" .string "Why did she bring her brother?$" -gUnknown_8197C30:: @ 8197C30 +CeladonCity_Hotel_Text_SisBroughtMeOnVacation:: @ 8197C30 .string "Yippee! I'm on vacation!\n" .string "My sis brought me along! Awesome!$" diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 455e9d836..0fccecd67 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_House1_EventScript_16D268", + "script": "CeladonCity_House1_EventScript_RocketChief", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 5, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_House1_EventScript_16D271", + "script": "CeladonCity_House1_EventScript_Rocket1", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 5, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_House1_EventScript_16D27A", + "script": "CeladonCity_House1_EventScript_Rocket2", "flag": "0" } ], diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc index 6c8dab4ff..4a05ae97d 100644 --- a/data/maps/CeladonCity_House1/scripts.inc +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -1,14 +1,14 @@ CeladonCity_House1_MapScripts:: @ 816D267 .byte 0 -CeladonCity_House1_EventScript_16D268:: @ 816D268 - msgbox gUnknown_8197A9F, MSGBOX_NPC +CeladonCity_House1_EventScript_RocketChief:: @ 816D268 + msgbox CeladonCity_House1_Text_SlotsReelInTheDough, MSGBOX_NPC end -CeladonCity_House1_EventScript_16D271:: @ 816D271 - msgbox gUnknown_8197AD3, MSGBOX_NPC +CeladonCity_House1_EventScript_Rocket1:: @ 816D271 + msgbox CeladonCity_House1_Text_ShippedMonsAsSlotPrizes, MSGBOX_NPC end -CeladonCity_House1_EventScript_16D27A:: @ 816D27A - msgbox gUnknown_8197B20, MSGBOX_NPC +CeladonCity_House1_EventScript_Rocket2:: @ 816D27A + msgbox CeladonCity_House1_Text_DontTouchGameCornerPoster, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc index df6acb986..49bf8e3fe 100644 --- a/data/maps/CeladonCity_House1/text.inc +++ b/data/maps/CeladonCity_House1/text.inc @@ -1,15 +1,15 @@ -gUnknown_8197A9F:: @ 8197A9F +CeladonCity_House1_Text_SlotsReelInTheDough:: @ 8197A9F .string "Hehehe!\p" .string "The slots just reel in the dough,\n" .string "big-time!$" -gUnknown_8197AD3:: @ 8197AD3 +CeladonCity_House1_Text_ShippedMonsAsSlotPrizes:: @ 8197AD3 .string "CHIEF!\p" .string "We just shipped two thousand\n" .string "more POKéMON as slot prizes\l" .string "again today!$" -gUnknown_8197B20:: @ 8197B20 +CeladonCity_House1_Text_DontTouchGameCornerPoster:: @ 8197B20 .string "Don't touch the poster at the GAME\n" .string "CORNER!\p" .string "There's no secret switch behind it!$" diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 7d2af91a9..c37be2dc6 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C5FB", + "script": "CeladonCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C604", + "script": "CeladonCity_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": "CeladonCity_PokemonCenter_1F_EventScript_16C60D", + "script": "CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C616", + "script": "CeladonCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 322968550..b98b49824 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 setrespawn SPAWN_CELADON_CITY end -CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB +CeladonCity_PokemonCenter_1F_EventScript_Nurse:: @ 816C5FB lock faceplayer call EventScript_PkmnCenterNurse release end -CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604 - msgbox gUnknown_819685B, MSGBOX_NPC +CeladonCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816C604 + msgbox CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons, MSGBOX_NPC end -CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D - msgbox gUnknown_81968C2, MSGBOX_NPC +CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816C60D + msgbox CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia, MSGBOX_NPC end -CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 - msgbox gUnknown_8196913, MSGBOX_NPC +CeladonCity_PokemonCenter_1F_EventScript_Youngster:: @ 816C616 + msgbox CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/text.inc b/data/maps/CeladonCity_PokemonCenter_1F/text.inc index 098582351..6aa628f39 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/text.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/text.inc @@ -1,15 +1,15 @@ -gUnknown_819685B:: @ 819685B +CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons:: @ 819685B .string "A POKé FLUTE awakens sleeping\n" .string "POKéMON. You know that.\p" .string "It does so with a sound that only\n" .string "they can hear.$" -gUnknown_81968C2:: @ 81968C2 +CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia:: @ 81968C2 .string "I rode here from FUCHSIA.\p" .string "It's an uphill ride on CYCLING\n" .string "ROAD, so I'm exhausted.$" -gUnknown_8196913:: @ 8196913 +CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike:: @ 8196913 .string "If I had a BIKE, I would go to\n" .string "CYCLING ROAD!$" diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 9681ddfb2..dafc84778 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D1EB", + "script": "CeladonCity_Restaurant_EventScript_Chef", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D1F4", + "script": "CeladonCity_Restaurant_EventScript_Woman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D25E", + "script": "CeladonCity_Restaurant_EventScript_FatMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D1FD", + "script": "CeladonCity_Restaurant_EventScript_CoinCaseMan", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D255", + "script": "CeladonCity_Restaurant_EventScript_WorkerM", "flag": "0" } ], diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index c8ab9469a..9613406e4 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -1,41 +1,41 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA .byte 0 -CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB - msgbox gUnknown_81978E6, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_Chef:: @ 816D1EB + msgbox CeladonCity_Restaurant_Text_TakingBreakRightNow, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 - msgbox gUnknown_8197915, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_Woman:: @ 816D1F4 + msgbox CeladonCity_Restaurant_Text_OftenGoToDrugstore, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD +CeladonCity_Restaurant_EventScript_CoinCaseMan:: @ 816D1FD lock faceplayer - goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B - msgbox gUnknown_81979C1 + goto_if_set FLAG_GOT_COIN_CASE, CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase + msgbox CeladonCity_Restaurant_Text_TakeThisImBusted checkitemspace ITEM_COIN_CASE, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16D241 - giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE + goto_if_eq CeladonCity_Restaurant_EventScript_NoRoomForCoinCase + giveitem_msg CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan, ITEM_COIN_CASE setflag FLAG_GOT_COIN_CASE release end -EventScript_16D241:: @ 816D241 - msgbox gUnknown_8197A5E +CeladonCity_Restaurant_EventScript_NoRoomForCoinCase:: @ 816D241 + msgbox CeladonCity_Restaurant_Text_MakeRoomForThis release end -EventScript_16D24B:: @ 816D24B - msgbox gUnknown_8197A72 +CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase:: @ 816D24B + msgbox CeladonCity_Restaurant_Text_ThoughtIdWinItBack release end -CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 - msgbox gUnknown_8197952, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_WorkerM:: @ 816D255 + msgbox CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E - msgbox gUnknown_819798A, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_FatMan:: @ 816D25E + msgbox CeladonCity_Restaurant_Text_ManLostItAllAtSlots, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Restaurant/text.inc b/data/maps/CeladonCity_Restaurant/text.inc index 87edeb186..e6c27c2bd 100644 --- a/data/maps/CeladonCity_Restaurant/text.inc +++ b/data/maps/CeladonCity_Restaurant/text.inc @@ -1,22 +1,22 @@ -gUnknown_81978E6:: @ 81978E6 +CeladonCity_Restaurant_Text_TakingBreakRightNow:: @ 81978E6 .string "Hi!\p" .string "Sorry, but we're taking a break\n" .string "right now.$" -gUnknown_8197915:: @ 8197915 +CeladonCity_Restaurant_Text_OftenGoToDrugstore:: @ 8197915 .string "My POKéMON are weak, so I often\n" .string "have to go to the DRUGSTORE.$" -gUnknown_8197952:: @ 8197952 +CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner:: @ 8197952 .string "Psst! There's a basement under the\n" .string "GAME CORNER, I hear.$" -gUnknown_819798A:: @ 819798A +CeladonCity_Restaurant_Text_ManLostItAllAtSlots:: @ 819798A .string "Munch…\p" .string "The man at that table lost it all\n" .string "at the slots.$" -gUnknown_81979C1:: @ 81979C1 +CeladonCity_Restaurant_Text_TakeThisImBusted:: @ 81979C1 .string "Go ahead! Laugh!\n" .string "I'm flat-out busted!\p" .string "No more slots for me!\n" @@ -24,14 +24,14 @@ gUnknown_81979C1:: @ 81979C1 .string "Here!\n" .string "I won't be needing this anymore!$" -gUnknown_8197A38:: @ 8197A38 +CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan:: @ 8197A38 .string "{PLAYER} received a COIN CASE\n" .string "from the man.$" -gUnknown_8197A5E:: @ 8197A5E +CeladonCity_Restaurant_Text_MakeRoomForThis:: @ 8197A5E .string "Make room for this!$" -gUnknown_8197A72:: @ 8197A72 +CeladonCity_Restaurant_Text_ThoughtIdWinItBack:: @ 8197A72 .string "I always thought I was going to\n" .string "win it back…$" -- cgit v1.2.3 From 351d85f57d45dfcd6042b37aa36d77bec1d0a487 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 25 Jan 2020 14:56:58 -0500 Subject: Update JP altar text comment --- data/maps/CeladonCity_Hotel/text.inc | 4 ---- data/maps/CeladonCity_House1/text.inc | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc index 3932c4633..5ac6ac99c 100644 --- a/data/maps/CeladonCity_Hotel/text.inc +++ b/data/maps/CeladonCity_Hotel/text.inc @@ -1,7 +1,3 @@ -@ Odd, doesnt seem to be corresponding text in RB. Unclear what this was meant for -Text_BuddhistAltar:: @ 8197B6F - .string "ぶつだん　だ‥$" - CeladonCity_Hotel_Text_ThisHotelIsForPeople:: @ 8197B77 .string "POKéMON?\n" .string "No, this is a hotel for people.\p" diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc index 49bf8e3fe..d07d4a0e4 100644 --- a/data/maps/CeladonCity_House1/text.inc +++ b/data/maps/CeladonCity_House1/text.inc @@ -14,3 +14,7 @@ CeladonCity_House1_Text_DontTouchGameCornerPoster:: @ 8197B20 .string "CORNER!\p" .string "There's no secret switch behind it!$" +@ Text for the replaced altars in the rocket chiefs house / celadon mansion +@ In English RB, this is westernized as "It's a sculpture of DIGLETT.", and is removed altogether in FRLG +Text_ItsABuddhistAltar:: @ 8197B6F + .string "ぶつだん　だ‥$" -- cgit v1.2.3 From ce9f821b4e993fd86122476d17870afd0527513a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 25 Jan 2020 15:54:20 -0500 Subject: Document Saffron City scripts --- data/maps/IndigoPlateau_PokemonCenter_1F/text.inc | 19 ++ data/maps/OneIsland/text.inc | 9 - data/maps/Route5_PokemonDayCare/text.inc | 8 + data/maps/Route5_SouthEntrance/map.json | 8 +- data/maps/Route5_SouthEntrance/scripts.inc | 60 ++--- data/maps/Route5_SouthEntrance/text.inc | 16 +- data/maps/Route6_NorthEntrance/map.json | 8 +- data/maps/Route6_NorthEntrance/scripts.inc | 60 ++--- data/maps/Route6_NorthEntrance/text.inc | 8 +- data/maps/Route7_EastEntrance/map.json | 8 +- data/maps/Route7_EastEntrance/scripts.inc | 60 ++--- data/maps/Route7_EastEntrance/text.inc | 8 +- data/maps/Route8_WestEntrance/map.json | 8 +- data/maps/Route8_WestEntrance/scripts.inc | 70 +++--- data/maps/Route8_WestEntrance/text.inc | 8 +- data/maps/SaffronCity/map.json | 54 ++-- data/maps/SaffronCity/scripts.inc | 102 ++++---- data/maps/SaffronCity/text.inc | 57 +++-- data/maps/SaffronCity_CopycatsHouse_1F/map.json | 88 +++++++ data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc | 20 ++ data/maps/SaffronCity_CopycatsHouse_1F/text.inc | 13 + data/maps/SaffronCity_CopycatsHouse_2F/map.json | 105 ++++++++ data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc | 50 ++++ data/maps/SaffronCity_CopycatsHouse_2F/text.inc | 102 ++++++++ data/maps/SaffronCity_Dojo/map.json | 26 +- data/maps/SaffronCity_Dojo/scripts.inc | 112 ++++----- data/maps/SaffronCity_Dojo/text.inc | 51 ++-- data/maps/SaffronCity_Gym/map.json | 22 +- data/maps/SaffronCity_Gym/scripts.inc | 88 +++---- data/maps/SaffronCity_Gym/text.inc | 64 ++--- data/maps/SaffronCity_House/map.json | 102 ++++++++ data/maps/SaffronCity_House/scripts.inc | 24 ++ data/maps/SaffronCity_House/text.inc | 20 ++ data/maps/SaffronCity_House1_1F/map.json | 88 ------- data/maps/SaffronCity_House1_1F/scripts.inc | 20 -- data/maps/SaffronCity_House1_1F/text.inc | 32 --- data/maps/SaffronCity_House1_2F/map.json | 105 -------- data/maps/SaffronCity_House1_2F/scripts.inc | 50 ---- data/maps/SaffronCity_House1_2F/text.inc | 100 -------- data/maps/SaffronCity_House2/map.json | 102 -------- data/maps/SaffronCity_House2/scripts.inc | 24 -- data/maps/SaffronCity_House2/text.inc | 20 -- data/maps/SaffronCity_House3/map.json | 55 ----- data/maps/SaffronCity_House3/scripts.inc | 26 -- data/maps/SaffronCity_House3/text.inc | 18 -- data/maps/SaffronCity_Mart/map.json | 6 +- data/maps/SaffronCity_Mart/scripts.inc | 14 +- data/maps/SaffronCity_Mart/text.inc | 4 +- data/maps/SaffronCity_MrPsychicsHouse/map.json | 55 +++++ data/maps/SaffronCity_MrPsychicsHouse/scripts.inc | 26 ++ data/maps/SaffronCity_MrPsychicsHouse/text.inc | 18 ++ data/maps/SaffronCity_PokemonCenter_1F/map.json | 12 +- data/maps/SaffronCity_PokemonCenter_1F/scripts.inc | 20 +- data/maps/SaffronCity_PokemonCenter_1F/text.inc | 8 +- .../SaffronCity_PokemonTrainerFanClub/map.json | 20 +- .../SaffronCity_PokemonTrainerFanClub/scripts.inc | 274 +++++++++++---------- .../SaffronCity_PokemonTrainerFanClub/text.inc | 76 +++--- data/maps/map_groups.json | 8 +- 58 files changed, 1323 insertions(+), 1316 deletions(-) create mode 100644 data/maps/SaffronCity_CopycatsHouse_1F/map.json create mode 100644 data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc create mode 100644 data/maps/SaffronCity_CopycatsHouse_1F/text.inc create mode 100644 data/maps/SaffronCity_CopycatsHouse_2F/map.json create mode 100644 data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc create mode 100644 data/maps/SaffronCity_CopycatsHouse_2F/text.inc create mode 100644 data/maps/SaffronCity_House/map.json create mode 100644 data/maps/SaffronCity_House/scripts.inc create mode 100644 data/maps/SaffronCity_House/text.inc delete mode 100644 data/maps/SaffronCity_House1_1F/map.json delete mode 100644 data/maps/SaffronCity_House1_1F/scripts.inc delete mode 100644 data/maps/SaffronCity_House1_1F/text.inc delete mode 100644 data/maps/SaffronCity_House1_2F/map.json delete mode 100644 data/maps/SaffronCity_House1_2F/scripts.inc delete mode 100644 data/maps/SaffronCity_House1_2F/text.inc delete mode 100644 data/maps/SaffronCity_House2/map.json delete mode 100644 data/maps/SaffronCity_House2/scripts.inc delete mode 100644 data/maps/SaffronCity_House2/text.inc delete mode 100644 data/maps/SaffronCity_House3/map.json delete mode 100644 data/maps/SaffronCity_House3/scripts.inc delete mode 100644 data/maps/SaffronCity_House3/text.inc create mode 100644 data/maps/SaffronCity_MrPsychicsHouse/map.json create mode 100644 data/maps/SaffronCity_MrPsychicsHouse/scripts.inc create mode 100644 data/maps/SaffronCity_MrPsychicsHouse/text.inc (limited to 'data/maps') diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc index 7a4d158b3..6535f9588 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc @@ -22,3 +22,22 @@ gUnknown_819A943:: @ 819A943 .string "As a result, the POKéMON LEAGUE is\n" .string "closed for the time being.$" +Text_19A9E7:: @ 819A9E7 + .string "AGATHA's GHOST-type POKéMON are\n" + .string "horrifically terrifying in toughness.\p" + .string "I took my FIGHTING-type POKéMON\n" + .string "and raised them to the max.\p" + .string "I went at AGATHA feeling pretty\n" + .string "confident, but she whupped us.\p" + .string "That old lady's also got a really\n" + .string "short fuse, too.\p" + .string "It doesn't take anything to get\n" + .string "that scary lady hollering.$" + +Text_19AB16:: @ 819AB16 + .string "Maybe becoming an ELITE FOUR\n" + .string "member is in the blood.\p" + .string "From what I've heard, LANCE has\n" + .string "a cousin who's a GYM LEADER\l" + .string "somewhere far away.$" + diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc index aeccc1e47..d9a6e376a 100644 --- a/data/maps/OneIsland/text.inc +++ b/data/maps/OneIsland/text.inc @@ -1,12 +1,3 @@ -Text_181569:: @ 8181569 - .string "This FAN CLUB…\n" - .string "No one here has a clue!\p" - .string "How could they not recognize\n" - .string "the brilliance that is LANCE?\p" - .string "He stands for justice!\n" - .string "He's cool, and yet passionate!\l" - .string "He's the greatest, LANCE!$" - gUnknown_818161B:: @ 818161B .string "BILL: Here we are!\n" .string "This is ONE ISLAND.\p" diff --git a/data/maps/Route5_PokemonDayCare/text.inc b/data/maps/Route5_PokemonDayCare/text.inc index cada12ea5..b87ca2ca2 100644 --- a/data/maps/Route5_PokemonDayCare/text.inc +++ b/data/maps/Route5_PokemonDayCare/text.inc @@ -58,3 +58,11 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2 Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001 .string "You don't have enough money.$" + +Text_19E01E:: @ 819E01E + .string "きみの\n" + .string "みてみるかね？$" + +Text_19E02A:: @ 819E02A + .string "わるいけど　ひでんのわざを　もった\n" + .string "ポケモンは　あずかれないなぁ$" diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index a85de2522..e75bbbf85 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route5_SouthEntrance_EventScript_16F901", + "script": "Route5_SouthEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route5_SouthEntrance_EventScript_16F90A" + "script": "Route5_SouthEntrance_EventScript_GuardTriggerLeft" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route5_SouthEntrance_EventScript_16F916" + "script": "Route5_SouthEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route5_SouthEntrance_EventScript_16F922" + "script": "Route5_SouthEntrance_EventScript_GuardTriggerRight" } ], "bg_events": [] diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index f20da71ae..b06a2aa2c 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -1,87 +1,87 @@ Route5_SouthEntrance_MapScripts:: @ 816F900 .byte 0 -Route5_SouthEntrance_EventScript_16F901:: @ 816F901 - msgbox gUnknown_819E16D, MSGBOX_NPC +Route5_SouthEntrance_EventScript_Guard:: @ 816F901 + msgbox Route5_SouthEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A +Route5_SouthEntrance_EventScript_GuardTriggerLeft:: @ 816F90A lockall setvar VAR_TEMP_1, 0 - goto EventScript_16F92E + goto Route5_SouthEntrance_EventScript_GuardTrigger end -Route5_SouthEntrance_EventScript_16F916:: @ 816F916 +Route5_SouthEntrance_EventScript_GuardTriggerMid:: @ 816F916 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16F92E + goto Route5_SouthEntrance_EventScript_GuardTrigger end -Route5_SouthEntrance_EventScript_16F922:: @ 816F922 +Route5_SouthEntrance_EventScript_GuardTriggerRight:: @ 816F922 lockall setvar VAR_TEMP_1, 2 - goto EventScript_16F92E + goto Route5_SouthEntrance_EventScript_GuardTrigger end -EventScript_16F92E:: @ 816F92E +Route5_SouthEntrance_EventScript_GuardTrigger:: @ 816F92E textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16F958 - msgbox gUnknown_819E04B + goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea + msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4 + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16F958:: @ 816F958 +Route5_SouthEntrance_EventScript_GiveTea:: @ 816F958 removeitem ITEM_TEA, 1 - goto EventScript_16F963 + goto Route5_SouthEntrance_EventScript_GuardDrinkTea end -EventScript_16F963:: @ 816F963 - msgbox gUnknown_819E09B +Route5_SouthEntrance_EventScript_GuardDrinkTea:: @ 816F963 + msgbox Route5_SouthEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16F99C + call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16F9A7 + call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16F9B2 - msgbox gUnknown_819E0C1 + call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardRight + msgbox Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16F99C:: @ 816F99C - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C2 +Route5_SouthEntrance_EventScript_WalkToGuardLeft:: @ 816F99C + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft waitmovement 0 return -EventScript_16F9A7:: @ 816F9A7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BD +Route5_SouthEntrance_EventScript_WalkToGuardMid:: @ 816F9A7 + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16F9B2:: @ 816F9B2 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BF +Route5_SouthEntrance_EventScript_WalkToGuardRight:: @ 816F9B2 + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight waitmovement 0 return -Movement_16F9BD:: @ 816F9BD +Route5_SouthEntrance_Movement_WalkToGuardMid:: @ 816F9BD walk_left step_end -Movement_16F9BF:: @ 816F9BF +Route5_SouthEntrance_Movement_WalkToGuardRight:: @ 816F9BF walk_left walk_left step_end -Movement_16F9C2:: @ 816F9C2 +Route5_SouthEntrance_Movement_WalkToGuardLeft:: @ 816F9C2 walk_in_place_left step_end -Movement_16F9C4:: @ 816F9C4 +Route5_SouthEntrance_Movement_BlockPlayerEntry:: @ 816F9C4 walk_up step_end diff --git a/data/maps/Route5_SouthEntrance/text.inc b/data/maps/Route5_SouthEntrance/text.inc index 749bcabe5..2b740e141 100644 --- a/data/maps/Route5_SouthEntrance/text.inc +++ b/data/maps/Route5_SouthEntrance/text.inc @@ -1,21 +1,13 @@ -Text_19E01E:: @ 819E01E - .string "きみの\n" - .string "みてみるかね？$" - -Text_19E02A:: @ 819E02A - .string "わるいけど　ひでんのわざを　もった\n" - .string "ポケモンは　あずかれないなぁ$" - -gUnknown_819E04B:: @ 819E04B +Route5_SouthEntrance_Text_ThirstyOnGuardDuty:: @ 819E04B .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E09B:: @ 819E09B +Route5_SouthEntrance_Text_ThatTeaLooksTasty:: @ 819E09B .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E0C1:: @ 819E0C1 +Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E0C1 .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -29,6 +21,6 @@ gUnknown_819E0C1:: @ 819E0C1 .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E16D:: @ 819E16D +Route5_SouthEntrance_Text_HiHowsItGoing:: @ 819E16D .string "Hi, how's it going?$" diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 8b49e226d..d44503ee4 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_NorthEntrance_EventScript_16F9C7", + "script": "Route6_NorthEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route6_NorthEntrance_EventScript_16F9D0" + "script": "Route6_NorthEntrance_EventScript_GuardTriggerLeft" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route6_NorthEntrance_EventScript_16F9DC" + "script": "Route6_NorthEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route6_NorthEntrance_EventScript_16F9E8" + "script": "Route6_NorthEntrance_EventScript_GuardTriggerRight" } ], "bg_events": [] diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index d1b9a4555..5c7add642 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -1,87 +1,87 @@ Route6_NorthEntrance_MapScripts:: @ 816F9C6 .byte 0 -Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 - msgbox gUnknown_819E2A3, MSGBOX_NPC +Route6_NorthEntrance_EventScript_Guard:: @ 816F9C7 + msgbox Route6_NorthEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 +Route6_NorthEntrance_EventScript_GuardTriggerLeft:: @ 816F9D0 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16F9F4 + goto Route6_NorthEntrance_EventScript_GuardTrigger end -Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC +Route6_NorthEntrance_EventScript_GuardTriggerMid:: @ 816F9DC lockall setvar VAR_TEMP_1, 1 - goto EventScript_16F9F4 + goto Route6_NorthEntrance_EventScript_GuardTrigger end -Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 +Route6_NorthEntrance_EventScript_GuardTriggerRight:: @ 816F9E8 lockall setvar VAR_TEMP_1, 2 - goto EventScript_16F9F4 + goto Route6_NorthEntrance_EventScript_GuardTrigger end -EventScript_16F9F4:: @ 816F9F4 +Route6_NorthEntrance_EventScript_GuardTrigger:: @ 816F9F4 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16FA1E - msgbox gUnknown_819E181 + goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea + msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16FA1E:: @ 816FA1E +Route6_NorthEntrance_EventScript_GiveTea:: @ 816FA1E removeitem ITEM_TEA, 1 - goto EventScript_16FA29 + goto Route6_NorthEntrance_EventScript_GuardDrinkTea end -EventScript_16FA29:: @ 816FA29 - msgbox gUnknown_819E1D1 +Route6_NorthEntrance_EventScript_GuardDrinkTea:: @ 816FA29 + msgbox Route6_NorthEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16FA62 + call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16FA6D + call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16FA78 - msgbox gUnknown_819E1F7 + call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardRight + msgbox Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16FA62:: @ 816FA62 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83 +Route6_NorthEntrance_EventScript_WalkToGuardLeft:: @ 816FA62 + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft waitmovement 0 return -EventScript_16FA6D:: @ 816FA6D - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86 +Route6_NorthEntrance_EventScript_WalkToGuardMid:: @ 816FA6D + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16FA78:: @ 816FA78 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88 +Route6_NorthEntrance_EventScript_WalkToGuardRight:: @ 816FA78 + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight waitmovement 0 return -Movement_16FA83:: @ 816FA83 +Route6_NorthEntrance_Movement_WalkToGuardLeft:: @ 816FA83 walk_right walk_right step_end -Movement_16FA86:: @ 816FA86 +Route6_NorthEntrance_Movement_WalkToGuardMid:: @ 816FA86 walk_right step_end -Movement_16FA88:: @ 816FA88 +Route6_NorthEntrance_Movement_WalkToGuardRight:: @ 816FA88 walk_in_place_right step_end -Movement_16FA8A:: @ 816FA8A +Route6_NorthEntrance_Movement_BlockPlayerEntry:: @ 816FA8A walk_down step_end diff --git a/data/maps/Route6_NorthEntrance/text.inc b/data/maps/Route6_NorthEntrance/text.inc index 3d581e1fb..09705517c 100644 --- a/data/maps/Route6_NorthEntrance/text.inc +++ b/data/maps/Route6_NorthEntrance/text.inc @@ -1,13 +1,13 @@ -gUnknown_819E181:: @ 819E181 +Route6_NorthEntrance_Text_ThirstyOnGuardDuty:: @ 819E181 .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E1D1:: @ 819E1D1 +Route6_NorthEntrance_Text_ThatTeaLooksTasty:: @ 819E1D1 .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E1F7:: @ 819E1F7 +Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E1F7 .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ gUnknown_819E1F7:: @ 819E1F7 .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E2A3:: @ 819E2A3 +Route6_NorthEntrance_Text_HiHowsItGoing:: @ 819E2A3 .string "Hi, how's it going?$" diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 8bd0e7498..fbb8a163d 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route7_EastEntrance_EventScript_16FA8E", + "script": "Route7_EastEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route7_EastEntrance_EventScript_16FA97" + "script": "Route7_EastEntrance_EventScript_GuardTriggerTop" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route7_EastEntrance_EventScript_16FAA3" + "script": "Route7_EastEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route7_EastEntrance_EventScript_16FAAF" + "script": "Route7_EastEntrance_EventScript_GuardTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index cac72463b..767601f49 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -1,87 +1,87 @@ Route7_EastEntrance_MapScripts:: @ 816FA8D .byte 0 -Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E - msgbox gUnknown_819E3D9, MSGBOX_NPC +Route7_EastEntrance_EventScript_Guard:: @ 816FA8E + msgbox Route7_EastEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 +Route7_EastEntrance_EventScript_GuardTriggerTop:: @ 816FA97 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16FABB + goto Route7_EastEntrance_EventScript_GuardTrigger end -Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3 +Route7_EastEntrance_EventScript_GuardTriggerMid:: @ 816FAA3 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16FABB + goto Route7_EastEntrance_EventScript_GuardTrigger end -Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF +Route7_EastEntrance_EventScript_GuardTriggerBottom:: @ 816FAAF lockall setvar VAR_TEMP_1, 2 - goto EventScript_16FABB + goto Route7_EastEntrance_EventScript_GuardTrigger end -EventScript_16FABB:: @ 816FABB +Route7_EastEntrance_EventScript_GuardTrigger:: @ 816FABB textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16FAE5 - msgbox gUnknown_819E2B7 + goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea + msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51 + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16FAE5:: @ 816FAE5 +Route7_EastEntrance_EventScript_GiveTea:: @ 816FAE5 removeitem ITEM_TEA, 1 - goto EventScript_16FAF0 + goto Route7_EastEntrance_EventScript_GuardDrinkTea end -EventScript_16FAF0:: @ 816FAF0 - msgbox gUnknown_819E307 +Route7_EastEntrance_EventScript_GuardDrinkTea:: @ 816FAF0 + msgbox Route7_EastEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16FB29 + call_if_eq Route7_EastEntrance_WalkToGuardTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_16FB34 + call_if_eq Route7_EastEntrance_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16FB3F - msgbox gUnknown_819E32D + call_if_eq Route7_EastEntrance_WalkToGuardBottom + msgbox Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16FB29:: @ 816FB29 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4F +Route7_EastEntrance_WalkToGuardTop:: @ 816FB29 + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop waitmovement 0 return -EventScript_16FB34:: @ 816FB34 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4A +Route7_EastEntrance_WalkToGuardMid:: @ 816FB34 + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16FB3F:: @ 816FB3F - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4C +Route7_EastEntrance_WalkToGuardBottom:: @ 816FB3F + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom waitmovement 0 return -Movement_16FB4A:: @ 816FB4A +Route7_EastEntrance_Movement_WalkToGuardMid:: @ 816FB4A walk_up step_end -Movement_16FB4C:: @ 816FB4C +Route7_EastEntrance_Movement_WalkToGuardBottom:: @ 816FB4C walk_up walk_up step_end -Movement_16FB4F:: @ 816FB4F +Route7_EastEntrance_Movement_WalkToGuardTop:: @ 816FB4F walk_in_place_up step_end -Movement_16FB51:: @ 816FB51 +Route7_EastEntrance_Movement_BlockPlayerEntry:: @ 816FB51 walk_left step_end diff --git a/data/maps/Route7_EastEntrance/text.inc b/data/maps/Route7_EastEntrance/text.inc index 94db43e94..ec98a5867 100644 --- a/data/maps/Route7_EastEntrance/text.inc +++ b/data/maps/Route7_EastEntrance/text.inc @@ -1,13 +1,13 @@ -gUnknown_819E2B7:: @ 819E2B7 +Route7_EastEntrance_Text_ThirstyOnGuardDuty:: @ 819E2B7 .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E307:: @ 819E307 +Route7_EastEntrance_Text_ThatTeaLooksTasty:: @ 819E307 .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E32D:: @ 819E32D +Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E32D .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ gUnknown_819E32D:: @ 819E32D .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E3D9:: @ 819E3D9 +Route7_EastEntrance_Text_HiHowsItGoing:: @ 819E3D9 .string "Hi, how's it going?$" diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index eb6b26e0f..3becdcbc2 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route8_WestEntrance_EventScript_16FB54", + "script": "Route8_WestEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route8_WestEntrance_EventScript_16FB5D" + "script": "Route8_WestEntrance_EventScript_GuardTriggerTop" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route8_WestEntrance_EventScript_16FB69" + "script": "Route8_WestEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route8_WestEntrance_EventScript_16FB75" + "script": "Route8_WestEntrance_EventScript_GuardTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index df9d1035c..1b36e9a15 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -1,97 +1,99 @@ Route8_WestEntrance_MapScripts:: @ 816FB53 .byte 0 -Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 - msgbox gUnknown_819E50F, MSGBOX_NPC +Route8_WestEntrance_EventScript_Guard:: @ 816FB54 + msgbox Route8_WestEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D +Route8_WestEntrance_EventScript_GuardTriggerTop:: @ 816FB5D lockall setvar VAR_TEMP_1, 0 - goto EventScript_16FB81 + goto Route8_WestEntrance_EventScript_GuardTrigger end -Route8_WestEntrance_EventScript_16FB69:: @ 816FB69 +Route8_WestEntrance_EventScript_GuardTriggerMid:: @ 816FB69 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16FB81 + goto Route8_WestEntrance_EventScript_GuardTrigger end -Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 +Route8_WestEntrance_EventScript_GuardTriggerBottom:: @ 816FB75 lockall setvar VAR_TEMP_1, 2 - goto EventScript_16FB81 + goto Route8_WestEntrance_EventScript_GuardTrigger end -EventScript_16FB81:: @ 816FB81 +Route8_WestEntrance_EventScript_GuardTrigger:: @ 816FB81 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16FBAB - msgbox gUnknown_819E3ED + goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea + msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16FBAB:: @ 816FBAB +Route8_WestEntrance_EventScript_GiveTea:: @ 816FBAB removeitem ITEM_TEA, 1 - goto EventScript_16FBCC + goto Route8_WestEntrance_EventScript_GuardDrinkTea end -EventScript_16FBB6:: @ 816FBB6 +@ Unused +Route8_WestEntrance_EventScript_GiveSodaPop:: @ 816FBB6 removeitem ITEM_SODA_POP, 1 - goto EventScript_16FBCC + goto Route8_WestEntrance_EventScript_GuardDrinkTea end -EventScript_16FBC1:: @ 816FBC1 +@ Unused +Route8_WestEntrance_EventScript_GiveLemonade:: @ 816FBC1 removeitem ITEM_LEMONADE, 1 - goto EventScript_16FBCC + goto Route8_WestEntrance_EventScript_GuardDrinkTea end -EventScript_16FBCC:: @ 816FBCC - msgbox gUnknown_819E43D +Route8_WestEntrance_EventScript_GuardDrinkTea:: @ 816FBCC + msgbox Route8_WestEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16FC05 + call_if_eq Route8_WestEntrance_EventScript_WalkToGuardTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_16FC10 + call_if_eq Route8_WestEntrance_EventScript_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16FC1B - msgbox gUnknown_819E463 + call_if_eq Route8_WestEntrance_EventScript_WalkToGuardBottom + msgbox Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16FC05:: @ 816FC05 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B +Route8_WestEntrance_EventScript_WalkToGuardTop:: @ 816FC05 + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop waitmovement 0 return -EventScript_16FC10:: @ 816FC10 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26 +Route8_WestEntrance_EventScript_WalkToGuardMid:: @ 816FC10 + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16FC1B:: @ 816FC1B - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28 +Route8_WestEntrance_EventScript_WalkToGuardBottom:: @ 816FC1B + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom waitmovement 0 return -Movement_16FC26:: @ 816FC26 +Route8_WestEntrance_Movement_WalkToGuardMid:: @ 816FC26 walk_up step_end -Movement_16FC28:: @ 816FC28 +Route8_WestEntrance_Movement_WalkToGuardBottom:: @ 816FC28 walk_up walk_up step_end -Movement_16FC2B:: @ 816FC2B +Route8_WestEntrance_Movement_WalkToGuardTop:: @ 816FC2B walk_in_place_up step_end -Movement_16FC2D:: @ 816FC2D +Route8_WestEntrance_Movement_BlockPlayerEntry:: @ 816FC2D walk_right step_end diff --git a/data/maps/Route8_WestEntrance/text.inc b/data/maps/Route8_WestEntrance/text.inc index 58e2ee8ef..3c0be19e1 100644 --- a/data/maps/Route8_WestEntrance/text.inc +++ b/data/maps/Route8_WestEntrance/text.inc @@ -1,13 +1,13 @@ -gUnknown_819E3ED:: @ 819E3ED +Route8_WestEntrance_Text_ThirstyOnGuardDuty:: @ 819E3ED .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E43D:: @ 819E43D +Route8_WestEntrance_Text_ThatTeaLooksTasty:: @ 819E43D .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E463:: @ 819E463 +Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E463 .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ gUnknown_819E463:: @ 819E463 .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E50F:: @ 819E50F +Route8_WestEntrance_Text_HiHowsItGoing:: @ 819E50F .string "Hi, how's it going?$" diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 9ca5a540e..83dc3497f 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -45,7 +45,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16737A", + "script": "SaffronCity_EventScript_RocketGrunt1", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -58,7 +58,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_167383", + "script": "SaffronCity_EventScript_RocketGrunt2", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -71,7 +71,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16738C", + "script": "SaffronCity_EventScript_RocketGrunt3", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -84,7 +84,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_167395", + "script": "SaffronCity_EventScript_RocketGrunt4", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -97,7 +97,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16739E", + "script": "SaffronCity_EventScript_RocketGrunt5", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -110,7 +110,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673B9", + "script": "SaffronCity_EventScript_DoorGuardGrunt", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -123,7 +123,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673B0", + "script": "SaffronCity_EventScript_RocketGrunt7", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -136,7 +136,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673A7", + "script": "SaffronCity_EventScript_RocketGrunt6", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -149,7 +149,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673EC", + "script": "SaffronCity_EventScript_Youngster", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -162,7 +162,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673E3", + "script": "SaffronCity_EventScript_WorkerM", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -175,7 +175,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16741A", + "script": "SaffronCity_EventScript_Man", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -188,7 +188,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673FE", + "script": "SaffronCity_EventScript_Boy", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -201,7 +201,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_167407", + "script": "SaffronCity_EventScript_Pidgeot", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -214,7 +214,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673F5", + "script": "SaffronCity_EventScript_Lass", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -227,7 +227,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1AD03A", + "script": "SaffronCity_EventScript_BattleGirl", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], @@ -243,7 +243,7 @@ "x": 22, "y": 14, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", + "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", "dest_warp_id": 1 }, { @@ -264,7 +264,7 @@ "x": 27, "y": 21, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE2", + "dest_map": "MAP_SAFFRON_CITY_HOUSE", "dest_warp_id": 1 }, { @@ -285,7 +285,7 @@ "x": 43, "y": 38, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE3", + "dest_map": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", "dest_warp_id": 1 }, { @@ -345,63 +345,63 @@ "x": 29, "y": 14, "elevation": 0, - "script": "SaffronCity_EventScript_167423" + "script": "SaffronCity_EventScript_CitySign" }, { "type": "bg_event_type_0", "x": 42, "y": 14, "elevation": 0, - "script": "SaffronCity_EventScript_16742C" + "script": "SaffronCity_EventScript_DojoSign" }, { "type": "bg_event_type_0", "x": 13, "y": 25, "elevation": 0, - "script": "SaffronCity_EventScript_167471" + "script": "SaffronCity_EventScript_SilphProductSign" }, { "type": "bg_event_type_0", "x": 18, "y": 30, "elevation": 0, - "script": "SaffronCity_EventScript_167456" + "script": "SaffronCity_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 29, "y": 31, "elevation": 0, - "script": "SaffronCity_EventScript_16745F" + "script": "SaffronCity_EventScript_SilphCoSign" }, { "type": "bg_event_type_0", "x": 54, "y": 25, "elevation": 0, - "script": "SaffronCity_EventScript_16744D" + "script": "SaffronCity_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 50, "y": 14, "elevation": 0, - "script": "SaffronCity_EventScript_167435" + "script": "SaffronCity_EventScript_GymSign" }, { "type": "bg_event_type_0", "x": 40, "y": 38, "elevation": 0, - "script": "SaffronCity_EventScript_167468" + "script": "SaffronCity_EventScript_MrPsychicsHouseSign" }, { "type": "bg_event_type_0", "x": 49, "y": 22, "elevation": 0, - "script": "SaffronCity_EventScript_16747A" + "script": "SaffronCity_EventScript_TrainerFanClubSign" } ] } diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 53d697ff0..4b74cd43d 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -4,121 +4,121 @@ SaffronCity_MapScripts:: @ 816735F SaffronCity_OnTransition:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY - call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372 + call_if_unset FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_MoveDoorGuardGrunt end -EventScript_167372:: @ 8167372 +SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372 setobjectxyperm 6, 33, 31 return -SaffronCity_EventScript_16737A:: @ 816737A - msgbox gUnknown_8181003, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt1:: @ 816737A + msgbox SaffronCity_Text_WhatDoYouWantGetLost, MSGBOX_NPC end -SaffronCity_EventScript_167383:: @ 8167383 - msgbox gUnknown_818101F, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt2:: @ 8167383 + msgbox SaffronCity_Text_BossTakeTownForTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_16738C:: @ 816738C - msgbox gUnknown_818105A, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt3:: @ 816738C + msgbox SaffronCity_Text_DontGetDefiantOrIllHurtYou, MSGBOX_NPC end -SaffronCity_EventScript_167395:: @ 8167395 - msgbox gUnknown_8181087, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt4:: @ 8167395 + msgbox SaffronCity_Text_SaffronBelongsToTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_16739E:: @ 816739E - msgbox gUnknown_81810A7, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt5:: @ 816739E + msgbox SaffronCity_Text_CriminalLifeMakesMeFeelAlive, MSGBOX_NPC end -SaffronCity_EventScript_1673A7:: @ 81673A7 - msgbox gUnknown_81810D5, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt6:: @ 81673A7 + msgbox SaffronCity_Text_WatchWhereYoureWalking, MSGBOX_NPC end -SaffronCity_EventScript_1673B0:: @ 81673B0 - msgbox gUnknown_81810F5, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt7:: @ 81673B0 + msgbox SaffronCity_Text_WeCanExploitMonsAroundWorld, MSGBOX_NPC end -SaffronCity_EventScript_1673B9:: @ 81673B9 +SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9 lock - goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7 + goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep applymovement 6, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81812CA + msgbox SaffronCity_Text_ImASecurityGuard release end -EventScript_1673D7:: @ 81673D7 +SaffronCity_EventScript_DoorGuardAsleep:: @ 81673D7 textcolor 3 - msgbox gUnknown_8181302 + msgbox SaffronCity_Text_HesTakingASnooze release end -SaffronCity_EventScript_1673E3:: @ 81673E3 - msgbox gUnknown_8181159, MSGBOX_NPC +SaffronCity_EventScript_WorkerM:: @ 81673E3 + msgbox SaffronCity_Text_YouBeatTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_1673EC:: @ 81673EC - msgbox gUnknown_8181189, MSGBOX_NPC +SaffronCity_EventScript_Youngster:: @ 81673EC + msgbox SaffronCity_Text_SafeToGoOutAgain, MSGBOX_NPC end -SaffronCity_EventScript_1673F5:: @ 81673F5 - msgbox gUnknown_81811BF, MSGBOX_NPC +SaffronCity_EventScript_Lass:: @ 81673F5 + msgbox SaffronCity_Text_PeopleComingBackToSaffron, MSGBOX_NPC end -SaffronCity_EventScript_1673FE:: @ 81673FE - msgbox gUnknown_8181225, MSGBOX_NPC +SaffronCity_EventScript_Boy:: @ 81673FE + msgbox SaffronCity_Text_FlewHereOnPidgeot, MSGBOX_NPC end -SaffronCity_EventScript_167407:: @ 8167407 +SaffronCity_EventScript_Pidgeot:: @ 8167407 lock faceplayer waitse playmoncry SPECIES_PIDGEOT, 0 - msgbox gUnknown_8181286 + msgbox SaffronCity_Text_Pidgeot waitmoncry release end -SaffronCity_EventScript_16741A:: @ 816741A - msgbox gUnknown_8181299, MSGBOX_NPC +SaffronCity_EventScript_Man:: @ 816741A + msgbox SaffronCity_Text_SawRocketBossEscaping, MSGBOX_NPC end -SaffronCity_EventScript_167423:: @ 8167423 - msgbox gUnknown_8181326, MSGBOX_SIGN +SaffronCity_EventScript_CitySign:: @ 8167423 + msgbox SaffronCity_Text_CitySign, MSGBOX_SIGN end -SaffronCity_EventScript_16742C:: @ 816742C - msgbox gUnknown_8181354, MSGBOX_SIGN +SaffronCity_EventScript_DojoSign:: @ 816742C + msgbox SaffronCity_Text_FightingDojo, MSGBOX_SIGN end -SaffronCity_EventScript_167435:: @ 8167435 +SaffronCity_EventScript_GymSign:: @ 8167435 lockall famechecker FAMECHECKER_SABRINA, 0 - msgbox gUnknown_8181362 + msgbox SaffronCity_Text_GymSign releaseall end -SaffronCity_EventScript_16744D:: @ 816744D - msgbox gUnknown_81813AA, MSGBOX_SIGN +SaffronCity_EventScript_TrainerTips1:: @ 816744D + msgbox SaffronCity_Text_FullHealCuresStatus, MSGBOX_SIGN end -SaffronCity_EventScript_167456:: @ 8167456 - msgbox gUnknown_8181452, MSGBOX_SIGN +SaffronCity_EventScript_TrainerTips2:: @ 8167456 + msgbox SaffronCity_Text_GreatBallImprovedCatchRate, MSGBOX_SIGN end -SaffronCity_EventScript_16745F:: @ 816745F - msgbox gUnknown_81814B9, MSGBOX_SIGN +SaffronCity_EventScript_SilphCoSign:: @ 816745F + msgbox SaffronCity_Text_SilphCoSign, MSGBOX_SIGN end -SaffronCity_EventScript_167468:: @ 8167468 - msgbox gUnknown_81814D3, MSGBOX_SIGN +SaffronCity_EventScript_MrPsychicsHouseSign:: @ 8167468 + msgbox SaffronCity_Text_MrPsychicsHouse, MSGBOX_SIGN end -SaffronCity_EventScript_167471:: @ 8167471 - msgbox gUnknown_81814E7, MSGBOX_SIGN +SaffronCity_EventScript_SilphProductSign:: @ 8167471 + msgbox SaffronCity_Text_SilphsLatestProduct, MSGBOX_SIGN end -SaffronCity_EventScript_16747A:: @ 816747A - msgbox gUnknown_8181519, MSGBOX_SIGN +SaffronCity_EventScript_TrainerFanClubSign:: @ 816747A + msgbox SaffronCity_Text_TrainerFanClubSign, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity/text.inc b/data/maps/SaffronCity/text.inc index aaa009647..d3044d14b 100644 --- a/data/maps/SaffronCity/text.inc +++ b/data/maps/SaffronCity/text.inc @@ -1,80 +1,80 @@ -gUnknown_8181003:: @ 8181003 +SaffronCity_Text_WhatDoYouWantGetLost:: @ 8181003 .string "What do you want?\n" .string "Get lost!$" -gUnknown_818101F:: @ 818101F +SaffronCity_Text_BossTakeTownForTeamRocket:: @ 818101F .string "BOSS said he'll take this town\n" .string "in the name of TEAM ROCKET!$" -gUnknown_818105A:: @ 818105A +SaffronCity_Text_DontGetDefiantOrIllHurtYou:: @ 818105A .string "Don't get defiant!\n" .string "Or I'll have to hurt you!$" -gUnknown_8181087:: @ 8181087 +SaffronCity_Text_SaffronBelongsToTeamRocket:: @ 8181087 .string "SAFFRON belongs to TEAM ROCKET!$" -gUnknown_81810A7:: @ 81810A7 +SaffronCity_Text_CriminalLifeMakesMeFeelAlive:: @ 81810A7 .string "My life as a criminal makes me feel\n" .string "so alive!$" -gUnknown_81810D5:: @ 81810D5 +SaffronCity_Text_WatchWhereYoureWalking:: @ 81810D5 .string "Ow!\n" .string "Watch where you're walking!$" -gUnknown_81810F5:: @ 81810F5 +SaffronCity_Text_WeCanExploitMonsAroundWorld:: @ 81810F5 .string "With SILPH under control, we can\n" .string "exploit POKéMON around the world!\p" .string "We'll get stinking rich, yeahah!$" -gUnknown_8181159:: @ 8181159 +SaffronCity_Text_YouBeatTeamRocket:: @ 8181159 .string "You beat TEAM ROCKET all alone?\n" .string "That's amazing!$" -gUnknown_8181189:: @ 8181189 +SaffronCity_Text_SafeToGoOutAgain:: @ 8181189 .string "Yeah! TEAM ROCKET is gone!\n" .string "It's safe to go out again!$" -gUnknown_81811BF:: @ 81811BF +SaffronCity_Text_PeopleComingBackToSaffron:: @ 81811BF .string "People fled from here in droves\n" .string "when those ROCKETS came.\p" .string "They should be flocking back to\n" .string "SAFFRON now.$" -gUnknown_8181225:: @ 8181225 +SaffronCity_Text_FlewHereOnPidgeot:: @ 8181225 .string "I flew here on my PIDGEOT when\n" .string "I read about SILPH.\p" .string "It's already over?\n" .string "I missed the media action…$" -gUnknown_8181286:: @ 8181286 +SaffronCity_Text_Pidgeot:: @ 8181286 .string "PIDGEOT: Bi bibii!$" -gUnknown_8181299:: @ 8181299 +SaffronCity_Text_SawRocketBossEscaping:: @ 8181299 .string "I saw the ROCKET BOSS escaping\n" .string "SILPH's building.$" -gUnknown_81812CA:: @ 81812CA +SaffronCity_Text_ImASecurityGuard:: @ 81812CA .string "I'm a security guard.\p" .string "Suspicious kids I don't allow in!$" -gUnknown_8181302:: @ 8181302 +SaffronCity_Text_HesTakingASnooze:: @ 8181302 .string "…\n" .string "Snore…\p" .string "Hah! He's taking a snooze!$" -gUnknown_8181326:: @ 8181326 +SaffronCity_Text_CitySign:: @ 8181326 .string "SAFFRON CITY\n" .string "Shining, Golden Land of Commerce$" -gUnknown_8181354:: @ 8181354 +SaffronCity_Text_FightingDojo:: @ 8181354 .string "FIGHTING DOJO$" -gUnknown_8181362:: @ 8181362 +SaffronCity_Text_GymSign:: @ 8181362 .string "SAFFRON CITY POKéMON GYM\n" .string "LEADER: SABRINA\l" .string "The Master of PSYCHIC POKéMON!$" -gUnknown_81813AA:: @ 81813AA +SaffronCity_Text_FullHealCuresStatus:: @ 81813AA .string "TRAINER TIPS\p" .string "FULL HEAL cures all ailments like\n" .string "burns, paralysis, poisoning,\l" @@ -82,25 +82,34 @@ gUnknown_81813AA:: @ 81813AA .string "It costs a bit more, but it's more\n" .string "convenient than buying other items.$" -gUnknown_8181452:: @ 8181452 +SaffronCity_Text_GreatBallImprovedCatchRate:: @ 8181452 .string "TRAINER TIPS\p" .string "The new GREAT BALL offers improved\n" .string "catching rates.\p" .string "Try it on those hard-to-catch\n" .string "POKéMON.$" -gUnknown_81814B9:: @ 81814B9 +SaffronCity_Text_SilphCoSign:: @ 81814B9 .string "SILPH CO. OFFICE BUILDING$" -gUnknown_81814D3:: @ 81814D3 +SaffronCity_Text_MrPsychicsHouse:: @ 81814D3 .string "MR. PSYCHIC'S HOUSE$" -gUnknown_81814E7:: @ 81814E7 +SaffronCity_Text_SilphsLatestProduct:: @ 81814E7 .string "SILPH's latest product!\n" .string "Release to be determined…$" -gUnknown_8181519:: @ 8181519 +SaffronCity_Text_TrainerFanClubSign:: @ 8181519 .string "POKéMON TRAINER FAN CLUB\p" .string "Many TRAINERS have scribbled their\n" .string "names on this sign.$" +SaffronCity_Text_HowCanClubNotRecognizeLance:: @ 8181569 + .string "This FAN CLUB…\n" + .string "No one here has a clue!\p" + .string "How could they not recognize\n" + .string "the brilliance that is LANCE?\p" + .string "He stands for justice!\n" + .string "He's cool, and yet passionate!\l" + .string "He's the greatest, LANCE!$" + diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json new file mode 100644 index 000000000..bb33e6ea3 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "name": "SaffronCity_CopycatsHouse_1F", + "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_1F_EventScript_Chansey", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc new file mode 100644 index 000000000..e6f779e15 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc @@ -0,0 +1,20 @@ +SaffronCity_CopycatsHouse_1F_MapScripts:: @ 816EB36 + .byte 0 + +SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom:: @ 816EB37 + msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered, MSGBOX_NPC + end + +SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad:: @ 816EB40 + msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople, MSGBOX_NPC + end + +SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: @ 816EB49 + lock + faceplayer + waitse + playmoncry SPECIES_CHANSEY, 0 + msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey + waitmoncry + release + end diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/text.inc b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc new file mode 100644 index 000000000..d7efe0281 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc @@ -0,0 +1,13 @@ +SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered:: @ 819AB9B + .string "My daughter is so self-centered.\n" + .string "She has but a few friends.$" + +SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople:: @ 819ABD7 + .string "My daughter likes to mimic people.\n" + .string "It's rather vexing.\p" + .string "Her mimicry has earned her the\n" + .string "nickname COPYCAT around here.$" + +SaffronCity_CopycatsHouse_1F_Text_Chansey:: @ 819AC4B + .string "CHANSEY: Chaan! Sii!$" + diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json new file mode 100644 index 000000000..ab920aa73 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -0,0 +1,105 @@ +{ + "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "name": "SaffronCity_CopycatsHouse_2F", + "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_DODUO", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doduo", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Copycat", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 1, + "y": 1, + "elevation": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Computer" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 5, + "elevation": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Game" + }, + { + "type": "hidden_item", + "x": 2, + "y": 1, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET", + "quantity": 1, + "underfoot": false + } + ] +} diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc new file mode 100644 index 000000000..a8e74c94b --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc @@ -0,0 +1,50 @@ +SaffronCity_CopycatsHouse_2F_MapScripts:: @ 816EB5C + .byte 0 + +SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: @ 816EB5D + lock + faceplayer + waitse + playmoncry SPECIES_DODUO, 0 + msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo + waitmoncry + release + end + +SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70 + lock + msgbox SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll + release + end + +SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B + goto_if_questlog EventScript_ReleaseEnd + special sub_8112364 + lock + faceplayer + checkitem ITEM_POKE_DOLL, 1 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_MimicTutor + checkplayergender + compare VAR_RESULT, MALE + call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale + compare VAR_RESULT, FEMALE + call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale + release + end + +SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale:: @ 816EBB7 + msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale + return + +SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale:: @ 816EBC0 + msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale + return + +SaffronCity_CopycatsHouse_2F_EventScript_Computer:: @ 816EBC9 + msgbox SaffronCity_CopycatsHouse_2F_Text_MySecrets, MSGBOX_SIGN + end + +SaffronCity_CopycatsHouse_2F_EventScript_Game:: @ 816EBD2 + msgbox SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket, MSGBOX_SIGN + end diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/text.inc b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc new file mode 100644 index 000000000..978b660f5 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc @@ -0,0 +1,102 @@ +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale:: @ 819AC60 + .string "{PLAYER}: Hi!\n" + .string "Do you like POKéMON?\p" + .string "{PLAYER}: Uh, no, I just asked you.\p" + .string "{PLAYER}: Huh?\n" + .string "You're strange!\p" + .string "COPYCAT: Hmm? Quit mimicking?\n" + .string "But, that's my favorite hobby!$" + +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale:: @ 819ACF1 + .string "{PLAYER}: Hi.\n" + .string "You must like POKéMON.\p" + .string "{PLAYER}: No, not me.\n" + .string "I asked you.\p" + .string "{PLAYER}: Pardon?\n" + .string "You're weird!\l" + .string " \l" + .string "COPYCAT: Hmm? Quit mimicking?\l" + .string "But that's my favorite hobby!$" + +Text_MimicTeach:: @ 819AD85 + .string "Oh wow!\n" + .string "A POKé DOLL!\p" + .string "For me?\n" + .string "Thank you!\p" + .string "You know what?\n" + .string "I can teach the move MIMIC.$" + +Text_MimicDeclined:: @ 819ADD8 + .string "Don't you like MIMIC?$" + +Text_MimicWhichMon:: @ 819ADEE + .string "I really love MIMIC!\n" + .string "Who's going to learn it?$" + +Text_MimicTaughtMale:: @ 819AE1C + .string "{PLAYER}: Hi!\n" + .string "Thanks for earlier!\p" + .string "{PLAYER}: Pardon?\p" + .string "{PLAYER}: Is it that fun to mimic my\n" + .string "every move?\p" + .string "COPYCAT: You bet!\n" + .string "It's a scream!$" + +Text_MimicTaughtFemale:: @ 819AE90 + .string "{PLAYER}: Hi!\n" + .string "Thanks for what you did for us.\p" + .string "{PLAYER}: Pardon?\p" + .string "{PLAYER}: Is it really that fun to\n" + .string "copy what I say and do?\p" + .string "COPYCAT: You bet!\n" + .string "It's a scream!$" + +SaffronCity_CopycatsHouse_2F_Text_TooMuchInBag:: @ 819AF1A + .string "にもつが　いっぱいね！$" + +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMaleJP:: @ 819AF26 + .string "{PLAYER}“やあ！　こんにちは！\n" + .string "きみ　ポケモン　すきかい？\p" + .string "{PLAYER}“ぼく　じゃなくって\n" + .string "きみに　きいてるんだ　けど\p" + .string "{PLAYER}“‥‥　えー　なんだよ！\n" + .string "ヘンな　やつ　だなあ！\p" + .string "モノマネむすめ“‥‥　なに？\n" + .string "ひとの　マネ　すんなって？\p" + .string "だって　あたし　\n" + .string "ものまね　しゅみ　なんだ　もん！”$" + +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemaleJP:: @ 819AFB0 + .string "{PLAYER}“こんにちは！\n" + .string "ポケモン　すきなのね？\p" + .string "{PLAYER}“わたし　じゃなくって\n" + .string "あなたに　きいてるんだ　けど\p" + .string "{PLAYER}“‥　えー　なんなの！\n" + .string "おかしなこ　ねー！\p" + .string "モノマネむすめ“‥　なに？\n" + .string "ひとの　マネ　すんなって？\p" + .string "だって　あたし\n" + .string "ものまね　しゅみ　なんだ　もん！$" + +SaffronCity_CopycatsHouse_2F_Text_Doduo:: @ 819B030 + .string "DODUO: Giiih!\p" + .string "PRETTY MIRROR LOOK AT ME,\n" + .string "SEE HOW PRETTY I CAN BE?$" + +SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll:: @ 819B071 + .string "This is a rare POKéMON!\n" + .string "Huh? It's only a doll!$" + +SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket:: @ 819B0A0 + .string "A game with MARIO wearing a bucket\n" + .string "on his head!$" + +SaffronCity_CopycatsHouse_2F_Text_MySecrets:: @ 819B0D0 + .string "…\p" + .string "My Secrets!\p" + .string "Skill: Mimicry!\n" + .string "Hobby: Collecting dolls!\l" + .string "Favorite POKéMON: CLEFAIRY!$" + +SaffronCity_CopycatsHouse_2F_Text_HuhCantSee:: @ 819B123 + .string "？　みえないぞ‥$" diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index d6e1d9d4d..699ead653 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED46", + "script": "SaffronCity_Dojo_EventScript_Hitoshi", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED5D", + "script": "SaffronCity_Dojo_EventScript_Hideki", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED74", + "script": "SaffronCity_Dojo_EventScript_Aaron", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED8B", + "script": "SaffronCity_Dojo_EventScript_Mike", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SaffronCity_Dojo_EventScript_16EDA2", + "script": "SaffronCity_Dojo_EventScript_MasterKoichi", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Dojo_EventScript_16EC00", + "script": "SaffronCity_Dojo_EventScript_HitmonleeBall", "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Dojo_EventScript_16EC46", + "script": "SaffronCity_Dojo_EventScript_HitmonchanBall", "flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL" } ], @@ -136,7 +136,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, - "script": "SaffronCity_Dojo_EventScript_16EBDC" + "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, - "script": "SaffronCity_Dojo_EventScript_16EBEE" + "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleRight" } ], "bg_events": [ @@ -154,28 +154,28 @@ "x": 3, "y": 13, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED2B" + "script": "SaffronCity_Dojo_EventScript_Statue" }, { "type": "bg_event_type_0", "x": 9, "y": 13, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED2B" + "script": "SaffronCity_Dojo_EventScript_Statue" }, { "type": "bg_event_type_0", "x": 5, "y": 2, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED34" + "script": "SaffronCity_Dojo_EventScript_LeftScroll" }, { "type": "bg_event_type_0", "x": 7, "y": 2, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED3D" + "script": "SaffronCity_Dojo_EventScript_RightScroll" } ] } diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index d5c3e6603..88e53d64c 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -1,157 +1,159 @@ +.equ LOCALID_KARATE_MASTER, 5 + SaffronCity_Dojo_MapScripts:: @ 816EBDB .byte 0 -SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC +SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft waitmovement 0 releaseall end -SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE +SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_WalkInPlaceFastestRight + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight waitmovement 0 releaseall end -SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 +SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00 lock faceplayer - goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONLEE - applymovement 5, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 - msgbox gUnknown_819B44E, MSGBOX_YESNO + msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, YES - goto_if_eq EventScript_16EC82 + goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon erasemonpic release end -EventScript_16EC3C:: @ 816EC3C - msgbox gUnknown_819B4E1 +SaffronCity_Dojo_EventScript_AlreadyGotHitmon:: @ 816EC3C + msgbox SaffronCity_Dojo_Text_BetterNotGetGreedy release end -SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 +SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46 lock faceplayer - goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONCHAN - applymovement 5, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 - msgbox gUnknown_819B49E, MSGBOX_YESNO + msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, YES - goto_if_eq EventScript_16EC82 + goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon erasemonpic release end -EventScript_16EC82:: @ 816EC82 +SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82 erasemonpic givemon VAR_TEMP_1, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_16ECB5 + goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16ECEC + goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonPC compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon release end -EventScript_16ECB5:: @ 816ECB5 +SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 - message Text_19B473 + message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16ED29 + goto_if_eq SaffronCity_Dojo_EventScript_EndGiveMon call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname - goto EventScript_16ED29 + goto SaffronCity_Dojo_EventScript_EndGiveMon end -EventScript_16ECEC:: @ 816ECEC +SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 - message Text_19B473 + message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16ED1E + goto_if_eq SaffronCity_Dojo_EventScript_TransferredHitmonToPC call EventScript_NameReceivedBoxMon - goto EventScript_16ED1E + goto SaffronCity_Dojo_EventScript_TransferredHitmonToPC end -EventScript_16ED1E:: @ 816ED1E +SaffronCity_Dojo_EventScript_TransferredHitmonToPC:: @ 816ED1E call EventScript_TransferredToPC - goto EventScript_16ED29 + goto SaffronCity_Dojo_EventScript_EndGiveMon end -EventScript_16ED29:: @ 816ED29 +SaffronCity_Dojo_EventScript_EndGiveMon:: @ 816ED29 release end -SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B - msgbox gUnknown_819B52E, MSGBOX_SIGN +SaffronCity_Dojo_EventScript_Statue:: @ 816ED2B + msgbox SaffronCity_Dojo_Text_FightingDojo, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 - msgbox gUnknown_819B4F8, MSGBOX_SIGN +SaffronCity_Dojo_EventScript_LeftScroll:: @ 816ED34 + msgbox SaffronCity_Dojo_Text_EnemiesOnEverySide, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D - msgbox gUnknown_819B50F, MSGBOX_SIGN +SaffronCity_Dojo_EventScript_RightScroll:: @ 816ED3D + msgbox SaffronCity_Dojo_Text_GoesAroundComesAround, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F - msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Hitoshi:: @ 816ED46 + trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat + msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD - msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Hideki:: @ 816ED5D + trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat + msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396 - msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Aaron:: @ 816ED74 + trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat + msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292 - msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Mike:: @ 816ED8B + trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat + msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0 - goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6 - msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_MasterKoichi:: @ 816EDA2 + trainerbattle_single TRAINER_BLACK_BELT_KOICHI, SaffronCity_Dojo_Text_MasterKoichiIntro, SaffronCity_Dojo_Text_MasterKoichiDefeat, SaffronCity_Dojo_EventScript_DefeatedMasterKoichi + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon + msgbox SaffronCity_Dojo_Text_ChoosePrizedFightingMon, MSGBOX_AUTOCLOSE end -EventScript_16EDC6:: @ 816EDC6 - msgbox gUnknown_819B24C +SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon:: @ 816EDC6 + msgbox SaffronCity_Dojo_Text_StayAndTrainWithUs release end -EventScript_16EDD0:: @ 816EDD0 +SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: @ 816EDD0 setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 release end diff --git a/data/maps/SaffronCity_Dojo/text.inc b/data/maps/SaffronCity_Dojo/text.inc index d85b5a843..9c73ffcb9 100644 --- a/data/maps/SaffronCity_Dojo/text.inc +++ b/data/maps/SaffronCity_Dojo/text.inc @@ -1,7 +1,4 @@ -Text_19B123:: @ 819B123 - .string "？　みえないぞ‥$" - -Text_19B12C:: @ 819B12C +SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C .string "Grunt!\p" .string "I am the KARATE MASTER!\n" .string "I am the LEADER here!\p" @@ -9,11 +6,11 @@ Text_19B12C:: @ 819B12C .string "Expect no mercy!\p" .string "Fwaaa!$" -Text_19B193:: @ 819B193 +SaffronCity_Dojo_Text_MasterKoichiDefeat:: @ 819B193 .string "Hwa!\n" .string "Arrgh! Beaten!$" -gUnknown_819B1A7:: @ 819B1A7 +SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7 .string "Indeed, I have lost!\p" .string "But, I beseech you, do not take\n" .string "our emblem as your trophy!\p" @@ -21,85 +18,85 @@ gUnknown_819B1A7:: @ 819B1A7 .string "FIGHTING POKéMON!\p" .string "Choose whichever one you like!$" -gUnknown_819B24C:: @ 819B24C +SaffronCity_Dojo_Text_StayAndTrainWithUs:: @ 819B24C .string "Grunt!\n" .string "Stay and train at karate with us!$" -Text_19B275:: @ 819B275 +SaffronCity_Dojo_Text_MikeIntro:: @ 819B275 .string "Hoargh!\n" .string "Take your shoes off!$" -Text_19B292:: @ 819B292 +SaffronCity_Dojo_Text_MikeDefeat:: @ 819B292 .string "I give up!$" -gUnknown_819B29D:: @ 819B29D +SaffronCity_Dojo_Text_MikePostBattle:: @ 819B29D .string "You wait 'til you see our MASTER!\n" .string "I'm a small fry compared to him!$" -Text_19B2E0:: @ 819B2E0 +SaffronCity_Dojo_Text_HidekiIntro:: @ 819B2E0 .string "I hear you're good!\n" .string "Show me!$" -Text_19B2FD:: @ 819B2FD +SaffronCity_Dojo_Text_HidekiDefeat:: @ 819B2FD .string "Judge!\n" .string "One point!$" -gUnknown_819B30F:: @ 819B30F +SaffronCity_Dojo_Text_HidekiPostBattle:: @ 819B30F .string "Our MASTER is a pro fighter.\n" .string "Be prepared to lose!$" -Text_19B341:: @ 819B341 +SaffronCity_Dojo_Text_AaronIntro:: @ 819B341 .string "Hiyah!\n" .string "I have no fear for anything tough!\p" .string "I shatter boulders for training\n" .string "every day!$" -Text_19B396:: @ 819B396 +SaffronCity_Dojo_Text_AaronDefeat:: @ 819B396 .string "Yow!\n" .string "Stubbed fingers!$" -gUnknown_819B3AC:: @ 819B3AC +SaffronCity_Dojo_Text_AaronPostBattle:: @ 819B3AC .string "The only thing that frightens us is\n" .string "psychic power!$" -Text_19B3DF:: @ 819B3DF +SaffronCity_Dojo_Text_HitoshiIntro:: @ 819B3DF .string "Hwaah!\p" .string "You're trespassing in our\n" .string "FIGHTING DOJO!$" -Text_19B40F:: @ 819B40F +SaffronCity_Dojo_Text_HitoshiDefeat:: @ 819B40F .string "Oof!\n" .string "I give up!$" -gUnknown_819B41F:: @ 819B41F +SaffronCity_Dojo_Text_HitoshiPostBattle:: @ 819B41F .string "The prime fighters across the land\n" .string "train here.$" -gUnknown_819B44E:: @ 819B44E +SaffronCity_Dojo_Text_YouWantHitmonlee:: @ 819B44E .string "You want the hard-kicking\n" .string "HITMONLEE?$" -Text_19B473:: @ 819B473 +SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster:: @ 819B473 .string "{PLAYER} received the {STR_VAR_1}\n" .string "from the KARATE MASTER.$" -gUnknown_819B49E:: @ 819B49E +SaffronCity_Dojo_Text_YouWantHitmonchan:: @ 819B49E .string "You want the piston-punching\n" .string "HITMONCHAN?$" -Text_19B4C7:: @ 819B4C7 +SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2:: @ 819B4C7 .string "{PLAYER}は　カラテ　だいおう　から\n" .string "{STR_VAR_1}を　もらった！$" -gUnknown_819B4E1:: @ 819B4E1 +SaffronCity_Dojo_Text_BetterNotGetGreedy:: @ 819B4E1 .string "Better not get greedy…$" -gUnknown_819B4F8:: @ 819B4F8 +SaffronCity_Dojo_Text_EnemiesOnEverySide:: @ 819B4F8 .string "Enemies on every side!$" -gUnknown_819B50F:: @ 819B50F +SaffronCity_Dojo_Text_GoesAroundComesAround:: @ 819B50F .string "What goes around comes around.$" -gUnknown_819B52E:: @ 819B52E +SaffronCity_Dojo_Text_FightingDojo:: @ 819B52E .string "FIGHTING DOJO$" diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index cfbf00b36..0ebd439e5 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EEC3", + "script": "SaffronCity_Gym_EventScript_Cameron", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EE88", + "script": "SaffronCity_Gym_EventScript_Johan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EEDA", + "script": "SaffronCity_Gym_EventScript_Preston", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EEF1", + "script": "SaffronCity_Gym_EventScript_Amanda", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EF08", + "script": "SaffronCity_Gym_EventScript_Stacy", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EF1F", + "script": "SaffronCity_Gym_EventScript_Tasha", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Gym_EventScript_16EDD8", + "script": "SaffronCity_Gym_EventScript_Sabrina", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EE9F", + "script": "SaffronCity_Gym_EventScript_Tyron", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Gym_EventScript_16EF36", + "script": "SaffronCity_Gym_EventScript_GymGuy", "flag": "0" } ], @@ -371,14 +371,14 @@ "x": 12, "y": 20, "elevation": 0, - "script": "SaffronCity_Gym_EventScript_16EF55" + "script": "SaffronCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 16, "y": 20, "elevation": 0, - "script": "SaffronCity_Gym_EventScript_16EF55" + "script": "SaffronCity_Gym_EventScript_GymStatue" } ] } diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index afe863e89..8b4542fab 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -1,97 +1,97 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7 .byte 0 -SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 +SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8 famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC - goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D - msgbox gUnknown_819B7F2 + trainerbattle_single TRAINER_LEADER_SABRINA, SaffronCity_Gym_Text_SabrinaIntro, SaffronCity_Gym_Text_SabrinaDefeat, SaffronCity_Gym_EventScript_DefeatedSabrina, NO_MUSIC + goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, SaffronCity_Gym_EventScript_GiveTM04 + msgbox SaffronCity_Gym_Text_ExplainTM04 release end -EventScript_16EE0A:: @ 816EE0A +SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A famechecker FAMECHECKER_SABRINA, 2 famechecker FAMECHECKER_SABRINA, 3 clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS setflag FLAG_DEFEATED_SABRINA setflag FLAG_BADGE06_GET set_gym_trainers 6 - goto EventScript_16EE3D + goto SaffronCity_Gym_EventScript_GiveTM04 end -EventScript_16EE3D:: @ 816EE3D - msgbox gUnknown_819B6FA +SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D + msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis checkitemspace ITEM_TM04, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16EE7E - giveitem_msg gUnknown_819B7D3, ITEM_TM04 + goto_if_eq SaffronCity_Gym_EventScript_NoRoomForTM04 + giveitem_msg SaffronCity_Gym_Text_ReceivedTM04FromSabrina, ITEM_TM04 setflag FLAG_GOT_TM04_FROM_SABRINA - msgbox gUnknown_819B685 + msgbox SaffronCity_Gym_Text_SabrinaPostBattle release end -EventScript_16EE7E:: @ 816EE7E - msgbox gUnknown_819B849 +SaffronCity_Gym_EventScript_NoRoomForTM04:: @ 816EE7E + msgbox SaffronCity_Gym_Text_BagFullOfOtherItems release end -SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 - trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957 - msgbox gUnknown_819B96D, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Johan:: @ 816EE88 + trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat + msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F - trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E +SaffronCity_Gym_EventScript_Tyron:: @ 816EE9F + trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat famechecker FAMECHECKER_SABRINA, 5 - msgbox gUnknown_819BAB4, MSGBOX_AUTOCLOSE + msgbox SaffronCity_Gym_Text_TyronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 - trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1 - msgbox gUnknown_819BBB3, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Cameron:: @ 816EEC3 + trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat + msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA - trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC - msgbox gUnknown_819BCC4, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Preston:: @ 816EEDA + trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat + msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 - trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8 - msgbox gUnknown_819B8B9, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Amanda:: @ 816EEF1 + trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat + msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 - trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC - msgbox gUnknown_819B9F7, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Stacy:: @ 816EF08 + trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat + msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F - trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D - msgbox gUnknown_819BB1F, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Tasha:: @ 816EF1F + trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat + msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 +SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36 lock faceplayer - goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B - msgbox gUnknown_819BCF6 + goto_if_set FLAG_DEFEATED_SABRINA, SaffronCity_Gym_EventScript_GymGuyPostVictory + msgbox SaffronCity_Gym_Text_GymGuyAdvice release end -EventScript_16EF4B:: @ 816EF4B - msgbox gUnknown_819BDBB +SaffronCity_Gym_EventScript_GymGuyPostVictory:: @ 816EF4B + msgbox SaffronCity_Gym_Text_GymGuyPostVictory release end -SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 +SaffronCity_Gym_EventScript_GymStatue:: @ 816EF55 lockall - goto_if_set FLAG_BADGE06_GET, EventScript_16EF69 - msgbox gUnknown_819BDFE + goto_if_set FLAG_BADGE06_GET, SaffronCity_Gym_EventScript_GymStatuePostVictory + msgbox SaffronCity_Gym_Text_GymStatue releaseall end -EventScript_16EF69:: @ 816EF69 - msgbox gUnknown_819BE37 +SaffronCity_Gym_EventScript_GymStatuePostVictory:: @ 816EF69 + msgbox SaffronCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc index ed48d983f..827d4bbd5 100644 --- a/data/maps/SaffronCity_Gym/text.inc +++ b/data/maps/SaffronCity_Gym/text.inc @@ -1,4 +1,4 @@ -Text_19B53C:: @ 819B53C +SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C .string "I had a vision of your arrival.\p" .string "I have had psychic powers since\n" .string "I was a child.\p" @@ -7,7 +7,7 @@ Text_19B53C:: @ 819B53C .string "I dislike battling, but if you wish,\n" .string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$" -Text_19B602:: @ 819B602 +SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602 .string "This loss shocks me!\n" .string "But, a loss is a loss.\p" .string "I admit, I didn't work hard enough\n" @@ -15,13 +15,13 @@ Text_19B602:: @ 819B602 .string "Your victory has earned you the\n" .string "MARSHBADGE.$" -gUnknown_819B685:: @ 819B685 +SaffronCity_Gym_Text_SabrinaPostBattle:: @ 819B685 .string "Psychic power isn't something that\n" .string "only a few people have.\p" .string "Everyone has psychic power.\n" .string "People just don't realize it.$" -gUnknown_819B6FA:: @ 819B6FA +SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA .string "The MARSHBADGE makes POKéMON up\n" .string "to Lv. 70 obey you.\p" .string "Stronger POKéMON will become wild,\n" @@ -30,87 +30,87 @@ gUnknown_819B6FA:: @ 819B6FA .string "much to avoid that problem.\p" .string "Wait, please take this TM with you.$" -gUnknown_819B7D3:: @ 819B7D3 +SaffronCity_Gym_Text_ReceivedTM04FromSabrina:: @ 819B7D3 .string "{PLAYER} received TM04 from\n" .string "SABRINA.$" -gUnknown_819B7F2:: @ 819B7F2 +SaffronCity_Gym_Text_ExplainTM04:: @ 819B7F2 .string "TM04 is CALM MIND.\p" .string "It makes the POKéMON concentrate\n" .string "to raise both SP. ATK and SP. DEF.$" -gUnknown_819B849:: @ 819B849 +SaffronCity_Gym_Text_BagFullOfOtherItems:: @ 819B849 .string "Your BAG is full of other items.$" -Text_19B86A:: @ 819B86A +SaffronCity_Gym_Text_AmandaIntro:: @ 819B86A .string "SABRINA is far younger than I,\n" .string "but she has earned my respect.$" -Text_19B8A8:: @ 819B8A8 +SaffronCity_Gym_Text_AmandaDefeat:: @ 819B8A8 .string "Not good enough!$" -gUnknown_819B8B9:: @ 819B8B9 +SaffronCity_Gym_Text_AmandaPostBattle:: @ 819B8B9 .string "In a battle of equals, the one\n" .string "with the stronger will wins.\p" .string "If you wish to beat SABRINA, focus\n" .string "and will yourself to victory.$" -Text_19B936:: @ 819B936 +SaffronCity_Gym_Text_JohanIntro:: @ 819B936 .string "Does our unseen power scare you?$" -Text_19B957:: @ 819B957 +SaffronCity_Gym_Text_JohanDefeat:: @ 819B957 .string "I never foresaw this!$" -gUnknown_819B96D:: @ 819B96D +SaffronCity_Gym_Text_JohanPostBattle:: @ 819B96D .string "PSYCHIC POKéMON fear only ghosts\n" .string "and bugs!$" -Text_19B998:: @ 819B998 +SaffronCity_Gym_Text_StacyIntro:: @ 819B998 .string "POKéMON take on the appearance of\n" .string "their TRAINERS.\p" .string "Your POKéMON must be tough, then!$" -Text_19B9EC:: @ 819B9EC +SaffronCity_Gym_Text_StacyDefeat:: @ 819B9EC .string "I knew it!$" -gUnknown_819B9F7:: @ 819B9F7 +SaffronCity_Gym_Text_StacyPostBattle:: @ 819B9F7 .string "I have much to learn still…\p" .string "I must master PSYCHIC and teach it\n" .string "to my POKéMON…$" -Text_19BA45:: @ 819BA45 +SaffronCity_Gym_Text_TyronIntro:: @ 819BA45 .string "You understand, don't you?\p" .string "That power alone isn't enough to\n" .string "win in the world of POKéMON?$" -Text_19BA9E:: @ 819BA9E +SaffronCity_Gym_Text_TyronDefeat:: @ 819BA9E .string "I don't believe this!$" -gUnknown_819BAB4:: @ 819BAB4 +SaffronCity_Gym_Text_TyronPostBattle:: @ 819BAB4 .string "SABRINA just wiped out the KARATE\n" .string "MASTER next door.$" -Text_19BAE8:: @ 819BAE8 +SaffronCity_Gym_Text_TashaIntro:: @ 819BAE8 .string "You and I, our POKéMON shall\n" .string "battle!$" -Text_19BB0D:: @ 819BB0D +SaffronCity_Gym_Text_TashaDefeat:: @ 819BB0D .string "I lost after all!$" -gUnknown_819BB1F:: @ 819BB1F +SaffronCity_Gym_Text_TashaPostBattle:: @ 819BB1F .string "I knew that this was going to take\n" .string "place.$" -Text_19BB49:: @ 819BB49 +SaffronCity_Gym_Text_CameronIntro:: @ 819BB49 .string "SABRINA is young, but she's also\n" .string "our highly skilled LEADER.\p" .string "You won't reach her easily!$" -Text_19BBA1:: @ 819BBA1 +SaffronCity_Gym_Text_CameronDefeat:: @ 819BBA1 .string "Ow!\n" .string "Down and out!$" -gUnknown_819BBB3:: @ 819BBB3 +SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3 .string "There used to be two POKéMON GYMS\n" .string "in SAFFRON.\p" .string "The FIGHTING DOJO next door lost\n" @@ -118,20 +118,20 @@ gUnknown_819BBB3:: @ 819BBB3 .string "We simply creamed them when we\n" .string "decided to have just one GYM.$" -Text_19BC57:: @ 819BC57 +SaffronCity_Gym_Text_PrestonIntro:: @ 819BC57 .string "SAFFRON POKéMON GYM is famous for\n" .string "training psychics.\p" .string "You want to see SABRINA, don't\n" .string "you? I can tell!$" -Text_19BCBC:: @ 819BCBC +SaffronCity_Gym_Text_PrestonDefeat:: @ 819BCBC .string "Arrrgh!$" -gUnknown_819BCC4:: @ 819BCC4 +SaffronCity_Gym_Text_PrestonPostBattle:: @ 819BCC4 .string "That's right! I used telepathy to\n" .string "read your mind!$" -gUnknown_819BCF6:: @ 819BCF6 +SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6 .string "Yo!\n" .string "Champ in the making!\p" .string "SABRINA's POKéMON use psychic\n" @@ -141,18 +141,18 @@ gUnknown_819BCF6:: @ 819BCF6 .string "They'll get destroyed before they\n" .string "can even aim a punch!$" -gUnknown_819BDBB:: @ 819BDBB +SaffronCity_Gym_Text_GymGuyPostVictory:: @ 819BDBB .string "Psychic power, huh?\p" .string "If I had that, I'd make a bundle\n" .string "at the slots!$" -gUnknown_819BDFE:: @ 819BDFE +SaffronCity_Gym_Text_GymStatue:: @ 819BDFE .string "SAFFRON POKéMON GYM\n" .string "LEADER: SABRINA\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_819BE37:: @ 819BE37 +SaffronCity_Gym_Text_GymStatuePlayerWon:: @ 819BE37 .string "SAFFRON POKéMON GYM\n" .string "LEADER: SABRINA\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json new file mode 100644 index 000000000..48b569e5e --- /dev/null +++ b/data/maps/SaffronCity_House/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE", + "name": "SaffronCity_House", + "layout": "LAYOUT_HOUSE5", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House_EventScript_Pidgey", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_LASS", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House_EventScript_Lass", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House_EventScript_Youngster", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 3, + "script": "SaffronCity_House_EventScript_Letter" + } + ] +} diff --git a/data/maps/SaffronCity_House/scripts.inc b/data/maps/SaffronCity_House/scripts.inc new file mode 100644 index 000000000..d94baa8a0 --- /dev/null +++ b/data/maps/SaffronCity_House/scripts.inc @@ -0,0 +1,24 @@ +SaffronCity_House_MapScripts:: @ 816EF73 + .byte 0 + +SaffronCity_House_EventScript_Lass:: @ 816EF74 + msgbox SaffronCity_House_Text_DontLookAtMyLetter, MSGBOX_NPC + end + +SaffronCity_House_EventScript_Youngster:: @ 816EF7D + msgbox SaffronCity_House_Text_GettingCopycatPokeDoll, MSGBOX_NPC + end + +SaffronCity_House_EventScript_Pidgey:: @ 816EF86 + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEY, 0 + msgbox SaffronCity_House_Text_Pidgey + waitmoncry + release + end + +SaffronCity_House_EventScript_Letter:: @ 816EF99 + msgbox SaffronCity_House_Text_ExplainPPUp, MSGBOX_SIGN + end diff --git a/data/maps/SaffronCity_House/text.inc b/data/maps/SaffronCity_House/text.inc new file mode 100644 index 000000000..7d13c13fa --- /dev/null +++ b/data/maps/SaffronCity_House/text.inc @@ -0,0 +1,20 @@ +SaffronCity_House_Text_DontLookAtMyLetter:: @ 819BE74 + .string "…Thank you for writing.\n" + .string "I hope to see you soon!\p" + .string "…Hey!\n" + .string "Don't look at my letter!$" + +SaffronCity_House_Text_Pidgey:: @ 819BEC3 + .string "PIDGEY: Kurukkoo!$" + +SaffronCity_House_Text_GettingCopycatPokeDoll:: @ 819BED5 + .string "The COPYCAT is cute!\n" + .string "I'm getting her a POKé DOLL.$" + +SaffronCity_House_Text_ExplainPPUp:: @ 819BF07 + .string "I was given a PP UP as a gift.\p" + .string "It's used to increase the PP of\n" + .string "a POKéMON's move.\p" + .string "I should use it on a powerful move\n" + .string "with only a few PP.$" + diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json deleted file mode 100644 index 4f7e0a241..000000000 --- a/data/maps/SaffronCity_House1_1F/map.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_HOUSE1_1F", - "name": "SaffronCity_House1_1F", - "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", - "music": "MUS_NIBI", - "region_map_section": "MAPSEC_SAFFRON_CITY", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", - "x": 8, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_1F_EventScript_16EB40", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", - "x": 3, - "y": 3, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_1F_EventScript_16EB37", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", - "x": 4, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", - "movement_range_x": 1, - "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_1F_EventScript_16EB49", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 3, - "y": 8, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 8, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 1 - }, - { - "x": 5, - "y": 8, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 1 - }, - { - "x": 10, - "y": 2, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_2F", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc deleted file mode 100644 index 2f4e435fa..000000000 --- a/data/maps/SaffronCity_House1_1F/scripts.inc +++ /dev/null @@ -1,20 +0,0 @@ -SaffronCity_House1_1F_MapScripts:: @ 816EB36 - .byte 0 - -SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 - msgbox gUnknown_819AB9B, MSGBOX_NPC - end - -SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 - msgbox gUnknown_819ABD7, MSGBOX_NPC - end - -SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 - lock - faceplayer - waitse - playmoncry SPECIES_CHANSEY, 0 - msgbox gUnknown_819AC4B - waitmoncry - release - end diff --git a/data/maps/SaffronCity_House1_1F/text.inc b/data/maps/SaffronCity_House1_1F/text.inc deleted file mode 100644 index 04bedb057..000000000 --- a/data/maps/SaffronCity_House1_1F/text.inc +++ /dev/null @@ -1,32 +0,0 @@ -Text_19A9E7:: @ 819A9E7 - .string "AGATHA's GHOST-type POKéMON are\n" - .string "horrifically terrifying in toughness.\p" - .string "I took my FIGHTING-type POKéMON\n" - .string "and raised them to the max.\p" - .string "I went at AGATHA feeling pretty\n" - .string "confident, but she whupped us.\p" - .string "That old lady's also got a really\n" - .string "short fuse, too.\p" - .string "It doesn't take anything to get\n" - .string "that scary lady hollering.$" - -Text_19AB16:: @ 819AB16 - .string "Maybe becoming an ELITE FOUR\n" - .string "member is in the blood.\p" - .string "From what I've heard, LANCE has\n" - .string "a cousin who's a GYM LEADER\l" - .string "somewhere far away.$" - -gUnknown_819AB9B:: @ 819AB9B - .string "My daughter is so self-centered.\n" - .string "She has but a few friends.$" - -gUnknown_819ABD7:: @ 819ABD7 - .string "My daughter likes to mimic people.\n" - .string "It's rather vexing.\p" - .string "Her mimicry has earned her the\n" - .string "nickname COPYCAT around here.$" - -gUnknown_819AC4B:: @ 819AC4B - .string "CHANSEY: Chaan! Sii!$" - diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json deleted file mode 100644 index e7484dfae..000000000 --- a/data/maps/SaffronCity_House1_2F/map.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_HOUSE1_2F", - "name": "SaffronCity_House1_2F", - "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", - "music": "MUS_NIBI", - "region_map_section": "MAPSEC_SAFFRON_CITY", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_DODUO", - "x": 6, - "y": 8, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB5D", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", - "x": 4, - "y": 6, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB70", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", - "x": 7, - "y": 2, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB70", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", - "x": 9, - "y": 6, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB7B", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 10, - "y": 2, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", - "dest_warp_id": 3 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "bg_event_type_0", - "x": 1, - "y": 1, - "elevation": 0, - "script": "SaffronCity_House1_2F_EventScript_16EBC9" - }, - { - "type": "bg_event_type_0", - "x": 3, - "y": 5, - "elevation": 0, - "script": "SaffronCity_House1_2F_EventScript_16EBD2" - }, - { - "type": "hidden_item", - "x": 2, - "y": 1, - "elevation": 0, - "item": "ITEM_NUGGET", - "flag": "HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET", - "quantity": 1, - "underfoot": false - } - ] -} diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc deleted file mode 100644 index 17714d816..000000000 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ /dev/null @@ -1,50 +0,0 @@ -SaffronCity_House1_2F_MapScripts:: @ 816EB5C - .byte 0 - -SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D - lock - faceplayer - waitse - playmoncry SPECIES_DODUO, 0 - msgbox gUnknown_819B030 - waitmoncry - release - end - -SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 - lock - msgbox gUnknown_819B071 - release - end - -SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B - goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 - lock - faceplayer - checkitem ITEM_POKE_DOLL, 1 - compare VAR_RESULT, TRUE - goto_if_eq EventScript_MimicTutor - checkplayergender - compare VAR_RESULT, MALE - call_if_eq EventScript_16EBB7 - compare VAR_RESULT, FEMALE - call_if_eq EventScript_16EBC0 - release - end - -EventScript_16EBB7:: @ 816EBB7 - msgbox gUnknown_819AC60 - return - -EventScript_16EBC0:: @ 816EBC0 - msgbox gUnknown_819ACF1 - return - -SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 - msgbox gUnknown_819B0D0, MSGBOX_SIGN - end - -SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 - msgbox gUnknown_819B0A0, MSGBOX_SIGN - end diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_House1_2F/text.inc deleted file mode 100644 index 32a666e18..000000000 --- a/data/maps/SaffronCity_House1_2F/text.inc +++ /dev/null @@ -1,100 +0,0 @@ -gUnknown_819AC60:: @ 819AC60 - .string "{PLAYER}: Hi!\n" - .string "Do you like POKéMON?\p" - .string "{PLAYER}: Uh, no, I just asked you.\p" - .string "{PLAYER}: Huh?\n" - .string "You're strange!\p" - .string "COPYCAT: Hmm? Quit mimicking?\n" - .string "But, that's my favorite hobby!$" - -gUnknown_819ACF1:: @ 819ACF1 - .string "{PLAYER}: Hi.\n" - .string "You must like POKéMON.\p" - .string "{PLAYER}: No, not me.\n" - .string "I asked you.\p" - .string "{PLAYER}: Pardon?\n" - .string "You're weird!\l" - .string " \l" - .string "COPYCAT: Hmm? Quit mimicking?\l" - .string "But that's my favorite hobby!$" - -Text_MimicTeach:: @ 819AD85 - .string "Oh wow!\n" - .string "A POKé DOLL!\p" - .string "For me?\n" - .string "Thank you!\p" - .string "You know what?\n" - .string "I can teach the move MIMIC.$" - -Text_MimicDeclined:: @ 819ADD8 - .string "Don't you like MIMIC?$" - -Text_MimicWhichMon:: @ 819ADEE - .string "I really love MIMIC!\n" - .string "Who's going to learn it?$" - -Text_MimicTaughtMale:: @ 819AE1C - .string "{PLAYER}: Hi!\n" - .string "Thanks for earlier!\p" - .string "{PLAYER}: Pardon?\p" - .string "{PLAYER}: Is it that fun to mimic my\n" - .string "every move?\p" - .string "COPYCAT: You bet!\n" - .string "It's a scream!$" - -Text_MimicTaughtFemale:: @ 819AE90 - .string "{PLAYER}: Hi!\n" - .string "Thanks for what you did for us.\p" - .string "{PLAYER}: Pardon?\p" - .string "{PLAYER}: Is it really that fun to\n" - .string "copy what I say and do?\p" - .string "COPYCAT: You bet!\n" - .string "It's a scream!$" - -Text_19AF1A:: @ 819AF1A - .string "にもつが　いっぱいね！$" - -Text_19AF26:: @ 819AF26 - .string "{PLAYER}“やあ！　こんにちは！\n" - .string "きみ　ポケモン　すきかい？\p" - .string "{PLAYER}“ぼく　じゃなくって\n" - .string "きみに　きいてるんだ　けど\p" - .string "{PLAYER}“‥‥　えー　なんだよ！\n" - .string "ヘンな　やつ　だなあ！\p" - .string "モノマネむすめ“‥‥　なに？\n" - .string "ひとの　マネ　すんなって？\p" - .string "だって　あたし　\n" - .string "ものまね　しゅみ　なんだ　もん！”$" - -Text_19AFB0:: @ 819AFB0 - .string "{PLAYER}“こんにちは！\n" - .string "ポケモン　すきなのね？\p" - .string "{PLAYER}“わたし　じゃなくって\n" - .string "あなたに　きいてるんだ　けど\p" - .string "{PLAYER}“‥　えー　なんなの！\n" - .string "おかしなこ　ねー！\p" - .string "モノマネむすめ“‥　なに？\n" - .string "ひとの　マネ　すんなって？\p" - .string "だって　あたし\n" - .string "ものまね　しゅみ　なんだ　もん！$" - -gUnknown_819B030:: @ 819B030 - .string "DODUO: Giiih!\p" - .string "PRETTY MIRROR LOOK AT ME,\n" - .string "SEE HOW PRETTY I CAN BE?$" - -gUnknown_819B071:: @ 819B071 - .string "This is a rare POKéMON!\n" - .string "Huh? It's only a doll!$" - -gUnknown_819B0A0:: @ 819B0A0 - .string "A game with MARIO wearing a bucket\n" - .string "on his head!$" - -gUnknown_819B0D0:: @ 819B0D0 - .string "…\p" - .string "My Secrets!\p" - .string "Skill: Mimicry!\n" - .string "Hobby: Collecting dolls!\l" - .string "Favorite POKéMON: CLEFAIRY!$" - diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json deleted file mode 100644 index 41fb0d809..000000000 --- a/data/maps/SaffronCity_House2/map.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_HOUSE2", - "name": "SaffronCity_House2", - "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", - "region_map_section": "MAPSEC_SAFFRON_CITY", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", - "x": 0, - "y": 5, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", - "movement_range_x": 1, - "movement_range_y": 4, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House2_EventScript_16EF86", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_LASS", - "x": 4, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House2_EventScript_16EF74", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", - "x": 6, - "y": 2, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House2_EventScript_16EF7D", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", - "x": 5, - "y": 4, - "elevation": 0, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "0x0", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 3, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 4 - }, - { - "x": 4, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 4 - }, - { - "x": 5, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 4 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "bg_event_type_0", - "x": 5, - "y": 4, - "elevation": 3, - "script": "SaffronCity_House2_EventScript_16EF99" - } - ] -} diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc deleted file mode 100644 index 03afb1a4c..000000000 --- a/data/maps/SaffronCity_House2/scripts.inc +++ /dev/null @@ -1,24 +0,0 @@ -SaffronCity_House2_MapScripts:: @ 816EF73 - .byte 0 - -SaffronCity_House2_EventScript_16EF74:: @ 816EF74 - msgbox gUnknown_819BE74, MSGBOX_NPC - end - -SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D - msgbox gUnknown_819BED5, MSGBOX_NPC - end - -SaffronCity_House2_EventScript_16EF86:: @ 816EF86 - lock - faceplayer - waitse - playmoncry SPECIES_PIDGEY, 0 - msgbox gUnknown_819BEC3 - waitmoncry - release - end - -SaffronCity_House2_EventScript_16EF99:: @ 816EF99 - msgbox gUnknown_819BF07, MSGBOX_SIGN - end diff --git a/data/maps/SaffronCity_House2/text.inc b/data/maps/SaffronCity_House2/text.inc deleted file mode 100644 index 9558880b7..000000000 --- a/data/maps/SaffronCity_House2/text.inc +++ /dev/null @@ -1,20 +0,0 @@ -gUnknown_819BE74:: @ 819BE74 - .string "…Thank you for writing.\n" - .string "I hope to see you soon!\p" - .string "…Hey!\n" - .string "Don't look at my letter!$" - -gUnknown_819BEC3:: @ 819BEC3 - .string "PIDGEY: Kurukkoo!$" - -gUnknown_819BED5:: @ 819BED5 - .string "The COPYCAT is cute!\n" - .string "I'm getting her a POKé DOLL.$" - -gUnknown_819BF07:: @ 819BF07 - .string "I was given a PP UP as a gift.\p" - .string "It's used to increase the PP of\n" - .string "a POKéMON's move.\p" - .string "I should use it on a powerful move\n" - .string "with only a few PP.$" - diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json deleted file mode 100644 index 3d3e7410e..000000000 --- a/data/maps/SaffronCity_House3/map.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_HOUSE3", - "name": "SaffronCity_House3", - "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", - "region_map_section": "MAPSEC_SAFFRON_CITY", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", - "x": 7, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House3_EventScript_16F05F", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 3, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 7 - }, - { - "x": 4, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 7 - }, - { - "x": 5, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 7 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc deleted file mode 100644 index 9e177cccb..000000000 --- a/data/maps/SaffronCity_House3/scripts.inc +++ /dev/null @@ -1,26 +0,0 @@ -SaffronCity_House3_MapScripts:: @ 816F05E - .byte 0 - -SaffronCity_House3_EventScript_16F05F:: @ 816F05F - lock - faceplayer - goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5 - msgbox gUnknown_819C142 - checkitemspace ITEM_TM29, 1 - compare VAR_RESULT, FALSE - goto_if_eq EventScript_16F0AB - giveitem_msg gUnknown_819C16C, ITEM_TM29 - msgbox gUnknown_819C18F - setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC - release - end - -EventScript_16F0AB:: @ 816F0AB - msgbox gUnknown_819C1FC - release - end - -EventScript_16F0B5:: @ 816F0B5 - msgbox gUnknown_819C18F - release - end diff --git a/data/maps/SaffronCity_House3/text.inc b/data/maps/SaffronCity_House3/text.inc deleted file mode 100644 index 42699924f..000000000 --- a/data/maps/SaffronCity_House3/text.inc +++ /dev/null @@ -1,18 +0,0 @@ -gUnknown_819C142:: @ 819C142 - .string "…Wait! Don't say a word!\p" - .string "You wanted this!$" - -gUnknown_819C16C:: @ 819C16C - .string "{PLAYER} received TM29\n" - .string "from MR. PSYCHIC.$" - -gUnknown_819C18F:: @ 819C18F - .string "You already know, don't you?\n" - .string "TM29 is PSYCHIC.\p" - .string "It's an attack that may also lower\n" - .string "the target's special stats.$" - -gUnknown_819C1FC:: @ 819C1FC - .string "Where do you plan to put this?\n" - .string "You've no room.$" - diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 8f3bd6718..ddce0c6d9 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Mart_EventScript_16EFB5", + "script": "SaffronCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Mart_EventScript_16EFAC", + "script": "SaffronCity_Mart_EventScript_Youngster", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Mart_EventScript_16EFA3", + "script": "SaffronCity_Mart_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 5361c07a8..c00a93776 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -1,27 +1,27 @@ SaffronCity_Mart_MapScripts:: @ 816EFA2 .byte 0 -SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 - msgbox gUnknown_819BFF1, MSGBOX_NPC +SaffronCity_Mart_EventScript_Lass:: @ 816EFA3 + msgbox SaffronCity_Mart_Text_ReviveIsCostly, MSGBOX_NPC end -SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC - msgbox gUnknown_819BF8F, MSGBOX_NPC +SaffronCity_Mart_EventScript_Youngster:: @ 816EFAC + msgbox SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper, MSGBOX_NPC end -SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 +SaffronCity_Mart_EventScript_Clerk:: @ 816EFB5 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16EFDC + pokemart SaffronCity_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16EFDC:: @ 816EFDC +SaffronCity_Mart_Items:: @ 816EFDC .2byte ITEM_GREAT_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_REVIVE diff --git a/data/maps/SaffronCity_Mart/text.inc b/data/maps/SaffronCity_Mart/text.inc index 5acbdbd9c..edf13f2fe 100644 --- a/data/maps/SaffronCity_Mart/text.inc +++ b/data/maps/SaffronCity_Mart/text.inc @@ -1,10 +1,10 @@ -gUnknown_819BF8F:: @ 819BF8F +SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper:: @ 819BF8F .string "MAX REPEL keeps weaker POKéMON\n" .string "from appearing.\p" .string "MAX REPEL stays effective longer\n" .string "than SUPER REPEL.$" -gUnknown_819BFF1:: @ 819BFF1 +SaffronCity_Mart_Text_ReviveIsCostly:: @ 819BFF1 .string "REVIVE is costly, but it revives\n" .string "fainted POKéMON!$" diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json new file mode 100644 index 000000000..f1d121850 --- /dev/null +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", + "name": "SaffronCity_MrPsychicsHouse", + "layout": "LAYOUT_HOUSE5", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_MrPsychicsHouse_EventScript_MrPsychic", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 7 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc new file mode 100644 index 000000000..24bd51cc1 --- /dev/null +++ b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc @@ -0,0 +1,26 @@ +SaffronCity_MrPsychicsHouse_MapScripts:: @ 816F05E + .byte 0 + +SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: @ 816F05F + lock + faceplayer + goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29 + msgbox SaffronCity_MrPsychicsHouse_Text_YouWantedThis + checkitemspace ITEM_TM29, 1 + compare VAR_RESULT, FALSE + goto_if_eq SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29 + giveitem_msg SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic, ITEM_TM29 + msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29 + setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC + release + end + +SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29:: @ 816F0AB + msgbox SaffronCity_MrPsychicsHouse_Text_YouveNoRoom + release + end + +SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29:: @ 816F0B5 + msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29 + release + end diff --git a/data/maps/SaffronCity_MrPsychicsHouse/text.inc b/data/maps/SaffronCity_MrPsychicsHouse/text.inc new file mode 100644 index 000000000..31d220c69 --- /dev/null +++ b/data/maps/SaffronCity_MrPsychicsHouse/text.inc @@ -0,0 +1,18 @@ +SaffronCity_MrPsychicsHouse_Text_YouWantedThis:: @ 819C142 + .string "…Wait! Don't say a word!\p" + .string "You wanted this!$" + +SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic:: @ 819C16C + .string "{PLAYER} received TM29\n" + .string "from MR. PSYCHIC.$" + +SaffronCity_MrPsychicsHouse_Text_ExplainTM29:: @ 819C18F + .string "You already know, don't you?\n" + .string "TM29 is PSYCHIC.\p" + .string "It's an attack that may also lower\n" + .string "the target's special stats.$" + +SaffronCity_MrPsychicsHouse_Text_YouveNoRoom:: @ 819C1FC + .string "Where do you plan to put this?\n" + .string "You've no room.$" + diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index bb78415b4..1d28ff69a 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_16EFFB", + "script": "SaffronCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_16F004", + "script": "SaffronCity_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": "SaffronCity_PokemonCenter_1F_EventScript_16F00D", + "script": "SaffronCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_16F016", + "script": "SaffronCity_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": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina", "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina", "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" } ], diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 8639de5af..b8e2385e6 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -7,31 +7,31 @@ SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 setrespawn SPAWN_SAFFRON_CITY end -SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB +SaffronCity_PokemonCenter_1F_EventScript_Nurse:: @ 816EFFB lock faceplayer call EventScript_PkmnCenterNurse release end -SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004 - msgbox gUnknown_819C058, MSGBOX_NPC +SaffronCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816F004 + msgbox SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame, MSGBOX_NPC end -SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D - msgbox gUnknown_819C023, MSGBOX_NPC +SaffronCity_PokemonCenter_1F_EventScript_Woman:: @ 816F00D + msgbox SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies, MSGBOX_NPC end -SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 +SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_eq EventScript_16F02D - msgbox gUnknown_819C0B4 + goto_if_eq SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone + msgbox SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets release end -EventScript_16F02D:: @ 816F02D - msgbox gUnknown_819C102 +SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone:: @ 816F02D + msgbox SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff release end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/text.inc b/data/maps/SaffronCity_PokemonCenter_1F/text.inc index 8a3e43a10..51d64d42c 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/text.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/text.inc @@ -1,19 +1,19 @@ -gUnknown_819C023:: @ 819C023 +SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies:: @ 819C023 .string "POKéMON growth rates differ from\n" .string "species to species.$" -gUnknown_819C058:: @ 819C058 +SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame:: @ 819C058 .string "SILPH CO. is widely known to all.\p" .string "It's a victim of its own fame - it\n" .string "attracted TEAM ROCKET.$" -gUnknown_819C0B4:: @ 819C0B4 +SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets:: @ 819C0B4 .string "Sigh…\n" .string "Wouldn't this be great?\p" .string "If the ELITE FOUR came and\n" .string "stomped TEAM ROCKET?$" -gUnknown_819C102:: @ 819C102 +SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff:: @ 819C102 .string "TEAM ROCKET took off!\n" .string "We can go out safely again!\l" .string "That's great!$" diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 979278cdb..f8f892dca 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F281", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F36F", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Youngster", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Woman", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Rocker", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Beauty", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index ffb4678b2..8df872d7e 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -4,10 +4,10 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF .byte 0 SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA - map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4 + map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans .2byte 0 -EventScript_16F0D4:: @ 816F0D4 +SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 816F0D4 lockall textcolor 1 applymovement 1, Movement_WalkInPlaceFastestDown @@ -17,18 +17,18 @@ EventScript_16F0D4:: @ 816F0D4 waitmovement 0 applymovement 1, Movement_Delay48 waitmovement 0 - msgbox gUnknown_819C22B + msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou closemessage - applymovement 1, Movement_16F124 + applymovement 1, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox gUnknown_819C235 + msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 releaseall end -Movement_16F124:: @ 816F124 +SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F124 delay_16 delay_8 walk_down @@ -38,7 +38,8 @@ Movement_16F124:: @ 816F124 walk_left step_end -Movement_16F12C:: @ 816F12C +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F12C delay_8 walk_in_place_fastest_down walk_down @@ -48,7 +49,8 @@ Movement_16F12C:: @ 816F12C walk_left step_end -Movement_16F134:: @ 816F134 +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ 816F134 walk_fast_left walk_fast_left walk_fast_down @@ -57,12 +59,14 @@ Movement_16F134:: @ 816F134 walk_fast_down step_end -Movement_16F13B:: @ 816F13B +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: @ 816F13B walk_down walk_in_place_fastest_right step_end -Movement_16F13E:: @ 816F13E +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: @ 816F13E jump_in_place_right walk_fast_up walk_fast_up @@ -72,383 +76,383 @@ Movement_16F13E:: @ 816F13E SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 - goto_if_eq EventScript_16F267 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if_eq EventScript_16F15B + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions end -EventScript_16F15B:: @ 816F15B +SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B special Special_TryLoseFansFromPlayTime setvar VAR_0x8004, FANCLUB_MEMBER1 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F207 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER2 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F213 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER3 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F21F + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER4 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F22B + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER5 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F237 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER6 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F243 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER7 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F24F + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER8 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F25B + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -EventScript_16F207:: @ 816F207 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207 setobjectxyperm 1, 5, 2 setobjectmovementtype 1, 7 return -EventScript_16F213:: @ 816F213 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213 setobjectxyperm 3, 7, 4 setobjectmovementtype 3, 9 return -EventScript_16F21F:: @ 816F21F +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F setobjectxyperm 4, 2, 2 setobjectmovementtype 4, 7 return -EventScript_16F22B:: @ 816F22B +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B setobjectxyperm 2, 3, 4 setobjectmovementtype 2, 10 return -EventScript_16F237:: @ 816F237 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237 setobjectxyperm 6, 4, 6 setobjectmovementtype 6, 7 return -EventScript_16F243:: @ 816F243 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243 setobjectxyperm 5, 10, 3 setobjectmovementtype 5, 7 return -EventScript_16F24F:: @ 816F24F +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F setobjectxyperm 7, 7, 5 setobjectmovementtype 7, 9 return -EventScript_16F25B:: @ 816F25B +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B setobjectxyperm 8, 9, 6 setobjectmovementtype 8, 9 return -EventScript_16F267:: @ 816F267 - call EventScript_16F22B - call EventScript_16F237 - call EventScript_16F243 - call EventScript_16F24F - call EventScript_16F25B +SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267 + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER1 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F2EE + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F2C0 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F2E4 - msgbox gUnknown_819C420 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore release end -EventScript_16F2C0:: @ 816F2C0 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F2DA - msgbox gUnknown_819C390 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou release end -EventScript_16F2DA:: @ 816F2DA - msgbox gUnknown_819C3BD +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: @ 816F2DA + msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou release end -EventScript_16F2E4:: @ 816F2E4 - msgbox gUnknown_819C4A5 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: @ 816F2E4 + msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe release end -EventScript_16F2EE:: @ 816F2EE - msgbox gUnknown_819C55C +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: @ 816F2EE + msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER4 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F365 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F337 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F35B - msgbox gUnknown_819CBD3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina release end -EventScript_16F337:: @ 816F337 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F351 - msgbox gUnknown_819CB32 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay release end -EventScript_16F351:: @ 816F351 - msgbox gUnknown_819CB62 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 816F351 + msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan release end -EventScript_16F35B:: @ 816F35B - msgbox gUnknown_819CC2B +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 816F35B + msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan release end -EventScript_16F365:: @ 816F365 - msgbox gUnknown_819CCC2 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 816F365 + msgbox SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F +SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER2 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F3DC + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F3AE + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F3D2 - msgbox gUnknown_819C6BA + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero release end -EventScript_16F3AE:: @ 816F3AE +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F3C8 - msgbox gUnknown_819C5A9 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts release end -EventScript_16F3C8:: @ 816F3C8 - msgbox gUnknown_819C600 +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan:: @ 816F3C8 + msgbox SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou release end -EventScript_16F3D2:: @ 816F3D2 - msgbox gUnknown_819C73A +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan:: @ 816F3D2 + msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd release end -EventScript_16F3DC:: @ 816F3DC - msgbox gUnknown_819C7C8 +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion:: @ 816F3DC + msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 +SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER3 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F453 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F425 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F449 - msgbox gUnknown_819C986 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre release end -EventScript_16F425:: @ 816F425 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F43F - msgbox gUnknown_819C81E + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle release end -EventScript_16F43F:: @ 816F43F - msgbox gUnknown_819C8C1 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan:: @ 816F43F + msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence release end -EventScript_16F449:: @ 816F449 - msgbox gUnknown_819C9D5 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan:: @ 816F449 + msgbox SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo release end -EventScript_16F453:: @ 816F453 - msgbox gUnknown_819CA7C +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion:: @ 816F453 + msgbox SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D +SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER6 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F491 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F4B5 - msgbox gUnknown_819D01F + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire release end -EventScript_16F491:: @ 816F491 +SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F4AB - msgbox gUnknown_819CEDF + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle release end -EventScript_16F4AB:: @ 816F4AB - msgbox gUnknown_819CF6D +SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 816F4AB + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan release end -EventScript_16F4B5:: @ 816F4B5 - msgbox gUnknown_819D075 +SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 816F4B5 + msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF +SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER5 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F4F3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F517 - msgbox gUnknown_819CDDA + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks release end -EventScript_16F4F3:: @ 816F4F3 +SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F50D - msgbox gUnknown_819CCF3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool release end -EventScript_16F50D:: @ 816F50D - msgbox gUnknown_819CD4E +SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan:: @ 816F50D + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans release end -EventScript_16F517:: @ 816F517 - msgbox gUnknown_819CE3A +SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan:: @ 816F517 + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 +SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER7 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F555 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F579 - msgbox gUnknown_819D1AE + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity release end -EventScript_16F555:: @ 816F555 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F56F - msgbox gUnknown_819D0E3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing release end -EventScript_16F56F:: @ 816F56F - msgbox gUnknown_819D148 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan:: @ 816F56F + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan release end -EventScript_16F579:: @ 816F579 - msgbox gUnknown_819D211 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan:: @ 816F579 + msgbox SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER8 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F5B7 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F5DB - msgbox gUnknown_819D3D2 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect release end -EventScript_16F5B7:: @ 816F5B7 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F5D1 - msgbox gUnknown_819D2B4 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational release end -EventScript_16F5D1:: @ 816F5D1 - msgbox gUnknown_819D31F +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan:: @ 816F5D1 + msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan release end -EventScript_16F5DB:: @ 816F5DB - msgbox gUnknown_819D477 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan:: @ 816F5DB + msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc index ecbf0b024..fb9358c70 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc @@ -1,8 +1,8 @@ -gUnknown_819C22B:: @ 819C22B +SaffronCity_PokemonTrainerFanClub_Text_HuhYou:: @ 819C22B .string "Huh?\n" .string "You…$" -gUnknown_819C235:: @ 819C235 +SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow:: @ 819C235 .string "Are you maybe…\n" .string "… …\p" .string "You are!\n" @@ -19,17 +19,17 @@ gUnknown_819C235:: @ 819C235 .string "That way, maybe other people will\n" .string "become fans just like me.$" -gUnknown_819C390:: @ 819C390 +SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: @ 819C390 .string "I'll always be cheering for you!\p" .string "Go, {PLAYER}, go!$" -gUnknown_819C3BD:: @ 819C3BD +SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou:: @ 819C3BD .string "I'll always believe in you,\n" .string "{PLAYER}.\p" .string "Please show the others what you're\n" .string "like when you battle seriously.$" -gUnknown_819C420:: @ 819C420 +SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore:: @ 819C420 .string "I'm sorry.\n" .string "I was your fan before.\p" .string "But now, you seem to have lost\n" @@ -37,7 +37,7 @@ gUnknown_819C420:: @ 819C420 .string "Lately, I think {STR_VAR_1} has been\n" .string "a lot cooler.$" -gUnknown_819C4A5:: @ 819C4A5 +SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe:: @ 819C4A5 .string "Oh!\n" .string "{PLAYER}!\p" .string "Everyone's been all excited about\n" @@ -48,12 +48,12 @@ gUnknown_819C4A5:: @ 819C4A5 .string "Once I became {STR_VAR_1}'s fan,\n" .string "I can't just stop being a fan.$" -gUnknown_819C55C:: @ 819C55C +SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling:: @ 819C55C .string "I think TRAINERS are so cool when\n" .string "they're battling.\p" .string "Don't you think so, too?$" -gUnknown_819C5A9:: @ 819C5A9 +SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts:: @ 819C5A9 .string "Oh! It's {PLAYER}!\n" .string "Too cool!\p" .string "Oh!\n" @@ -61,7 +61,7 @@ gUnknown_819C5A9:: @ 819C5A9 .string "Can you autograph something?\n" .string "How about my shorts?$" -gUnknown_819C600:: @ 819C600 +SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou:: @ 819C600 .string "However hot it's been…\p" .string "And however cold it may get…\p" .string "I've always believed in, and worn,\n" @@ -71,7 +71,7 @@ gUnknown_819C600:: @ 819C600 .string "I believe in you just as much as\n" .string "I believe in shorts!$" -gUnknown_819C6BA:: @ 819C6BA +SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero:: @ 819C6BA .string "BROCK's my hero!\n" .string "He's a man among men!\p" .string "Heheh, I got my mom to do\n" @@ -79,7 +79,7 @@ gUnknown_819C6BA:: @ 819C6BA .string "I got her to embroider “BROCK”\n" .string "on my shorts!$" -gUnknown_819C73A:: @ 819C73A +SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd:: @ 819C73A .string "… …\p" .string "… …\n" .string "I'm BROCK's fan!\p" @@ -88,13 +88,13 @@ gUnknown_819C73A:: @ 819C73A .string "and on my shorts!\p" .string "I'll be his fan to the bitter end!$" -gUnknown_819C7C8:: @ 819C7C8 +SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool:: @ 819C7C8 .string "BROCK's the last word on cool,\n" .string "end of story!\p" .string "Now there's a guy who I want to\n" .string "be like!$" -gUnknown_819C81E:: @ 819C81E +SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle:: @ 819C81E .string "{PLAYER}, I've had the pleasure of\n" .string "watching you battle.\p" .string "It brings back sweet memories of\n" @@ -102,7 +102,7 @@ gUnknown_819C81E:: @ 819C81E .string "May you continue to find success.\n" .string "You have a fan in me!$" -gUnknown_819C8C1:: @ 819C8C1 +SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence:: @ 819C8C1 .string "I have journeyed far and wide\n" .string "across the lands.\p" .string "But never have I seen a TRAINER\n" @@ -112,13 +112,13 @@ gUnknown_819C8C1:: @ 819C8C1 .string "Make that a promise to me,\n" .string "my young idol!$" -gUnknown_819C986:: @ 819C986 +SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre:: @ 819C986 .string "Hmm…\n" .string "And you are?\p" .string "Were you hoping to sign up for\n" .string "a membership in our FAN CLUB?$" -gUnknown_819C9D5:: @ 819C9D5 +SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo:: @ 819C9D5 .string "Ah, so you are the much-\n" .string "talked-about {PLAYER}.\p" .string "You certainly do have the look of\n" @@ -128,7 +128,7 @@ gUnknown_819C9D5:: @ 819C9D5 .string "… …\p" .string "You've still a ways to go!$" -gUnknown_819CA7C:: @ 819CA7C +SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning:: @ 819CA7C .string "All of us gathered here are fans\n" .string "of POKéMON TRAINERS.\p" .string "The way they look in battle…\n" @@ -136,12 +136,12 @@ gUnknown_819CA7C:: @ 819CA7C .string "Perhaps you will be talked about\n" .string "here, too, if you keep winning.$" -gUnknown_819CB32:: @ 819CB32 +SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay:: @ 819CB32 .string "It's {PLAYER}!\n" .string "It's {PLAYER}!\p" .string "I want to be like {PLAYER} one day!$" -gUnknown_819CB62:: @ 819CB62 +SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan:: @ 819CB62 .string "Everyone stopped being {PLAYER}'s\n" .string "fan…\p" .string "But that means I can have {PLAYER}\n" @@ -149,13 +149,13 @@ gUnknown_819CB62:: @ 819CB62 .string "Yay! Go for it!\n" .string "My one and only {PLAYER}!$" -gUnknown_819CBD3:: @ 819CBD3 +SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina:: @ 819CBD3 .string "Do you know what?\n" .string "I want to be like SABRINA!\p" .string "I want to be a psychic girl just\n" .string "like her!$" -gUnknown_819CC2B:: @ 819CC2B +SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan:: @ 819CC2B .string "Even if I'm the only one, I won't\n" .string "stop being SABRINA's fan.\p" .string "My dream is to be like SABRINA,\n" @@ -163,11 +163,11 @@ gUnknown_819CC2B:: @ 819CC2B .string "I want to be a psychic girl just\n" .string "like her!$" -gUnknown_819CCC2:: @ 819CCC2 +SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay:: @ 819CCC2 .string "I wonder if I can become a cool\n" .string "TRAINER one day?$" -gUnknown_819CCF3:: @ 819CCF3 +SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool:: @ 819CCF3 .string "Oh, man, oh, man!\n" .string "Cool! Too cool!\p" .string "…Huh?\n" @@ -175,7 +175,7 @@ gUnknown_819CCF3:: @ 819CCF3 .string "Just the way you battle.\n" .string "That's cool.$" -gUnknown_819CD4E:: @ 819CD4E +SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans:: @ 819CD4E .string "Yo, {PLAYER}!\p" .string "Looks like I'm the only one left\n" .string "out of your fans.\p" @@ -183,13 +183,13 @@ gUnknown_819CD4E:: @ 819CD4E .string "fan… It's less stressful.\p" .string "Keep up and at it!$" -gUnknown_819CDDA:: @ 819CDDA +SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks:: @ 819CDDA .string "{STR_VAR_1}'s cool, huh?\n" .string "I love the way he talks.\p" .string "I'd really relish a chance to meet\n" .string "him in person once.$" -gUnknown_819CE3A:: @ 819CE3A +SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan:: @ 819CE3A .string "Huh, can you believe it?\n" .string "Everyone turned into your fans.\p" .string "So after all we've been through,\n" @@ -197,7 +197,7 @@ gUnknown_819CE3A:: @ 819CE3A .string "Eh, being the one and only\n" .string "{STR_VAR_1} fan's my style, anyway.$" -gUnknown_819CEDF:: @ 819CEDF +SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle:: @ 819CEDF .string "Oh, my goodness!\n" .string "Is it really you, {PLAYER}?\p" .string "I have to tell you, I adore the\n" @@ -205,7 +205,7 @@ gUnknown_819CEDF:: @ 819CEDF .string "I hope you'll keep at it.\n" .string "I'll be your number one fan!$" -gUnknown_819CF6D:: @ 819CF6D +SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan:: @ 819CF6D .string "Oh, my goodness!\n" .string "If it isn't {PLAYER}!\p" .string "It's so disappointing… I realized\n" @@ -214,13 +214,13 @@ gUnknown_819CF6D:: @ 819CF6D .string "Let me cheer you on, at least!\p" .string "Hurray, hurray, {PLAYER}!$" -gUnknown_819D01F:: @ 819D01F +SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire:: @ 819D01F .string "Recently, {STR_VAR_1} has been on\n" .string "fire.\p" .string "The way he battles… It's just \n" .string "the way that I like it!$" -gUnknown_819D075:: @ 819D075 +SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou:: @ 819D075 .string "Oh, hello!\n" .string "If it isn't {PLAYER}!\p" .string "Lately, all everyone talks about\n" @@ -228,25 +228,25 @@ gUnknown_819D075:: @ 819D075 .string "I'm feeling lonesome because I\n" .string "prefer {STR_VAR_1}.$" -gUnknown_819D0E3:: @ 819D0E3 +SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing:: @ 819D0E3 .string "Amazing!\n" .string "{PLAYER}, you really are amazing!\p" .string "Instead of just watching, maybe\n" .string "I should become a TRAINER, too.$" -gUnknown_819D148:: @ 819D148 +SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan:: @ 819D148 .string "I'm your only fan…\n" .string "Sigh… This is lonely…\p" .string "Can't you try harder and make the\n" .string "others take notice of you?$" -gUnknown_819D1AE:: @ 819D1AE +SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity:: @ 819D1AE .string "Master {STR_VAR_1} is so dignified…\n" .string "He is so my type.\p" .string "Why can't the others see the\n" .string "dignity he simply oozes?$" -gUnknown_819D211:: @ 819D211 +SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart:: @ 819D211 .string "I believe in Master {STR_VAR_1}\n" .string "with all my heart.\p" .string "Even if I am the only one to\n" @@ -255,14 +255,14 @@ gUnknown_819D211:: @ 819D211 .string "Not if I keep thinking about Master\n" .string "{STR_VAR_1}.$" -gUnknown_819D2B4:: @ 819D2B4 +SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational:: @ 819D2B4 .string "Hiyah!\p" .string "Your battling style is most\n" .string "educational.\p" .string "I hope that you will keep plugging\n" .string "away at success, hiyah!$" -gUnknown_819D31F:: @ 819D31F +SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan:: @ 819D31F .string "Instead of just watching others\n" .string "battle, battle yourself!\p" .string "…My DOJO's MASTER chewed me out\n" @@ -271,7 +271,7 @@ gUnknown_819D31F:: @ 819D31F .string "being your fan!\p" .string "I can't stop being your fan!$" -gUnknown_819D3D2:: @ 819D3D2 +SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect:: @ 819D3D2 .string "Hiyah! There is but one TRAINER\n" .string "who has my respect.\p" .string "And that is none other than my\n" @@ -279,7 +279,7 @@ gUnknown_819D3D2:: @ 819D3D2 .string "You should become a fan of my\n" .string "MASTER like me! Hiyah!$" -gUnknown_819D477:: @ 819D477 +SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster:: @ 819D477 .string "Hiyah! I respect my MASTER at the\n" .string "FIGHTING DOJO.\p" .string "I will never become a fan of\n" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 05f1cd544..271bc6407 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -409,15 +409,15 @@ "IndigoPlateau_PokemonCenter_2F" ], "gMapGroup14": [ - "SaffronCity_House1_1F", - "SaffronCity_House1_2F", + "SaffronCity_CopycatsHouse_1F", + "SaffronCity_CopycatsHouse_2F", "SaffronCity_Dojo", "SaffronCity_Gym", - "SaffronCity_House2", + "SaffronCity_House", "SaffronCity_Mart", "SaffronCity_PokemonCenter_1F", "SaffronCity_PokemonCenter_2F", - "SaffronCity_House3", + "SaffronCity_MrPsychicsHouse", "SaffronCity_PokemonTrainerFanClub" ], "gMapGroup15": [ -- cgit v1.2.3