diff options
Diffstat (limited to 'data/maps')
51 files changed, 566 insertions, 556 deletions
diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index c3e3eaff2..c976122a7 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -5,7 +5,7 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 .byte 0 FourIsland_IcefallCave_1F_OnResume:: @ 8163D54 - setstepcallback 4 + setstepcallback STEP_CB_ICE end FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 @@ -13,13 +13,13 @@ FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 end FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B - map_script_2 VAR_TEMP_1, 1, EventScript_163D65 + map_script_2 VAR_TEMP_1, 1, FourIsland_IcefallCave_1F_EventScript_FallDownHole .2byte 0 -EventScript_163D65:: @ 8163D65 +FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65 lockall delay 20 - applymovement OBJ_EVENT_ID_PLAYER, Movement_163D7F + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -28,6 +28,6 @@ EventScript_163D65:: @ 8163D65 releaseall end -Movement_163D7F:: @ 8163D7F +FourIsland_IcefallCave_1F_Movement_SetInvisible:: @ 8163D7F set_invisible step_end diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 9af9a6faf..32ca627ba 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163F25", + "script": "FourIsland_IcefallCave_Back_EventScript_Lorelei", "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" }, { "type": "trigger", @@ -92,7 +92,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" }, { "type": "trigger", @@ -101,7 +101,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" } ], "bg_events": [] diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 39eb3f0b4..a0a94d4be 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -1,100 +1,105 @@ +.equ LOCALID_ROCKET1, 1 +.equ LOCALID_ROCKET2, 2 +.equ LOCALID_LORELEI, 3 +.equ LOCALID_ROCKET3, 4 + FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition .byte 0 FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88 compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 - call_if_eq EventScript_163D94 + call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei end -EventScript_163D94:: @ 8163D94 +FourIsland_IcefallCave_Back_EventScript_HideLorelei:: @ 8163D94 setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI return -FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 +FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98 lockall textcolor 1 - msgbox gUnknown_817B04F - applymovement 1, Movement_163EE8 + msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons + applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 textcolor 0 - msgbox gUnknown_817B0B9 + msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe closemessage playse SE_PIN - applymovement 3, Movement_ExclamationMark + applymovement LOCALID_LORELEI, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_LORELEI, Movement_Delay48 waitmovement 0 textcolor 1 - msgbox gUnknown_817B109 + msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut closemessage - applymovement 3, Movement_WalkInPlaceFastestRight + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight waitmovement 0 delay 18 - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown waitmovement 0 delay 35 - applymovement 4, Movement_163F11 - applymovement 3, Movement_163F18 - applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD + applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets waitmovement 0 - applymovement 2, Movement_163EE8 + applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 playbgm MUS_ROCKET, 0 textcolor 0 - msgbox gUnknown_817B20B - setvar VAR_LAST_TALKED, 4 - trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251 - applymovement 3, Movement_163F1B + msgbox FourIsland_IcefallCave_Back_Text_GruntIntro + setvar VAR_LAST_TALKED, LOCALID_ROCKET3 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp waitmovement 0 textcolor 1 - msgbox gUnknown_817B269 + msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons textcolor 0 - msgbox gUnknown_817B2EF + msgbox FourIsland_IcefallCave_Back_Text_NotTellingYouThat textcolor 1 - message Text_17B313 + message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou waitmessage waitse playmoncry SPECIES_LAPRAS, 2 waitbuttonpress waitmoncry - applymovement 1, Movement_163EEE + applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat waitmovement 0 textcolor 0 - msgbox gUnknown_817B399 + msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland closemessage - applymovement 3, Movement_163F1D - applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2 - applymovement 1, Movement_163EF0 - applymovement 2, Movement_163EFA - applymovement 4, Movement_163F05 + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit + applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit + applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit + applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit waitmovement 0 - removeobject 1 - removeobject 2 - removeobject 4 + removeobject LOCALID_ROCKET1 + removeobject LOCALID_ROCKET2 + removeobject LOCALID_ROCKET3 delay 50 - applymovement 3, Movement_163F23 + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 textcolor 1 - msgbox gUnknown_817B457 + msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 releaseall end -Movement_163EDD:: @ 8163EDD +FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: @ 8163EDD walk_up walk_up walk_right walk_up step_end -Movement_163EE2:: @ 8163EE2 +FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2 delay_16 walk_in_place_fastest_left delay_16 @@ -102,21 +107,21 @@ Movement_163EE2:: @ 8163EE2 walk_in_place_fastest_down step_end -Movement_163EE8:: @ 8163EE8 +FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @ 8163EE8 walk_in_place_down step_end -gUnknown_163EEA:: @ 8163EEA +FourIsland_IcefallCave_Back_Movement_UnusedPushRight:: @ 8163EEA lock_facing_direction walk_right unlock_facing_direction step_end -Movement_163EEE:: @ 8163EEE +FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat:: @ 8163EEE walk_in_place_fast_down step_end -Movement_163EF0:: @ 8163EF0 +FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0 walk_right walk_down walk_fast_down @@ -128,7 +133,7 @@ Movement_163EF0:: @ 8163EF0 walk_fast_down step_end -Movement_163EFA:: @ 8163EFA +FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA delay_16 walk_left walk_down @@ -141,7 +146,7 @@ Movement_163EFA:: @ 8163EFA walk_fast_down step_end -Movement_163F05:: @ 8163F05 +FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05 delay_16 walk_down delay_16 @@ -155,27 +160,27 @@ Movement_163F05:: @ 8163F05 walk_fast_down step_end -Movement_163F11:: @ 8163F11 +FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: @ 8163F11 delay_16 delay_8 walk_in_place_fastest_right step_end -Movement_163F15:: @ 8163F15 +FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @ 8163F15 walk_left walk_left step_end -Movement_163F18:: @ 8163F18 +FourIsland_IcefallCave_Back_Movement_LoreleiToRockets:: @ 8163F18 walk_left walk_up step_end -Movement_163F1B:: @ 8163F1B +FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: @ 8163F1B walk_in_place_up step_end -Movement_163F1D:: @ 8163F1D +FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D delay_8 walk_in_place_fastest_right delay_16 @@ -183,10 +188,10 @@ Movement_163F1D:: @ 8163F1D walk_in_place_fastest_down step_end -Movement_163F23:: @ 8163F23 +FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: @ 8163F23 walk_right step_end -FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 - msgbox gUnknown_817B457, MSGBOX_NPC +FourIsland_IcefallCave_Back_EventScript_Lorelei:: @ 8163F25 + msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful, MSGBOX_NPC end diff --git a/data/maps/FourIsland_IcefallCave_Back/text.inc b/data/maps/FourIsland_IcefallCave_Back/text.inc index f65e95854..981041777 100644 --- a/data/maps/FourIsland_IcefallCave_Back/text.inc +++ b/data/maps/FourIsland_IcefallCave_Back/text.inc @@ -1,16 +1,16 @@ -gUnknown_817B04F:: @ 817B04F +FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons:: @ 817B04F .string "LORELEI: Keep your filthy hands\n" .string "off the POKéMON in the cave!\p" .string "Do as I say, or you'll have me to\n" .string "answer to!$" -gUnknown_817B0B9:: @ 817B0B9 +FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe:: @ 817B0B9 .string "Aww, shut it, lady, and leave\n" .string "us be.\p" .string "Don't let your glasses get all\n" .string "steamed up!$" -gUnknown_817B109:: @ 817B109 +FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109 .string "LORELEI: {PLAYER}?!\n" .string "What are you doing here?\p" .string "No, we can catch up later.\n" @@ -22,15 +22,15 @@ gUnknown_817B109:: @ 817B109 .string "Are you ready?\n" .string "You take that one, please!$" -gUnknown_817B20B:: @ 817B20B +FourIsland_IcefallCave_Back_Text_GruntIntro:: @ 817B20B .string "W-what?!\p" .string "Who says we can't do what we want\n" .string "with the POKéMON we catch?$" -Text_17B251:: @ 817B251 +FourIsland_IcefallCave_Back_Text_GruntDefeat:: @ 817B251 .string "We didn't plan on this!$" -gUnknown_817B269:: @ 817B269 +FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269 .string "LORELEI: Humph.\n" .string "So despicably weak.\p" .string "You!\n" @@ -40,11 +40,11 @@ gUnknown_817B269:: @ 817B269 .string "I'm smashing your ring once and\n" .string "for all!$" -gUnknown_817B2EF:: @ 817B2EF +FourIsland_IcefallCave_Back_Text_NotTellingYouThat:: @ 817B2EF .string "N-no way!\n" .string "I'm not telling you that!$" -Text_17B313:: @ 817B313 +FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313 .string "LORELEI: If you won't confess,\n" .string "we'll deep-freeze you.\p" .string "My LAPRAS is furious for what\n" @@ -52,7 +52,7 @@ Text_17B313:: @ 817B313 .string "Go, LAPRAS!\n" .string "ICE BEAM…$" -gUnknown_817B399:: @ 817B399 +FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399 .string "Wawaah! Okay!\n" .string "I'll talk!\p" .string "The POKéMON are in the ROCKET\n" @@ -63,7 +63,7 @@ gUnknown_817B399:: @ 817B399 .string "into the ROCKET WAREHOUSE!\p" .string "Heheheheh!$" -gUnknown_817B457:: @ 817B457 +FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful:: @ 817B457 .string "{PLAYER}, thank you.\n" .string "But this is awful…\p" .string "I was born and raised here on\n" diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 91981c25d..ef624c9c0 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -5,7 +5,7 @@ "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc index faa31c9d1..ba40d1729 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/text.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc @@ -1,65 +1,3 @@ -Text_18CF4D:: @ 818CF4D - .string "Training by oneself is certainly\n" - .string "not a bad thing.\p" - .string "But it's also not bad to aim for\n" - .string "the top with a partner.\p" - .string "Even BRUNO…\n" - .string "He trained with a fellow by the\l" - .string "name of BRAWLY before.$" - -Text_18CFFB:: @ 818CFFB - .string "Do you know anything about this\n" - .string "stone chamber?$" - -Text_18D02A:: @ 818D02A - .string "That was uncalled for.\n" - .string "You didn't have to be so rough.$" - -Text_18D061:: @ 818D061 - .string "The TANOBY RUINS date back at\n" - .string "least 1,500 years.\p" - .string "But it's a baffling mystery as to\n" - .string "why it was built in the first place.$" - -Text_18D0D9:: @ 818D0D9 - .string "A mystic POKéMON is said to sleep\n" - .string "inside here.$" - -Text_18D108:: @ 818D108 - .string "I'm not much good in battle.$" - -Text_18D125:: @ 818D125 - .string "I hear there are other ruins like\n" - .string "the one here.\p" - .string "Might they be the resting places\n" - .string "of other mystic POKéMON?$" - -Text_18D18F:: @ 818D18F - .string "CLIFFORD is teaching me how to\n" - .string "paint.$" - -Text_18D1B5:: @ 818D1B5 - .string "We might get in trouble for being\n" - .string "noisy here.$" - -Text_18D1E3:: @ 818D1E3 - .string "I said that I wanted to paint an\n" - .string "old building.\p" - .string "So CLIFFORD brought me here.$" - -Text_18D22F:: @ 818D22F - .string "Today, in addition to our lesson,\n" - .string "we came to see the chamber.$" - -Text_18D26D:: @ 818D26D - .string "My, how extraordinary.$" - -Text_18D284:: @ 818D284 - .string "Ah, so you are studying POKéMON\n" - .string "on your own…\p" - .string "Yes, you certainly are quite the\n" - .string "extraordinary person, indeed.$" - gUnknown_818D2F0:: @ 818D2F0 .string "MOM: …Right.\n" .string "All boys leave home someday.\l" diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 652ffd20b..6ea519092 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index bc8f10848..a3a9c556e 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -5,7 +5,7 @@ "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 1e4af29e2..9c0423004 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -5,7 +5,7 @@ "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 458740163..eea10cb2c 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index c365ad26e..6dd117e8a 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_1F_EventScript_162E73", + "script": "RockTunnel_1F_EventScript_Dana", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_1F_EventScript_162E5C", + "script": "RockTunnel_1F_EventScript_Ariana", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "RockTunnel_1F_EventScript_162E45", + "script": "RockTunnel_1F_EventScript_Leah", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_1F_EventScript_162E17", + "script": "RockTunnel_1F_EventScript_Lucas", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_1F_EventScript_162E00", + "script": "RockTunnel_1F_EventScript_Oliver", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_1F_EventScript_162DE9", + "script": "RockTunnel_1F_EventScript_Lenny", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_1F_EventScript_162E2E", + "script": "RockTunnel_1F_EventScript_Ashton", "flag": "0" }, { @@ -195,7 +195,7 @@ "x": 14, "y": 33, "elevation": 3, - "script": "RockTunnel_1F_EventScript_162DE0" + "script": "RockTunnel_1F_EventScript_RouteSign" } ] } diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index 49daa21a7..f18e0cd3e 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -6,41 +6,41 @@ RockTunnel_1F_OnTransition:: @ 8162DDC setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F end -RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 - msgbox gUnknown_817962D, MSGBOX_SIGN +RockTunnel_1F_EventScript_RouteSign:: @ 8162DE0 + msgbox RockTunnel_1F_Text_RouteSign, MSGBOX_SIGN end -RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 - trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388 - msgbox gUnknown_8179396, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Lenny:: @ 8162DE9 + trainerbattle_single TRAINER_HIKER_LENNY, RockTunnel_1F_Text_LennyIntro, RockTunnel_1F_Text_LennyDefeat + msgbox RockTunnel_1F_Text_LennyPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E00:: @ 8162E00 - trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E - msgbox gUnknown_817943A, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Oliver:: @ 8162E00 + trainerbattle_single TRAINER_HIKER_OLIVER, RockTunnel_1F_Text_OliverIntro, RockTunnel_1F_Text_OliverDefeat + msgbox RockTunnel_1F_Text_OliverPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E17:: @ 8162E17 - trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC - msgbox gUnknown_81794B4, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Lucas:: @ 8162E17 + trainerbattle_single TRAINER_HIKER_LUCAS, RockTunnel_1F_Text_LucasIntro, RockTunnel_1F_Text_LucasDefeat + msgbox RockTunnel_1F_Text_LucasPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E2E:: @ 8162E2E - trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE - msgbox gUnknown_81794F9, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Ashton:: @ 8162E2E + trainerbattle_single TRAINER_POKEMANIAC_ASHTON, RockTunnel_1F_Text_AshtonIntro, RockTunnel_1F_Text_AshtonDefeat + msgbox RockTunnel_1F_Text_AshtonPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E45:: @ 8162E45 - trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547 - msgbox gUnknown_8179558, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Leah:: @ 8162E45 + trainerbattle_single TRAINER_PICNICKER_LEAH, RockTunnel_1F_Text_LeahIntro, RockTunnel_1F_Text_LeahDefeat + msgbox RockTunnel_1F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E5C:: @ 8162E5C - trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604 - msgbox gUnknown_8179613, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Ariana:: @ 8162E5C + trainerbattle_single TRAINER_PICNICKER_ARIANA, RockTunnel_1F_Text_ArianaIntro, RockTunnel_1F_Text_ArianaDefeat + msgbox RockTunnel_1F_Text_ArianaPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E73:: @ 8162E73 - trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1 - msgbox gUnknown_81795B5, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Dana:: @ 8162E73 + trainerbattle_single TRAINER_PICNICKER_DANA, RockTunnel_1F_Text_DanaIntro, RockTunnel_1F_Text_DanaDefeat + msgbox RockTunnel_1F_Text_DanaPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RockTunnel_1F/text.inc b/data/maps/RockTunnel_1F/text.inc index 56bc4ecbe..162e20f7d 100644 --- a/data/maps/RockTunnel_1F/text.inc +++ b/data/maps/RockTunnel_1F/text.inc @@ -1,83 +1,83 @@ -Text_179366:: @ 8179366 +RockTunnel_1F_Text_LennyIntro:: @ 8179366 .string "This tunnel goes a long way, kid!$" -Text_179388:: @ 8179388 +RockTunnel_1F_Text_LennyDefeat:: @ 8179388 .string "Doh!\n" .string "You win!$" -gUnknown_8179396:: @ 8179396 +RockTunnel_1F_Text_LennyPostBattle:: @ 8179396 .string "Watch for ONIX.\n" .string "They appear only occasionally.\p" .string "High-level ones can put the\n" .string "squeeze on you!$" -Text_1793F1:: @ 81793F1 +RockTunnel_1F_Text_OliverIntro:: @ 81793F1 .string "Hmm.\n" .string "Maybe I'm lost in here…$" -Text_17940E:: @ 817940E +RockTunnel_1F_Text_OliverDefeat:: @ 817940E .string "Ease up!\n" .string "What am I doing?\l" .string "Which way is out?$" -gUnknown_817943A:: @ 817943A +RockTunnel_1F_Text_OliverPostBattle:: @ 817943A .string "That sleeping POKéMON on ROUTE 12\n" .string "forced me to take this detour.$" -Text_17947B:: @ 817947B +RockTunnel_1F_Text_LucasIntro:: @ 817947B .string "Outsiders like you need to show me\n" .string "some respect!$" -Text_1794AC:: @ 81794AC +RockTunnel_1F_Text_LucasDefeat:: @ 81794AC .string "I give!$" -gUnknown_81794B4:: @ 81794B4 +RockTunnel_1F_Text_LucasPostBattle:: @ 81794B4 .string "You're talented enough to hike!$" -Text_1794D4:: @ 81794D4 +RockTunnel_1F_Text_AshtonIntro:: @ 81794D4 .string "POKéMON fight!\n" .string "Ready, go!$" -Text_1794EE:: @ 81794EE +RockTunnel_1F_Text_AshtonDefeat:: @ 81794EE .string "Game over!$" -gUnknown_81794F9:: @ 81794F9 +RockTunnel_1F_Text_AshtonPostBattle:: @ 81794F9 .string "Oh well, I'll get a ZUBAT as I go!$" -Text_17951C:: @ 817951C +RockTunnel_1F_Text_LeahIntro:: @ 817951C .string "Eek!\p" .string "Don't try anything funny in the\n" .string "dark!$" -Text_179547:: @ 8179547 +RockTunnel_1F_Text_LeahDefeat:: @ 8179547 .string "It was too dark…$" -gUnknown_8179558:: @ 8179558 +RockTunnel_1F_Text_LeahPostBattle:: @ 8179558 .string "I saw a MACHOP in this tunnel.$" -Text_179577:: @ 8179577 +RockTunnel_1F_Text_DanaIntro:: @ 8179577 .string "I came this far looking for wild\n" .string "POKéMON.$" -Text_1795A1:: @ 81795A1 +RockTunnel_1F_Text_DanaDefeat:: @ 81795A1 .string "I'm out of POKéMON!$" -gUnknown_81795B5:: @ 81795B5 +RockTunnel_1F_Text_DanaPostBattle:: @ 81795B5 .string "You looked cute and harmless.\n" .string "Was I ever wrong!$" -Text_1795E5:: @ 81795E5 +RockTunnel_1F_Text_ArianaIntro:: @ 81795E5 .string "You have POKéMON!\n" .string "Let's start!$" -Text_179604:: @ 8179604 +RockTunnel_1F_Text_ArianaDefeat:: @ 8179604 .string "You play hard!$" -gUnknown_8179613:: @ 8179613 +RockTunnel_1F_Text_ArianaPostBattle:: @ 8179613 .string "Whew!\n" .string "I'm all sweaty now.$" -gUnknown_817962D:: @ 817962D +RockTunnel_1F_Text_RouteSign:: @ 817962D .string "ROCK TUNNEL\n" .string "CERULEAN CITY - LAVENDER TOWN$" diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index bbd3f59a7..b680bf4a1 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RockTunnel_B1F_EventScript_162EFE", + "script": "RockTunnel_B1F_EventScript_Cooper", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_B1F_EventScript_162EB9", + "script": "RockTunnel_B1F_EventScript_Dudley", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_B1F_EventScript_162E8B", + "script": "RockTunnel_B1F_EventScript_Sofia", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_B1F_EventScript_162ED0", + "script": "RockTunnel_B1F_EventScript_Allen", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_B1F_EventScript_162EE7", + "script": "RockTunnel_B1F_EventScript_Eric", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_B1F_EventScript_162F15", + "script": "RockTunnel_B1F_EventScript_Steve", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RockTunnel_B1F_EventScript_162EA2", + "script": "RockTunnel_B1F_EventScript_Martha", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_B1F_EventScript_162F2C", + "script": "RockTunnel_B1F_EventScript_Winston", "flag": "0" }, { diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index e2c34b53e..54d0e8153 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -1,42 +1,42 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A .byte 0 -RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B - trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9 - msgbox gUnknown_81796CE, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Sofia:: @ 8162E8B + trainerbattle_single TRAINER_PICNICKER_SOFIA, RockTunnel_B1F_Text_SofiaIntro, RockTunnel_B1F_Text_SofiaDefeat + msgbox RockTunnel_B1F_Text_SofiaPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 - trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD - msgbox gUnknown_81798E9, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Martha:: @ 8162EA2 + trainerbattle_single TRAINER_PICNICKER_MARTHA, RockTunnel_B1F_Text_MarthaIntro, RockTunnel_B1F_Text_MarthaDefeat + msgbox RockTunnel_B1F_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 - trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700 - msgbox gUnknown_8179712, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Dudley:: @ 8162EB9 + trainerbattle_single TRAINER_HIKER_DUDLEY, RockTunnel_B1F_Text_DudleyIntro, RockTunnel_B1F_Text_DudleyDefeat + msgbox RockTunnel_B1F_Text_DudleyPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 - trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856 - msgbox gUnknown_817987A, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Allen:: @ 8162ED0 + trainerbattle_single TRAINER_HIKER_ALLEN, RockTunnel_B1F_Text_AllenIntro, RockTunnel_B1F_Text_AllenDefeat + msgbox RockTunnel_B1F_Text_AllenPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 - trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932 - msgbox gUnknown_817993E, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Eric:: @ 8162EE7 + trainerbattle_single TRAINER_HIKER_ERIC, RockTunnel_B1F_Text_EricIntro, RockTunnel_B1F_Text_EricDefeat + msgbox RockTunnel_B1F_Text_EricPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE - trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F - msgbox gUnknown_8179777, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Cooper:: @ 8162EFE + trainerbattle_single TRAINER_POKEMANIAC_COOPER, RockTunnel_B1F_Text_CooperIntro, RockTunnel_B1F_Text_CooperDefeat + msgbox RockTunnel_B1F_Text_CooperPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162F15:: @ 8162F15 - trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB - msgbox gUnknown_81797DE, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Steve:: @ 8162F15 + trainerbattle_single TRAINER_POKEMANIAC_STEVE, RockTunnel_B1F_Text_SteveIntro, RockTunnel_B1F_Text_SteveDefeat + msgbox RockTunnel_B1F_Text_StevePostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C - trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997 - msgbox gUnknown_81799AC, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Winston:: @ 8162F2C + trainerbattle_single TRAINER_POKEMANIAC_WINSTON, RockTunnel_B1F_Text_WinstonIntro, RockTunnel_B1F_Text_WinstonDefeat + msgbox RockTunnel_B1F_Text_WinstonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RockTunnel_B1F/text.inc b/data/maps/RockTunnel_B1F/text.inc index b82f09657..1bf86a5eb 100644 --- a/data/maps/RockTunnel_B1F/text.inc +++ b/data/maps/RockTunnel_B1F/text.inc @@ -1,95 +1,95 @@ -Text_179657:: @ 8179657 +RockTunnel_B1F_Text_SofiaIntro:: @ 8179657 .string "Do you know how you can avoid\n" .string "getting lost in the mountains?\p" .string "You can bend twigs as trail\n" .string "markers.$" -Text_1796B9:: @ 81796B9 +RockTunnel_B1F_Text_SofiaDefeat:: @ 81796B9 .string "Ohhh!\n" .string "I did my best!$" -gUnknown_81796CE:: @ 81796CE +RockTunnel_B1F_Text_SofiaPostBattle:: @ 81796CE .string "I want to go home!$" -Text_1796E1:: @ 81796E1 +RockTunnel_B1F_Text_DudleyIntro:: @ 81796E1 .string "Hahaha!\n" .string "Can you beat my power?$" -Text_179700:: @ 8179700 +RockTunnel_B1F_Text_DudleyDefeat:: @ 8179700 .string "Oops!\n" .string "Outmuscled!$" -gUnknown_8179712:: @ 8179712 +RockTunnel_B1F_Text_DudleyPostBattle:: @ 8179712 .string "I go for power because I hate\n" .string "thinking.$" -Text_17973A:: @ 817973A +RockTunnel_B1F_Text_CooperIntro:: @ 817973A .string "You have a POKéDEX?\n" .string "I want one, too.$" -Text_17975F:: @ 817975F +RockTunnel_B1F_Text_CooperDefeat:: @ 817975F .string "Shoot!\n" .string "I am so jealous!$" -gUnknown_8179777:: @ 8179777 +RockTunnel_B1F_Text_CooperPostBattle:: @ 8179777 .string "When you finish your POKéDEX,\n" .string "can I have it?$" -Text_1797A4:: @ 81797A4 +RockTunnel_B1F_Text_SteveIntro:: @ 81797A4 .string "Um… Do you know about POKéMON\n" .string "cosplay?$" -Text_1797CB:: @ 81797CB +RockTunnel_B1F_Text_SteveDefeat:: @ 81797CB .string "Well, that's that.$" -gUnknown_81797DE:: @ 81797DE +RockTunnel_B1F_Text_StevePostBattle:: @ 81797DE .string "POKéMON cosplay is dressing up as\n" .string "POKéMON for fun.\p" .string "CLEFAIRY is a favorite.$" -Text_179829:: @ 8179829 +RockTunnel_B1F_Text_AllenIntro:: @ 8179829 .string "My POKéMON techniques will leave\n" .string "you crying!$" -Text_179856:: @ 8179856 +RockTunnel_B1F_Text_AllenDefeat:: @ 8179856 .string "I give!\n" .string "You're a better technician!$" -gUnknown_817987A:: @ 817987A +RockTunnel_B1F_Text_AllenPostBattle:: @ 817987A .string "In mountains, you'll often find\n" .string "ROCK-type POKéMON.$" -Text_1798AD:: @ 81798AD +RockTunnel_B1F_Text_MarthaIntro:: @ 81798AD .string "I don't often come here, but I will\n" .string "battle you.$" -Text_1798DD:: @ 81798DD +RockTunnel_B1F_Text_MarthaDefeat:: @ 81798DD .string "Oh!\n" .string "I lost!$" -gUnknown_81798E9:: @ 81798E9 +RockTunnel_B1F_Text_MarthaPostBattle:: @ 81798E9 .string "I like tiny POKéMON.\n" .string "Big ones are too scary!$" -Text_179916:: @ 8179916 +RockTunnel_B1F_Text_EricIntro:: @ 8179916 .string "Hit me with your best shot!$" -Text_179932:: @ 8179932 +RockTunnel_B1F_Text_EricDefeat:: @ 8179932 .string "Fired away!$" -gUnknown_817993E:: @ 817993E +RockTunnel_B1F_Text_EricPostBattle:: @ 817993E .string "I'll raise my POKéMON to beat\n" .string "yours, kid.$" -Text_179968:: @ 8179968 +RockTunnel_B1F_Text_WinstonIntro:: @ 8179968 .string "I draw illustrations of POKéMON\n" .string "when I'm home.$" -Text_179997:: @ 8179997 +RockTunnel_B1F_Text_WinstonDefeat:: @ 8179997 .string "Whew…\n" .string "I'm exhausted…$" -gUnknown_81799AC:: @ 81799AC +RockTunnel_B1F_Text_WinstonPostBattle:: @ 81799AC .string "I'm an artist, not a fighter.\n" .string "I'll go home to draw.$" diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc index 3d728797a..21c87dbc0 100644 --- a/data/maps/SevenIsland_SevaultCanyon/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon/text.inc @@ -120,3 +120,11 @@ gUnknown_818CF2B:: @ 818CF2B .string "SEVAULT CANYON\n" .string "TANOBY RUINS AHEAD$" +Text_18CF4D:: @ 818CF4D + .string "Training by oneself is certainly\n" + .string "not a bad thing.\p" + .string "But it's also not bad to aim for\n" + .string "the top with a partner.\p" + .string "Even BRUNO…\n" + .string "He trained with a fellow by the\l" + .string "name of BRAWLY before.$" diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index b768509fb..6c16bf0c0 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -122,7 +122,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1" }, { "type": "trigger", @@ -131,7 +131,7 @@ "elevation": 3, "var": "VAR_TEMP_7", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7" }, { "type": "trigger", @@ -140,7 +140,7 @@ "elevation": 3, "var": "VAR_TEMP_6", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6" }, { "type": "trigger", @@ -149,7 +149,7 @@ "elevation": 3, "var": "VAR_TEMP_5", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5" }, { "type": "trigger", @@ -158,7 +158,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4" }, { "type": "trigger", @@ -167,7 +167,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3" }, { "type": "trigger", @@ -176,7 +176,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2" } ], "bg_events": [] diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 8758f8517..70ef487b8 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,10 +1,12 @@ +.equ NUM_SWITCHES_PRESSED, VAR_TEMP_8 + SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition .byte 0 SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY - call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07 + call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -12,10 +14,10 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setvar VAR_TEMP_5, 0 setvar VAR_TEMP_6, 0 setvar VAR_TEMP_7, 0 - setvar VAR_TEMP_8, 0 + setvar NUM_SWITCHES_PRESSED, 0 end -EventScript_164E07:: @ 8164E07 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164E07 setobjectxyperm 1, 7, 2 setobjectxyperm 2, 4, 4 setobjectxyperm 3, 10, 4 @@ -25,85 +27,85 @@ EventScript_164E07:: @ 8164E07 setobjectxyperm 7, 9, 8 return -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39 lockall compare VAR_TEMP_1, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_1, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: @ 8164E5C lockall compare VAR_TEMP_2, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_2, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: @ 8164E7F lockall compare VAR_TEMP_3, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_3, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: @ 8164EA2 lockall compare VAR_TEMP_4, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_4, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: @ 8164EC5 lockall compare VAR_TEMP_5, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_5, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: @ 8164EE8 lockall compare VAR_TEMP_6, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_6, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B lockall compare VAR_TEMP_7, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_7, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -EventScript_164F2E:: @ 8164F2E - addvar VAR_TEMP_8, 1 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E + addvar NUM_SWITCHES_PRESSED, 1 playse SE_TRACK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -113,7 +115,7 @@ EventScript_164F2E:: @ 8164F2E delay 60 return -EventScript_164F51:: @ 8164F51 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164F51 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 10 @@ -130,13 +132,13 @@ EventScript_164F51:: @ 8164F51 waitse return -EventScript_164F8A:: @ 8164F8A +SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed:: @ 8164F8A releaseall end -EventScript_164F8C:: @ 8164F8C - call EventScript_164F51 - msgbox gUnknown_817D31B +SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved:: @ 8164F8C + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen + msgbox SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS releaseall end diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc index c6f137869..f86669ce4 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc @@ -1,4 +1,4 @@ -gUnknown_817D31B:: @ 817D31B +SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway:: @ 817D31B .string "A mysterious rumble echoed\n" .string "somewhere far away.$" diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 42c643af5..3f50db9fe 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -29,7 +29,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACC4D", + "script": "SevenIsland_TanobyRuins_EventScript_Brandon", "flag": "0" }, { @@ -42,7 +42,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACC8B", + "script": "SevenIsland_TanobyRuins_EventScript_Benjamin", "flag": "0" }, { @@ -55,7 +55,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACCC9", + "script": "SevenIsland_TanobyRuins_EventScript_Edna", "flag": "0" }, { @@ -68,7 +68,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACD07", + "script": "SevenIsland_TanobyRuins_EventScript_Clifford", "flag": "0" } ], diff --git a/data/maps/SevenIsland_TanobyRuins/text.inc b/data/maps/SevenIsland_TanobyRuins/text.inc new file mode 100644 index 000000000..a5453f527 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins/text.inc @@ -0,0 +1,52 @@ +SevenIsland_TanobyRuins_Text_BrandonIntro:: @ 818CFFB + .string "Do you know anything about this\n" + .string "stone chamber?$" + +SevenIsland_TanobyRuins_Text_BrandonDefeat:: @ 818D02A + .string "That was uncalled for.\n" + .string "You didn't have to be so rough.$" + +SevenIsland_TanobyRuins_Text_BrandonPostBattle:: @ 818D061 + .string "The TANOBY RUINS date back at\n" + .string "least 1,500 years.\p" + .string "But it's a baffling mystery as to\n" + .string "why it was built in the first place.$" + +SevenIsland_TanobyRuins_Text_BenjaminIntro:: @ 818D0D9 + .string "A mystic POKéMON is said to sleep\n" + .string "inside here.$" + +SevenIsland_TanobyRuins_Text_BenjaminDefeat:: @ 818D108 + .string "I'm not much good in battle.$" + +SevenIsland_TanobyRuins_Text_BenjaminPostBattle:: @ 818D125 + .string "I hear there are other ruins like\n" + .string "the one here.\p" + .string "Might they be the resting places\n" + .string "of other mystic POKéMON?$" + +SevenIsland_TanobyRuins_Text_EdnaIntro:: @ 818D18F + .string "CLIFFORD is teaching me how to\n" + .string "paint.$" + +SevenIsland_TanobyRuins_Text_EdnaDefeat:: @ 818D1B5 + .string "We might get in trouble for being\n" + .string "noisy here.$" + +SevenIsland_TanobyRuins_Text_EdnaPostBattle:: @ 818D1E3 + .string "I said that I wanted to paint an\n" + .string "old building.\p" + .string "So CLIFFORD brought me here.$" + +SevenIsland_TanobyRuins_Text_CliffordIntro:: @ 818D22F + .string "Today, in addition to our lesson,\n" + .string "we came to see the chamber.$" + +SevenIsland_TanobyRuins_Text_CliffordDefeat:: @ 818D26D + .string "My, how extraordinary.$" + +SevenIsland_TanobyRuins_Text_CliffordPostBattle:: @ 818D284 + .string "Ah, so you are studying POKéMON\n" + .string "on your own…\p" + .string "Yes, you certainly are quite the\n" + .string "extraordinary person, indeed.$" diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc index 847ae472a..0646e661d 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 .byte 0 SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc index b982b77dd..8a606a2c3 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE .byte 0 SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index d467f79ef..819b2bbc1 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -4,5 +4,5 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc index 2f3d604c3..e29694d8f 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E .byte 0 SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc index dd1a73f83..4917ecdf8 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 .byte 0 SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc index 131a6ecca..f1a13adcb 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A .byte 0 SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc index ff6c851ee..3a7720b4c 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA .byte 0 SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index 26217512e..21a47dcd6 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -6,28 +6,28 @@ SixIsland_DottedHole_1F_OnTransition:: @ 8164188 setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F end -SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C +SixIsland_DottedHole_B1F_EventScript_BrailleUp:: @ 816418C lockall braillemessage Braille_Text_Up waitbuttonpress releaseall end -SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195 +SixIsland_DottedHole_B4F_EventScript_BrailleDown:: @ 8164195 lockall braillemessage Braille_Text_Down waitbuttonpress releaseall end -SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E +SixIsland_DottedHole_B3F_EventScript_BrailleRight:: @ 816419E lockall braillemessage Braille_Text_Right waitbuttonpress releaseall end -SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 +SixIsland_DottedHole_B2F_EventScript_BrailleLeft:: @ 81641A7 lockall braillemessage Braille_Text_Left waitbuttonpress diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 449f0da2d..9d264d645 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B1F_EventScript_16418C" + "script": "SixIsland_DottedHole_B1F_EventScript_BrailleUp" } ] } diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 79cf28355..0dd58ba70 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B2F_EventScript_1641A7" + "script": "SixIsland_DottedHole_B2F_EventScript_BrailleLeft" } ] } diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 6c7af4456..df77a280c 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B3F_EventScript_16419E" + "script": "SixIsland_DottedHole_B3F_EventScript_BrailleRight" } ] } diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 2490d48a7..56e07628d 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B4F_EventScript_164195" + "script": "SixIsland_DottedHole_B4F_EventScript_BrailleDown" } ] } diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index e3cce0b89..0acc6464e 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5", + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire", "flag": "FLAG_HIDE_SAPPHIRE" }, { @@ -63,7 +63,7 @@ "x": 7, "y": 2, "elevation": 0, - "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F" + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage" } ] } diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index a73503f7c..67f4c6a2d 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -1,29 +1,32 @@ +.equ LOCALID_SAPPHIRE, 1 +.equ LOCALID_THIEF, 2 + SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4 .byte 0 -SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 +SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 lock faceplayer textcolor 3 playfanfare MUS_FAN5 - message Text_17BD82 + message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire waitmessage waitfanfare closemessage - setobjectxyperm 2, 5, 0 - addobject 2 + setobjectxyperm LOCALID_THIEF, 5, 0 + addobject LOCALID_THIEF playse SE_RU_HYUU - applymovement 2, Movement_16440F + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn waitmovement 0 playse SE_W070 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_16430F + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_16430F + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16431A + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16431A + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 @@ -31,163 +34,164 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 special Special_ShakeScreen delay 60 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_164325 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_164330 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16433B + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_164346 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest textcolor 0 - msgbox gUnknown_817BD97 + msgbox SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_164351 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_164366 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16437B + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_164390 - removeobject 1 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest + removeobject LOCALID_SAPPHIRE compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1642F9 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2 compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1642F9 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2 compare VAR_FACING, DIR_EAST - call_if_eq EventScript_164304 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2 compare VAR_FACING, DIR_WEST - call_if_eq EventScript_164304 - msgbox gUnknown_817BDD4 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2 + msgbox SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1643A5 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1643B7 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_1643C9 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_1643DB + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest playse SE_KAIDAN delay 35 - removeobject 2 + removeobject LOCALID_THIEF setflag FLAG_LEARNED_YES_NAH_CHANSEY release end -EventScript_1642F9:: @ 81642F9 +@ Lots of redundant scripts below +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: @ 81642F9 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_164304:: @ 8164304 +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: @ 8164304 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_16430F:: @ 816430F +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: @ 816430F applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_16431A:: @ 816431A +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: @ 816431A applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_164325:: @ 8164325 - applymovement 2, Movement_1643ED +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: @ 8164325 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return -EventScript_164330:: @ 8164330 - applymovement 2, Movement_1643ED +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: @ 8164330 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return -EventScript_16433B:: @ 816433B - applymovement 2, Movement_1643F1 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: @ 816433B + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return -EventScript_164346:: @ 8164346 - applymovement 2, Movement_1643F1 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: @ 8164346 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return -EventScript_164351:: @ 8164351 - applymovement 2, Movement_1643F5 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: @ 8164351 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_164366:: @ 8164366 - applymovement 2, Movement_1643F5 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: @ 8164366 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_16437B:: @ 816437B - applymovement 2, Movement_1643F7 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: @ 816437B + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -EventScript_164390:: @ 8164390 - applymovement 2, Movement_1643F7 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: @ 8164390 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_1643A5:: @ 81643A5 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_1643F9 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: @ 81643A5 + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth waitmovement 0 return -EventScript_1643B7:: @ 81643B7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_164401 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: @ 81643B7 + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth waitmovement 0 return -EventScript_1643C9:: @ 81643C9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_164409 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: @ 81643C9 + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return -EventScript_1643DB:: @ 81643DB - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_164409 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: @ 81643DB + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return -Movement_1643ED:: @ 81643ED +SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: @ 81643ED walk_up walk_up walk_in_place_fastest_right step_end -Movement_1643F1:: @ 81643F1 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: @ 81643F1 walk_right walk_right walk_in_place_fastest_up step_end -Movement_1643F5:: @ 81643F5 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: @ 81643F5 walk_right step_end -Movement_1643F7:: @ 81643F7 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow:: @ 81643F7 walk_up step_end -Movement_1643F9:: @ 81643F9 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth:: @ 81643F9 walk_fast_up walk_fast_right walk_fast_right @@ -197,7 +201,7 @@ Movement_1643F9:: @ 81643F9 walk_fast_right step_end -Movement_164401:: @ 8164401 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth:: @ 8164401 walk_fast_down walk_fast_right walk_fast_right @@ -207,7 +211,7 @@ Movement_164401:: @ 8164401 walk_fast_right step_end -Movement_164409:: @ 8164409 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest:: @ 8164409 walk_fast_right walk_fast_right walk_fast_right @@ -215,7 +219,7 @@ Movement_164409:: @ 8164409 walk_fast_up step_end -Movement_16440F:: @ 816440F +SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: @ 816440F face_down disable_anim slide_down @@ -230,12 +234,12 @@ Movement_16440F:: @ 816440F restore_anim step_end -Movement_16441C:: @ 816441C +SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: @ 816441C delay_16 walk_in_place_fastest_right step_end -SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F +SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: @ 816441F lockall setvar VAR_0x8005, 130 braillemessage_wait Braille_Text_LetTheTwo diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc index 713e8cadf..4fdef4a5d 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc @@ -1,12 +1,12 @@ -Text_17BD82:: @ 817BD82 +SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire:: @ 817BD82 .string "{PLAYER} found a SAPPHIRE!$" -gUnknown_817BD97:: @ 817BD97 +SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou:: @ 817BD97 .string "Fufu… Fufufufu…\n" .string "I guessed right.\p" .string "I was right in tailing you!$" -gUnknown_817BDD4:: @ 817BDD4 +SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword:: @ 817BDD4 .string "I knew that there was a SAPPHIRE\n" .string "here, so it belongs to me!\p" .string "I'll sell it to TEAM ROCKET for\n" diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index f6dd0d71c..d3ba4d3c3 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -5,7 +5,7 @@ "music": "MUS_T_MORI", "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 7, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 22ddfed8b..84f116348 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_DunsparceTunnel_EventScript_164D60", + "script": "ThreeIsland_DunsparceTunnel_EventScript_Prospector", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 46e8e15f8..7729b3536 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -7,49 +7,49 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, TRUE - call_if_eq EventScript_164D50 + call_if_eq ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut compare VAR_0x8008, FALSE - call_if_eq EventScript_164D54 + call_if_eq ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall end -EventScript_164D50:: @ 8164D50 - setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 +ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: @ 8164D50 + setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT return -EventScript_164D54:: @ 8164D54 +ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: @ 8164D54 setobjectxyperm 1, 6, 3 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return -ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 +ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60 lock faceplayer - goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2 + goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, TRUE - goto_if_eq EventScript_164D90 - msgbox gUnknown_817D13B + goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold + msgbox ThreeIsland_DunsparceTunnel_Text_ProspectingForGold closemessage applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_164D90:: @ 8164D90 - msgbox gUnknown_817D1C9 +ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90 + msgbox ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou giveitem ITEM_NUGGET - compare VAR_RESULT, 0 - goto_if_eq EventScript_164DB8 + compare VAR_RESULT, FALSE + goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL - goto EventScript_164DC2 + goto ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget end -EventScript_164DB8:: @ 8164DB8 - msgbox gUnknown_817D2DC +ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget:: @ 8164DB8 + msgbox ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull release end -EventScript_164DC2:: @ 8164DC2 - msgbox gUnknown_817D28C +ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget:: @ 8164DC2 + msgbox ThreeIsland_DunsparceTunnel_Text_ThatsANugget release end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/text.inc b/data/maps/ThreeIsland_DunsparceTunnel/text.inc index e8c5269dd..96a0603c4 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/text.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/text.inc @@ -1,4 +1,4 @@ -gUnknown_817D13B:: @ 817D13B +ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B .string "Hey, there!\n" .string "How's it going?\p" .string "What am I doing here, you ask?\n" @@ -6,7 +6,7 @@ gUnknown_817D13B:: @ 817D13B .string "When I strike it rich, I'm buying\n" .string "a house in KANTO.$" -gUnknown_817D1C9:: @ 817D1C9 +ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9 .string "Hey, there! How's it going?\n" .string "Did you hear? I've struck gold!\p" .string "You remembered that I was\n" @@ -16,12 +16,12 @@ gUnknown_817D1C9:: @ 817D1C9 .string "So, I'll show you!\n" .string "This is for you!$" -gUnknown_817D28C:: @ 817D28C +ThreeIsland_DunsparceTunnel_Text_ThatsANugget:: @ 817D28C .string "That's a NUGGET!\p" .string "I can't give you any nuggets of\n" .string "wisdom, so that'll have to do!$" -gUnknown_817D2DC:: @ 817D2DC +ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull:: @ 817D2DC .string "Whoops, your BAG is crammed full!\n" .string "I'll give this to you later.$" diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 03b6b0cdd..9f5ddc540 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_1F_EventScript_160F7B", + "script": "VictoryRoad_1F_EventScript_Rolando", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_1F_EventScript_160F64", + "script": "VictoryRoad_1F_EventScript_Naomi", "flag": "0" }, { @@ -129,7 +129,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_1F", "var_value": 99, - "script": "VictoryRoad_1F_EventScript_160F33" + "script": "VictoryRoad_1F_EventScript_FloorSwitch" } ], "bg_events": [ diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 79d01278f..5bdc91202 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -5,24 +5,24 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 VictoryRoad_1F_OnLoad:: @ 8160F10 compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - call_if_ne EventScript_160F1C + call_if_ne VictoryRoad_1F_EventScript_SetRockBarrier end -EventScript_160F1C:: @ 8160F1C - setmetatile 12, 14, 775, 1 - setmetatile 12, 15, 791, 1 +VictoryRoad_1F_EventScript_SetRockBarrier:: @ 8160F1C + setmetatile 12, 14, METATILE_Cave_RockBarrier_Top, 1 + setmetatile 12, 15, METATILE_Cave_RockBarrier_Bottom, 1 return VictoryRoad_1F_OnTransition:: @ 8160F2F setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end -VictoryRoad_1F_EventScript_160F33:: @ 8160F33 +VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - goto_if_eq EventScript_160F62 - setmetatile 12, 14, 721, 0 - setmetatile 12, 15, 737, 0 + goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed + setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0 + setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse @@ -31,16 +31,16 @@ VictoryRoad_1F_EventScript_160F33:: @ 8160F33 releaseall end -EventScript_160F62:: @ 8160F62 +VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: @ 8160F62 releaseall end -VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738 - msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Naomi:: @ 8160F64 + trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat + msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8 - msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Rolando:: @ 8160F7B + trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat + msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc index 46cd136ad..d83abf202 100644 --- a/data/maps/VictoryRoad_1F/text.inc +++ b/data/maps/VictoryRoad_1F/text.inc @@ -1,22 +1,22 @@ -Text_174710:: @ 8174710 +VictoryRoad_1F_Text_NaomiIntro:: @ 8174710 .string "I wonder if you are good enough\n" .string "for me?$" -Text_174738:: @ 8174738 +VictoryRoad_1F_Text_NaomiDefeat:: @ 8174738 .string "I lost out…$" -gUnknown_8174744:: @ 8174744 +VictoryRoad_1F_Text_NaomiPostBattle:: @ 8174744 .string "I never wanted to lose to anybody,\n" .string "especially to a younger kid…$" -Text_174784:: @ 8174784 +VictoryRoad_1F_Text_RolandoIntro:: @ 8174784 .string "I can see you're good.\n" .string "Let me see exactly how good!$" -Text_1747B8:: @ 81747B8 +VictoryRoad_1F_Text_RolandoDefeat:: @ 81747B8 .string "I had a chance…$" -gUnknown_81747C8:: @ 81747C8 +VictoryRoad_1F_Text_RolandoPostBattle:: @ 81747C8 .string "Tch!\n" .string "I concede, you are better than I!$" diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index bb44ea7d0..33024c025 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_2F_EventScript_161037", + "script": "VictoryRoad_2F_EventScript_Dawson", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_2F_EventScript_16104E", + "script": "VictoryRoad_2F_EventScript_Daisuke", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_2F_EventScript_161065", + "script": "VictoryRoad_2F_EventScript_Nelson", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_2F_EventScript_161093", + "script": "VictoryRoad_2F_EventScript_Vincent", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "VictoryRoad_2F_EventScript_16107C", + "script": "VictoryRoad_2F_EventScript_Gregory", "flag": "0" }, { @@ -256,7 +256,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1", "var_value": 99, - "script": "VictoryRoad_2F_EventScript_160FD5" + "script": "VictoryRoad_2F_EventScript_FloorSwitch1" }, { "type": "trigger", @@ -265,7 +265,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2", "var_value": 99, - "script": "VictoryRoad_2F_EventScript_161006" + "script": "VictoryRoad_2F_EventScript_FloorSwitch2" } ], "bg_events": [] diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 49d21b7de..1dfd658ae 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -4,27 +4,27 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 VictoryRoad_2F_OnLoad:: @ 8160F98 compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - call_if_ne EventScript_160FAF + call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier1 compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - call_if_ne EventScript_160FC2 + call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier2 end -EventScript_160FAF:: @ 8160FAF - setmetatile 13, 10, 775, 1 - setmetatile 13, 11, 791, 1 +VictoryRoad_2F_EventScript_SetRockBarrier1:: @ 8160FAF + setmetatile 13, 10, METATILE_Cave_RockBarrier_Top, 1 + setmetatile 13, 11, METATILE_Cave_RockBarrier_Bottom, 1 return -EventScript_160FC2:: @ 8160FC2 - setmetatile 33, 16, 775, 1 - setmetatile 33, 17, 791, 1 +VictoryRoad_2F_EventScript_SetRockBarrier2:: @ 8160FC2 + setmetatile 33, 16, METATILE_Cave_RockBarrier_Top, 1 + setmetatile 33, 17, METATILE_Cave_RockBarrier_Bottom, 1 return -VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 +VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - goto_if_eq EventScript_161004 - setmetatile 13, 10, 721, 0 - setmetatile 13, 11, 737, 0 + goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed + setmetatile 13, 10, METATILE_Cave_Floor_Ledge_Top, 0 + setmetatile 13, 11, METATILE_Cave_Floor_Ledge_Bottom, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse @@ -33,16 +33,16 @@ VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 releaseall end -EventScript_161004:: @ 8161004 +VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed:: @ 8161004 releaseall end -VictoryRoad_2F_EventScript_161006:: @ 8161006 +VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - goto_if_eq EventScript_161035 - setmetatile 33, 16, 721, 0 - setmetatile 33, 17, 737, 0 + goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed + setmetatile 33, 16, METATILE_Cave_Floor_Ledge_Top, 0 + setmetatile 33, 17, METATILE_Cave_Floor_Ledge_Bottom, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse @@ -51,31 +51,31 @@ VictoryRoad_2F_EventScript_161006:: @ 8161006 releaseall end -EventScript_161035:: @ 8161035 +VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed:: @ 8161035 releaseall end -VictoryRoad_2F_EventScript_161037:: @ 8161037 - trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C - msgbox gUnknown_817483E, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Dawson:: @ 8161037 + trainerbattle_single TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat + msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_16104E:: @ 816104E - trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4 - msgbox gUnknown_81748BB, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Daisuke:: @ 816104E + trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat + msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_161065:: @ 8161065 - trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B - msgbox gUnknown_8174927, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Nelson:: @ 8161065 + trainerbattle_single TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat + msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_16107C:: @ 816107C - trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0 - msgbox gUnknown_81749BB, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Gregory:: @ 816107C + trainerbattle_single TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat + msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_161093:: @ 8161093 - trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A - msgbox gUnknown_8174969, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Vincent:: @ 8161093 + trainerbattle_single TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat + msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_2F/text.inc b/data/maps/VictoryRoad_2F/text.inc index d125ef160..301a5f22b 100644 --- a/data/maps/VictoryRoad_2F/text.inc +++ b/data/maps/VictoryRoad_2F/text.inc @@ -1,54 +1,58 @@ -Text_1747EF:: @ 81747EF +VictoryRoad_2F_Text_DawsonIntro:: @ 81747EF .string "If you can get through here,\n" .string "you can go meet the ELITE FOUR.$" -Text_17482C:: @ 817482C +VictoryRoad_2F_Text_DawsonDefeat:: @ 817482C .string "No!\n" .string "Unbelievable!$" -gUnknown_817483E:: @ 817483E +VictoryRoad_2F_Text_DawsonPostBattle:: @ 817483E .string "I can beat you when it comes to\n" .string "knowledge about POKéMON!$" -Text_174877:: @ 8174877 +VictoryRoad_2F_Text_DaisukeIntro:: @ 8174877 .string "This here is VICTORY ROAD.\n" .string "It's the final test for TRAINERS!$" -Text_1748B4:: @ 81748B4 +VictoryRoad_2F_Text_DaisukeDefeat:: @ 81748B4 .string "Atcho!$" -gUnknown_81748BB:: @ 81748BB +VictoryRoad_2F_Text_DaisukePostBattle:: @ 81748BB .string "If you get stuck, try moving some\n" .string "boulders around.$" -Text_1748EE:: @ 81748EE +VictoryRoad_2F_Text_NelsonIntro:: @ 81748EE .string "Ah, so you wish to challenge the\n" .string "ELITE FOUR?$" -Text_17491B:: @ 817491B +VictoryRoad_2F_Text_NelsonDefeat:: @ 817491B .string "You got me!$" -gUnknown_8174927:: @ 8174927 +VictoryRoad_2F_Text_NelsonPostBattle:: @ 8174927 .string "{RIVAL} also came through here.$" -Text_174942:: @ 8174942 +VictoryRoad_2F_Text_VincentIntro:: @ 8174942 .string "Come on!\n" .string "I'll whip you!$" -Text_17495A:: @ 817495A +VictoryRoad_2F_Text_VincentDefeat:: @ 817495A .string "I got whipped!$" -gUnknown_8174969:: @ 8174969 +VictoryRoad_2F_Text_VincentPostBattle:: @ 8174969 .string "You earned the right to be on\n" .string "VICTORY ROAD…$" -Text_174995:: @ 8174995 +VictoryRoad_2F_Text_GregoryIntro:: @ 8174995 .string "Is VICTORY ROAD too tough?$" -Text_1749B0:: @ 81749B0 +VictoryRoad_2F_Text_GregoryDefeat:: @ 81749B0 .string "Well done!$" -gUnknown_81749BB:: @ 81749BB +VictoryRoad_2F_Text_GregoryPostBattle:: @ 81749BB .string "Many TRAINERS give up their\n" .string "challenge here and go home.$" +@ Unused, old text for Moltres +VictoryRoad_2F_Text_Gyaoo:: @ 81749F3 + .string "ギヤーオ！$" + diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 9d2b982a9..ffde167e7 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_3F_EventScript_161103", + "script": "VictoryRoad_3F_EventScript_George", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_3F_EventScript_161148", + "script": "VictoryRoad_3F_EventScript_Alexa", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "VictoryRoad_3F_EventScript_16111A", + "script": "VictoryRoad_3F_EventScript_Colby", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "VictoryRoad_3F_EventScript_161131", + "script": "VictoryRoad_3F_EventScript_Caroline", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_3F_EventScript_16115F", + "script": "VictoryRoad_3F_EventScript_Ray", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_3F_EventScript_16117A", + "script": "VictoryRoad_3F_EventScript_Tyra", "flag": "0" } ], @@ -215,7 +215,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_3F", "var_value": 99, - "script": "VictoryRoad_3F_EventScript_1610CF" + "script": "VictoryRoad_3F_EventScript_FloorSwitch" } ], "bg_events": [] diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 4cd011f92..f601d83be 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -4,20 +4,20 @@ VictoryRoad_3F_MapScripts:: @ 81610AA VictoryRoad_3F_OnLoad:: @ 81610B0 compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - call_if_ne EventScript_1610BC + call_if_ne VictoryRoad_3F_EventScript_SetRockBarrier end -EventScript_1610BC:: @ 81610BC - setmetatile 12, 12, 775, 1 - setmetatile 12, 13, 791, 1 +VictoryRoad_3F_EventScript_SetRockBarrier:: @ 81610BC + setmetatile 12, 12, METATILE_Cave_RockBarrier_Top, 1 + setmetatile 12, 13, METATILE_Cave_RockBarrier_Bottom, 1 return -VictoryRoad_3F_EventScript_1610CF:: @ 81610CF +VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF lockall compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - goto_if_eq EventScript_161101 - setmetatile 12, 12, 721, 0 - setmetatile 12, 13, 737, 0 + goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed + setmetatile 12, 12, METATILE_Cave_Floor_Ledge_Top, 0 + setmetatile 12, 13, METATILE_Cave_Floor_Ledge_Bottom, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse @@ -27,36 +27,36 @@ VictoryRoad_3F_EventScript_1610CF:: @ 81610CF releaseall end -EventScript_161101:: @ 8161101 +VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed:: @ 8161101 releaseall end -VictoryRoad_3F_EventScript_161103:: @ 8161103 - trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83 - msgbox gUnknown_8174B99, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_George:: @ 8161103 + trainerbattle_single TRAINER_COOLTRAINER_GEORGE, VictoryRoad_3F_Text_GeorgeIntro, VictoryRoad_3F_Text_GeorgeDefeat + msgbox VictoryRoad_3F_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_16111A:: @ 816111A - trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9 - msgbox gUnknown_8174CBD, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Colby:: @ 816111A + trainerbattle_single TRAINER_COOLTRAINER_COLBY, VictoryRoad_3F_Text_ColbyIntro, VictoryRoad_3F_Text_ColbyDefeat + msgbox VictoryRoad_3F_Text_ColbyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_161131:: @ 8161131 - trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A - msgbox gUnknown_8174C67, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Caroline:: @ 8161131 + trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, VictoryRoad_3F_Text_CarolineIntro, VictoryRoad_3F_Text_CarolineDefeat + msgbox VictoryRoad_3F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_161148:: @ 8161148 - trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4 - msgbox gUnknown_8174C03, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Alexa:: @ 8161148 + trainerbattle_single TRAINER_COOLTRAINER_ALEXA, VictoryRoad_3F_Text_AlexaIntro, VictoryRoad_3F_Text_AlexaDefeat + msgbox VictoryRoad_3F_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_16115F:: @ 816115F - trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96 - msgbox gUnknown_8174D64, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Ray:: @ 816115F + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_RayIntro, VictoryRoad_3F_Text_RayDefeat, VictoryRoad_3F_Text_RayNotEnoughMons + msgbox VictoryRoad_3F_Text_RayPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_16117A:: @ 816117A - trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D - msgbox gUnknown_8174E48, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Tyra:: @ 816117A + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_TyraIntro, VictoryRoad_3F_Text_TyraDefeat, VictoryRoad_3F_Text_TyraNotEnoughMons + msgbox VictoryRoad_3F_Text_TyraPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc index 22c42342a..dd60180df 100644 --- a/data/maps/VictoryRoad_3F/text.inc +++ b/data/maps/VictoryRoad_3F/text.inc @@ -1,6 +1,3 @@ -Text_1749F3:: @ 81749F3 - .string "ギヤーオ！$" - Text_DoubleEdgeTeach:: @ 81749F9 .string "You should be proud of yourself,\n" .string "having battled your way through\l" @@ -24,80 +21,80 @@ Text_DoubleEdgeTaught:: @ 8174B0C .string "Take a run at them and knock 'em\n" .string "out!$" -Text_174B60:: @ 8174B60 +VictoryRoad_3F_Text_GeorgeIntro:: @ 8174B60 .string "I heard rumors of a child prodigy.$" -Text_174B83:: @ 8174B83 +VictoryRoad_3F_Text_GeorgeDefeat:: @ 8174B83 .string "The rumors were true!$" -gUnknown_8174B99:: @ 8174B99 +VictoryRoad_3F_Text_GeorgePostBattle:: @ 8174B99 .string "So, it was you who beat GIOVANNI\n" .string "of TEAM ROCKET?$" -Text_174BCA:: @ 8174BCA +VictoryRoad_3F_Text_AlexaIntro:: @ 8174BCA .string "TRAINERS live to seek stronger\n" .string "opponents.$" -Text_174BF4:: @ 8174BF4 +VictoryRoad_3F_Text_AlexaDefeat:: @ 8174BF4 .string "Oh!\n" .string "So strong!$" -gUnknown_8174C03:: @ 8174C03 +VictoryRoad_3F_Text_AlexaPostBattle:: @ 8174C03 .string "By fighting tough battles, you get\n" .string "stronger.$" -Text_174C30:: @ 8174C30 +VictoryRoad_3F_Text_CarolineIntro:: @ 8174C30 .string "I'll show you just how good you\n" .string "are. Not!$" -Text_174C5A:: @ 8174C5A +VictoryRoad_3F_Text_CarolineDefeat:: @ 8174C5A .string "I'm furious!$" -gUnknown_8174C67:: @ 8174C67 +VictoryRoad_3F_Text_CarolinePostBattle:: @ 8174C67 .string "You showed me just how good\n" .string "I was…$" -Text_174C8A:: @ 8174C8A +VictoryRoad_3F_Text_ColbyIntro:: @ 8174C8A .string "Only the chosen can pass here!$" -Text_174CA9:: @ 8174CA9 +VictoryRoad_3F_Text_ColbyDefeat:: @ 8174CA9 .string "I don't believe it!$" -gUnknown_8174CBD:: @ 8174CBD +VictoryRoad_3F_Text_ColbyPostBattle:: @ 8174CBD .string "All TRAINERS here are headed to\n" .string "the POKéMON LEAGUE.\p" .string "Don't let down your guard.$" -Text_174D0C:: @ 8174D0C +VictoryRoad_3F_Text_RayIntro:: @ 8174D0C .string "RAY: Together, the two of us are\n" .string "destined for greatness!$" -Text_174D45:: @ 8174D45 +VictoryRoad_3F_Text_RayDefeat:: @ 8174D45 .string "RAY: Ludicrous!\n" .string "This can't be!$" -gUnknown_8174D64:: @ 8174D64 +VictoryRoad_3F_Text_RayPostBattle:: @ 8174D64 .string "RAY: You've beaten us.\n" .string "Greatness remains elusive…$" -Text_174D96:: @ 8174D96 +VictoryRoad_3F_Text_RayNotEnoughMons:: @ 8174D96 .string "RAY: Together, the two of us are\n" .string "striving for the pinnacle.\p" .string "We need you to bring two POKéMON\n" .string "into battle with us.$" -Text_174E08:: @ 8174E08 +VictoryRoad_3F_Text_TyraIntro:: @ 8174E08 .string "TYRA: We're trying to become\n" .string "champions together.$" -Text_174E39:: @ 8174E39 +VictoryRoad_3F_Text_TyraDefeat:: @ 8174E39 .string "TYRA: Oh, but…$" -gUnknown_8174E48:: @ 8174E48 +VictoryRoad_3F_Text_TyraPostBattle:: @ 8174E48 .string "TYRA: You've taught me that power\n" .string "can be infinite in shape and form.$" -Text_174E8D:: @ 8174E8D +VictoryRoad_3F_Text_TyraNotEnoughMons:: @ 8174E8D .string "TYRA: You can't battle with us if\n" .string "you have only one POKéMON.$" diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 463bc53f5..97f28ced9 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -5,7 +5,7 @@ "music": "MUS_T_MORI", "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 7, |