From f31ebc6f2bee16a9ebb606172a0422055fe4b842 Mon Sep 17 00:00:00 2001 From: Viperio <146665252+Viperio19@users.noreply.github.com> Date: Thu, 23 Apr 2026 17:14:30 +0200 Subject: [PATCH] Document victory road and routes 223 and 224 scripts (#1101) --- asm/macros/scrcmd.inc | 13 +- generated/vars_flags.txt | 20 +- include/applications/naming_screen.h | 2 +- include/constants/sound_volume.h | 7 + include/data/scripts/scrcmd.h | 4 +- include/overlay005/ov5_021F6454.h | 2 +- include/sound.h | 4 +- res/field/events/events_route_223.json | 30 +- res/field/events/events_route_224.json | 38 +- res/field/events/events_victory_road_1f.json | 16 +- .../events/events_victory_road_1f_room_2.json | 58 +-- res/field/events/events_victory_road_2f.json | 56 +-- res/field/events/events_victory_road_b1f.json | 10 +- res/field/scripts/scripts_init_new_game.s | 4 +- res/field/scripts/scripts_route_224.s | 347 +++++++++--------- res/field/scripts/scripts_victory_road_1f.s | 30 +- .../scripts/scripts_victory_road_1f_room_2.s | 257 ++++++------- res/text/route_224.json | 26 +- res/text/victory_road_1f.json | 26 +- res/text/victory_road_1f_room_2.json | 24 +- src/applications/naming_screen.c | 2 +- src/overlay005/ov5_021F6454.c | 8 +- src/scrcmd.c | 6 +- src/unk_0203D1B8.c | 2 +- 24 files changed, 500 insertions(+), 492 deletions(-) create mode 100644 include/constants/sound_volume.h diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index ca522ef296..4da7601511 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -52,6 +52,7 @@ #include "constants/roamer_states.h" #include "constants/savedata/vars_flags.h" #include "constants/scrcmd.h" +#include "constants/sound_volume.h" #include "constants/tv_broadcast.h" #include "constants/battle.h" @@ -3740,9 +3741,9 @@ SetHiddenLocation \hiddenLocation, FALSE .endm - .macro ScrCmd_271 arg0 - .short SCRCMD_271 - .short \arg0 + .macro OpenShayminTabletNamingScreen destVar + .short SCRCMD_OPENSHAYMINTABLETNAMINGSCREEN + .short \destVar .endm .macro BufferTabletName templateArg @@ -4854,9 +4855,9 @@ .short SCRCMD_332 .endm - .macro ScrCmd_333 arg0 - .short SCRCMD_333 - .short \arg0 + .macro SetPlayerVolume volume + .short SCRCMD_SETPLAYERVOLUME + .short \volume .endm .macro AddToGameRecord recordID, value diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 4139bc25ae..1ad4b56187 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -221,7 +221,7 @@ FLAG_MR_FUEGO_ASKED_FOR_TRADE FLAG_COULD_NOT_RECEIVE_POKEMON_NEWS_PRESS_REWARD FLAG_UNK_0x00DD FLAG_RECEIVED_ROUTE_217_WEST_HOUSE_ICICLE_PLATE -FLAG_UNK_0x00DF +FLAG_TALKED_TO_VICTORY_ROAD_1F_ROOM_2_MARLEY FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA FLAG_TALKED_TO_IRON_ISLAND_B2F_LEFT_ROOM_RILEY FLAG_COULD_NOT_RECEIVE_RIOLU_EGG @@ -299,7 +299,7 @@ FLAG_VEILSTONE_STORE_1F_RECEIVED_MASK FLAG_OBTAINED_ETERNA_FOREST_OUTSIDE_ACCESSORY_BIG_TREE FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_SOUTH_GATE_ACCESSORY_FLAG FLAG_WOKE_UP_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE_LITTLE_BOY -FLAG_UNK_0x012D +FLAG_WROTE_ON_ROUTE_224_TABLET FLAG_GAME_CORNER_RECEIVED_20_COINS_OLD_MAN FLAG_GAME_CORNER_RECEIVED_50_COINS_FARMER FLAG_GAME_CORNER_RECEIVED_TM64 @@ -484,7 +484,7 @@ FLAG_UNK_0x01E2 FLAG_UNK_0x01E3 FLAG_HIDE_WAYWARD_CAVE_1F_MIRA FLAG_HIDE_IRON_ISLAND_B2F_LEFT_ROOM_RILEY -FLAG_UNK_0x01E6 +FLAG_HIDE_VICTORY_ROAD_1F_ROOM_2_MARLEY FLAG_HIDE_IRON_ISLAND_B2F_LEFT_ROOM_GRUNTS FLAG_HIDE_ROUTE_213_LOOKER FLAG_UNK_0x01E9 @@ -592,7 +592,7 @@ FLAG_HIDE_HALL_OF_ORIGIN_ARCEUS FLAG_HIDE_FULLMOON_ISLAND_FOREST_CRESSELIA FLAG_HIDE_TURNBACK_CAVE_GIRATINA_ROOM_GIRATINA FLAG_HIDE_FLOWER_PARADISE_SHAYMIN -FLAG_UNK_0x0252 +FLAG_HIDE_ROUTE_224_PROF_OAK FLAG_HIDE_GALACTIC_HQ_HALL_CYRUS FLAG_HIDE_GALACTIC_HQ_HALL_LOOKER FLAG_HIDE_SUNYSHORE_CITY_RIVAL @@ -602,7 +602,7 @@ FLAG_HIDE_POKEMON_MANSION_FIVE_MAID_KNOCKOUT_BOSS FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS FLAG_UNK_0x025A FLAG_HIDE_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE_SAILOR_ELDRITCH -FLAG_UNK_0x025C +FLAG_HIDE_ROUTE_224_SHAYMIN FLAG_HIDE_VALOR_LAKEFRONT_BEAUTY FLAG_HIDE_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE_BEAUTY FLAG_HIDE_ROUTE_217_NORTHEAST_HOUSE_POKEMON_BREEDER_F @@ -636,7 +636,7 @@ FLAG_HIDE_SNOWPOINT_CITY_SAILOR_SS_SPIRAL FLAG_HIDE_OLD_CHATEAU_DINING_AREA_OLD_MAN FLAG_HIDE_OLD_CHATEAU_BACK_MIDDLE_EAST_ROOM_TWIN FLAG_HIDE_VALOR_LAKEFRONT_COLLECTOR -FLAG_UNK_0x027E +FLAG_HIDE_VICTORY_ROAD_1F_COLLECTOR FLAG_HIDE_ROUTE_221_WORKER_WEST FLAG_HIDE_ROUTE_221_WORKER_EAST FLAG_HIDE_VISTA_LIGHTHOUSE_VOLKNER @@ -712,7 +712,7 @@ FLAG_HIDE_TEAM_GALACTIC_ETERNA_BUILDING_1F_WALL_BLOCKING_ROTOMS_ROOM FLAG_UNK_0x02C7 FLAG_HIDE_OREBURGH_MINE_B1F_HIKER FLAG_HIDE_CANALAVE_LIBRARY_2F_HIKER -FLAG_UNK_0x02CA +FLAG_HIDE_ROUTE_224_MARLEY FLAG_HIDE_BATTLE_HALL_MAJOR_NPC FLAG_HIDE_CANALAVE_CITY_RIVAL_LIBRARY FLAG_UNK_0x02CD @@ -4232,7 +4232,7 @@ VAR_UNK_0x4081 VAR_UNK_0x4082 VAR_UNK_0x4083 VAR_ACUITY_LAKEFRONT_STATE -VAR_UNK_0x4085 +VAR_ROUTE_224_STATE VAR_FOLLOWER_RIVAL_STATE VAR_ROUTE_202_STATE VAR_ROUTE_203_RIVAL_STATE @@ -4240,10 +4240,10 @@ VAR_VALLEY_WINDWORKS_STATE VAR_HALLOWED_TOWER_STATE VAR_UNK_0x408B VAR_ROUTE_207_COUNTERPART_TRIGGER_STATE -VAR_UNK_0x408D +VAR_ROUTE_224_PROF_OAK_STATE VAR_GALACTIC_HQ_HALL_STATE VAR_UNK_0x408F -VAR_UNK_0x4090 +VAR_VICTORY_ROAD_1F_ROOM_2_FOLLOWER_MARLEY_STATE VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE VAR_IRON_ISLAND_B2F_LEFT_ROOM_FOLLOWER_RILEY_STATE VAR_OREBURGH_GATE_1F_HIKER_STATE diff --git a/include/applications/naming_screen.h b/include/applications/naming_screen.h index 39eda1748b..d5505ea118 100644 --- a/include/applications/naming_screen.h +++ b/include/applications/naming_screen.h @@ -13,7 +13,7 @@ enum NamingScreenType { NAMING_SCREEN_TYPE_RIVAL, NAMING_SCREEN_TYPE_UNK4, NAMING_SCREEN_TYPE_GROUP, - NAMING_SCREEN_TYPE_UNK6, + NAMING_SCREEN_TYPE_SHAYMIN_TABLET, NAMING_SCREEN_TYPE_PAL_PAD, }; diff --git a/include/constants/sound_volume.h b/include/constants/sound_volume.h new file mode 100644 index 0000000000..b186d617a1 --- /dev/null +++ b/include/constants/sound_volume.h @@ -0,0 +1,7 @@ +#ifndef POKEPLATINUM_CONSTANTS_SOUND_VOLUME_H +#define POKEPLATINUM_CONSTANTS_SOUND_VOLUME_H + +#define SOUND_VOLUME_MIN 0 +#define SOUND_VOLUME_MAX 127 + +#endif // POKEPLATINUM_CONSTANTS_SOUND_VOLUME_H diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h index e3eb52c4c3..6bc1c44c91 100644 --- a/include/data/scripts/scrcmd.h +++ b/include/data/scripts/scrcmd.h @@ -630,7 +630,7 @@ ScriptCommand(SCRCMD_MESSAGEUNOWN, ScrCm ScriptCommand(SCRCMD_GETGBACARTRIDGEVERSION, ScrCmd_GetGBACartridgeVersion) ScriptCommand(SCRCMD_CLEARSPIRITOMBCOUNTER, ScrCmd_ClearSpiritombCounter) ScriptCommand(SCRCMD_SETHIDDENLOCATION, ScrCmd_SetHiddenLocation) -ScriptCommand(SCRCMD_271, ScrCmd_271) +ScriptCommand(SCRCMD_OPENSHAYMINTABLETNAMINGSCREEN, ScrCmd_OpenShayminTabletNamingScreen) ScriptCommand(SCRCMD_BUFFERTABLETNAME, ScrCmd_BufferTabletName) ScriptCommand(SCRCMD_BUFFERCONTESTBACKDROPNAME, ScrCmd_BufferContestBackdropName) ScriptCommand(SCRCMD_HASCOINSFROMVALUE, ScrCmd_HasCoinsFromValue) @@ -824,7 +824,7 @@ ScriptCommand(SCRCMD_CHECKPARTYHASHELDITEM, ScrCm ScriptCommand(SCRCMD_LOGLINKINFOINWIFIHISTORY, ScrCmd_LogLinkInfoInWiFiHistory) ScriptCommand(SCRCMD_331, ScrCmd_331) ScriptCommand(SCRCMD_332, ScrCmd_332) -ScriptCommand(SCRCMD_333, ScrCmd_333) +ScriptCommand(SCRCMD_SETPLAYERVOLUME, ScrCmd_SetPlayerVolume) ScriptCommand(SCRCMD_ADDTOGAMERECORD, ScrCmd_AddToGameRecord) ScriptCommand(SCRCMD_ADDTOGAMERECORDBIGVALUE, ScrCmd_AddToGameRecordBigValue) ScriptCommand(SCRCMD_336, ScrCmd_336) diff --git a/include/overlay005/ov5_021F6454.h b/include/overlay005/ov5_021F6454.h index ca9d79a943..39c47d9211 100644 --- a/include/overlay005/ov5_021F6454.h +++ b/include/overlay005/ov5_021F6454.h @@ -24,6 +24,6 @@ BOOL ScrCmd_332(ScriptContext *ctx); BOOL ScrCmd_338(ScriptContext *ctx); BOOL ScrCmd_339(ScriptContext *ctx); BOOL ScrCmd_LogLinkInfoInWiFiHistory(ScriptContext *ctx); -BOOL ScrCmd_333(ScriptContext *ctx); +BOOL ScrCmd_SetPlayerVolume(ScriptContext *ctx); #endif // POKEPLATINUM_OV5_021F6454_H diff --git a/include/sound.h b/include/sound.h index bf86d5ce22..609bab6a4c 100644 --- a/include/sound.h +++ b/include/sound.h @@ -5,6 +5,7 @@ #include #include +#include "constants/sound_volume.h" #include "generated/sdat.h" #include "sound_system.h" @@ -12,9 +13,6 @@ #define FIELD_BGM_BANK_STATE_IDLE 0 #define FIELD_BGM_BANK_STATE_SWITCH 1 -#define SOUND_VOLUME_MIN 0 -#define SOUND_VOLUME_MAX 127 - #define SOUND_WAVE_BUFFER_SIZE 2000 // Used to set pitch diff --git a/res/field/events/events_route_223.json b/res/field/events/events_route_223.json index aba2e3e09b..962d09f33e 100644 --- a/res/field/events/events_route_223.json +++ b/res/field/events/events_route_223.json @@ -19,7 +19,7 @@ ], "object_events": [ { - "id": "ROUTE_223_SWIMMER_WESLEY", + "id": "LOCALID_SWIMMER_WESLEY", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -36,7 +36,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_RICARDO", + "id": "LOCALID_SWIMMER_RICARDO", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -53,7 +53,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_FRANCISCO", + "id": "LOCALID_SWIMMER_FRANCISCO", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -70,7 +70,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_COLTON", + "id": "LOCALID_SWIMMER_COLTON", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -87,7 +87,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_TROY", + "id": "LOCALID_SWIMMER_TROY", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -104,7 +104,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_OSCAR", + "id": "LOCALID_SWIMMER_OSCAR", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_FACE_COUNTERCLOCKWISE", @@ -121,7 +121,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_MIRANDA", + "id": "LOCALID_SWIMMER_MIRANDA", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -138,7 +138,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_AUBREE", + "id": "LOCALID_SWIMMER_AUBREE", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -155,7 +155,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_PAIGE", + "id": "LOCALID_SWIMMER_PAIGE", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -172,7 +172,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_CRYSTAL", + "id": "LOCALID_SWIMMER_CRYSTAL", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_FACE_CLOCKWISE", @@ -190,7 +190,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_CASSANDRA", + "id": "LOCALID_SWIMMER_CASSANDRA", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "movement_type": "MOVEMENT_TYPE_WALK_WEST_SOUTH_NORTH_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -207,7 +207,7 @@ "y": 0 }, { - "id": "ROUTE_223_SWIMMER_GABRIELLE", + "id": "LOCALID_SWIMMER_GABRIELLE", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -254,7 +254,7 @@ "y": 0 }, { - "id": "ROUTE_223_SAILOR_ZACHARIAH", + "id": "LOCALID_SAILOR_ZACHARIAH", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -271,12 +271,12 @@ "y": 0 }, { - "id": "ROUTE_223_JASMINE_15", + "id": "LOCALID_JASMINE", "clone_id": 9, "graphics_id": "OBJ_EVENT_GFX_JASMINE", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0096", + "hidden_flag": "MAP_HEADER_SUNYSHORE_CITY", "script": 65535, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_route_224.json b/res/field/events/events_route_224.json index 329aad4c82..b1b9ef9b34 100644 --- a/res/field/events/events_route_224.json +++ b/res/field/events/events_route_224.json @@ -112,11 +112,11 @@ "y": 0 }, { - "id": "ROUTE_224_PROF_OAK_3", + "id": "LOCALID_PROF_OAK", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0252", + "hidden_flag": "FLAG_HIDE_ROUTE_224_PROF_OAK", "script": 4, "initial_dir": 1, "data": [], @@ -127,7 +127,7 @@ "y": 0 }, { - "id": "ROUTE_224_BERRY_SOIL_4", + "id": "LOCALID_BERRY_SOIL_1", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -144,7 +144,7 @@ "y": 0 }, { - "id": "ROUTE_224_BERRY_SOIL_5", + "id": "LOCALID_BERRY_SOIL_2", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -161,7 +161,7 @@ "y": 0 }, { - "id": "ROUTE_224_BERRY_SOIL_6", + "id": "LOCALID_BERRY_SOIL_3", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -178,7 +178,7 @@ "y": 0 }, { - "id": "ROUTE_224_BERRY_SOIL_7", + "id": "LOCALID_BERRY_SOIL_4", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -195,7 +195,7 @@ "y": 0 }, { - "id": "ROUTE_224_ACE_TRAINER_RUBEN", + "id": "LOCALID_ACE_TRAINER_RUBEN", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -212,7 +212,7 @@ "y": 0 }, { - "id": "ROUTE_224_PSYCHIC_MAXWELL", + "id": "LOCALID_PSYCHIC_MAXWELL", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -229,7 +229,7 @@ "y": 0 }, { - "id": "ROUTE_224_BLACK_BELT_CARL", + "id": "LOCALID_BLACK_BELT_CARL", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_WALK_SOUTH_EAST_NORTH_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -246,7 +246,7 @@ "y": 0 }, { - "id": "ROUTE_224_VETERAN_ARMANDO", + "id": "LOCALID_VETERAN_ARMANDO", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -263,7 +263,7 @@ "y": 0 }, { - "id": "ROUTE_224_PSYCHIC_BRITTNEY", + "id": "LOCALID_PSYCHIC_BRITTNEY", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -280,7 +280,7 @@ "y": 0 }, { - "id": "ROUTE_224_ACE_TRAINER_JAMIE", + "id": "LOCALID_ACE_TRAINER_JAMIE", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -297,7 +297,7 @@ "y": 0 }, { - "id": "ROUTE_224_RUIN_MANIAC_LARRY", + "id": "LOCALID_RUIN_MANIAC_LARRY", "graphics_id": "OBJ_EVENT_GFX_RUIN_MANIAC", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -314,7 +314,7 @@ "y": 0 }, { - "id": "ROUTE_224_DRAGON_TAMER_HAYDEN", + "id": "LOCALID_DRAGON_TAMER_HAYDEN", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -331,11 +331,11 @@ "y": 0 }, { - "id": "ROUTE_224_SHAYMIN_16", + "id": "LOCALID_SHAYMIN", "graphics_id": "OBJ_EVENT_GFX_SHAYMIN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x025C", + "hidden_flag": "FLAG_HIDE_ROUTE_224_SHAYMIN", "script": 0, "initial_dir": 1, "data": [], @@ -406,11 +406,11 @@ "y": 0 }, { - "id": "ROUTE_224_MARLEY_21", + "id": "LOCALID_MARLEY", "graphics_id": "OBJ_EVENT_GFX_MARLEY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02CA", + "hidden_flag": "FLAG_HIDE_ROUTE_224_MARLEY", "script": 6, "initial_dir": 0, "data": [], @@ -437,7 +437,7 @@ "y": 0, "width": 1, "length": 3, - "var": "VAR_UNK_0x4085", + "var": "VAR_ROUTE_224_STATE", "value": 1 } ] diff --git a/res/field/events/events_victory_road_1f.json b/res/field/events/events_victory_road_1f.json index b424efb0e9..f74247a4da 100644 --- a/res/field/events/events_victory_road_1f.json +++ b/res/field/events/events_victory_road_1f.json @@ -102,7 +102,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_1F_PSYCHIC_BRYCE", + "id": "LOCALID_PSYCHIC_BRYCE", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -119,7 +119,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_1F_BLACK_BELT_MILES", + "id": "LOCALID_BLACK_BELT_MILES", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_FACE_SIDES", @@ -136,7 +136,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_1F_BIRD_KEEPER_HANA", + "id": "LOCALID_BIRD_KEEPER_HANA", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -153,7 +153,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_1F_ACE_TRAINER_MARIAH", + "id": "LOCALID_ACE_TRAINER_MARIAH", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -170,7 +170,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_1F_VETERAN_EDGAR", + "id": "LOCALID_VETERAN_EDGAR", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -187,7 +187,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_1F_DRAGON_TAMER_CLINTON", + "id": "LOCALID_DRAGON_TAMER_CLINTON", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -204,11 +204,11 @@ "y": 0 }, { - "id": "VICTORY_ROAD_1F_COLLECTOR_11", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x027E", + "hidden_flag": "FLAG_HIDE_VICTORY_ROAD_1F_COLLECTOR", "script": 2, "initial_dir": 2, "data": [], diff --git a/res/field/events/events_victory_road_1f_room_2.json b/res/field/events/events_victory_road_1f_room_2.json index cacc91cd1c..59ed4375ec 100644 --- a/res/field/events/events_victory_road_1f_room_2.json +++ b/res/field/events/events_victory_road_1f_room_2.json @@ -103,7 +103,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_ACE_TRAINER_MICAH", + "id": "LOCALID_ACE_TRAINER_MICAH", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -120,7 +120,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_ACE_TRAINER_BRANDI", + "id": "LOCALID_ACE_TRAINER_BRANDI", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -137,7 +137,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_PSYCHIC_DESIREE", + "id": "LOCALID_PSYCHIC_DESIREE", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -154,7 +154,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_PSYCHIC_LANDON", + "id": "LOCALID_PSYCHIC_LANDON", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -171,7 +171,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_BLACK_BELT_EDDIE", + "id": "LOCALID_BLACK_BELT_EDDIE", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -188,7 +188,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_VETERAN_TERRELL", + "id": "LOCALID_VETERAN_TERRELL", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -205,7 +205,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_ACE_TRAINER_ARTHUR", + "id": "LOCALID_ACE_TRAINER_ARTHUR", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -222,7 +222,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_ACE_TRAINER_CLARICE", + "id": "LOCALID_ACE_TRAINER_CLARICE", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -239,7 +239,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_PSYCHIC_DEANDRE", + "id": "LOCALID_PSYCHIC_DEANDRE", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -256,7 +256,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_PSYCHIC_KENDRA", + "id": "LOCALID_PSYCHIC_KENDRA", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -273,7 +273,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_BIRD_KEEPER_AUTUMN", + "id": "LOCALID_BIRD_KEEPER_AUTUMN", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -290,7 +290,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_DRAGON_TAMER_JOE", + "id": "LOCALID_DRAGON_TAMER_JOE", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -307,7 +307,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_BLACK_BELT_WILLIE", + "id": "LOCALID_BLACK_BELT_WILLIE", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -324,7 +324,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_VETERAN_BRENDEN", + "id": "LOCALID_VETERAN_BRENDEN", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -341,7 +341,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_18", + "id": "LOCALID_STRENGTH_BOULDER_1", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -356,7 +356,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_19", + "id": "LOCALID_STRENGTH_BOULDER_2", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -371,7 +371,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_20", + "id": "LOCALID_STRENGTH_BOULDER_3", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -386,7 +386,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_21", + "id": "LOCALID_STRENGTH_BOULDER_4", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -401,7 +401,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_22", + "id": "LOCALID_STRENGTH_BOULDER_5", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -416,7 +416,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_23", + "id": "LOCALID_STRENGTH_BOULDER_6", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -431,7 +431,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_24", + "id": "LOCALID_STRENGTH_BOULDER_7", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -446,7 +446,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_25", + "id": "LOCALID_STRENGTH_BOULDER_8", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -461,7 +461,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_26", + "id": "LOCALID_STRENGTH_BOULDER_9", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -476,7 +476,7 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_STRENGTH_BOULDER_27", + "id": "LOCALID_STRENGTH_BOULDER_10", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -491,11 +491,11 @@ "y": 1 }, { - "id": "VICTORY_ROAD_1F_ROOM_2_MARLEY_28", + "id": "LOCALID_MARLEY", "graphics_id": "OBJ_EVENT_GFX_MARLEY", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01E6", + "hidden_flag": "FLAG_HIDE_VICTORY_ROAD_1F_ROOM_2_MARLEY", "script": 9705, "initial_dir": 3, "data": [], @@ -528,7 +528,7 @@ "y": 0, "width": 4, "length": 1, - "var": "VAR_UNK_0x4090", + "var": "VAR_VICTORY_ROAD_1F_ROOM_2_FOLLOWER_MARLEY_STATE", "value": 1 }, { @@ -538,7 +538,7 @@ "y": 0, "width": 1, "length": 6, - "var": "VAR_UNK_0x4090", + "var": "VAR_VICTORY_ROAD_1F_ROOM_2_FOLLOWER_MARLEY_STATE", "value": 1 }, { @@ -548,7 +548,7 @@ "y": 0, "width": 1, "length": 6, - "var": "VAR_UNK_0x4090", + "var": "VAR_VICTORY_ROAD_1F_ROOM_2_FOLLOWER_MARLEY_STATE", "value": 0 } ] diff --git a/res/field/events/events_victory_road_2f.json b/res/field/events/events_victory_road_2f.json index 880ed89ed4..2db6bf2601 100644 --- a/res/field/events/events_victory_road_2f.json +++ b/res/field/events/events_victory_road_2f.json @@ -79,7 +79,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_ACE_TRAINER_OMAR", + "id": "LOCALID_ACE_TRAINER_OMAR", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -96,7 +96,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_ACE_TRAINER_SYDNEY", + "id": "LOCALID_ACE_TRAINER_SYDNEY", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -113,7 +113,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_VETERAN_CLAYTON", + "id": "LOCALID_VETERAN_CLAYTON", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -130,7 +130,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_DOUBLE_TEAM_TRAINER_AL", + "id": "LOCALID_DOUBLE_TEAM_TRAINER_AL", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -148,7 +148,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_DOUBLE_TEAM_TRAINER_KAY", + "id": "LOCALID_DOUBLE_TEAM_TRAINER_KAY", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -166,7 +166,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_9", + "id": "LOCALID_STRENGTH_BOULDER_1", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -181,7 +181,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_10", + "id": "LOCALID_STRENGTH_BOULDER_2", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -196,7 +196,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_11", + "id": "LOCALID_STRENGTH_BOULDER_3", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -211,7 +211,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_12", + "id": "LOCALID_STRENGTH_BOULDER_4", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -226,7 +226,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_13", + "id": "LOCALID_STRENGTH_BOULDER_5", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -241,7 +241,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_ROCK_SMASH_14", + "id": "LOCALID_ROCK_SMASH_1", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -256,7 +256,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_15", + "id": "LOCALID_STRENGTH_BOULDER_6", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -271,7 +271,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_16", + "id": "LOCALID_STRENGTH_BOULDER_7", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -286,7 +286,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_17", + "id": "LOCALID_STRENGTH_BOULDER_8", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -301,7 +301,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_18", + "id": "LOCALID_STRENGTH_BOULDER_9", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -316,7 +316,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_19", + "id": "LOCALID_STRENGTH_BOULDER_10", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -331,7 +331,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_20", + "id": "LOCALID_STRENGTH_BOULDER_11", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -346,7 +346,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_21", + "id": "LOCALID_STRENGTH_BOULDER_12", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -361,7 +361,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_22", + "id": "LOCALID_STRENGTH_BOULDER_13", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -376,7 +376,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_23", + "id": "LOCALID_STRENGTH_BOULDER_14", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -391,7 +391,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_24", + "id": "LOCALID_STRENGTH_BOULDER_15", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -406,7 +406,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_STRENGTH_BOULDER_25", + "id": "LOCALID_STRENGTH_BOULDER_16", "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -421,7 +421,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_ROCK_SMASH_26", + "id": "LOCALID_ROCK_SMASH_2", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -436,7 +436,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_ROCK_SMASH_27", + "id": "LOCALID_ROCK_SMASH_3", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -451,7 +451,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_ROCK_SMASH_28", + "id": "LOCALID_ROCK_SMASH_4", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -466,7 +466,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_ROCK_SMASH_29", + "id": "LOCALID_ROCK_SMASH_5", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -481,7 +481,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_ROCK_SMASH_30", + "id": "LOCALID_ROCK_SMASH_6", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -496,7 +496,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_2F_ROCK_SMASH_31", + "id": "LOCALID_ROCK_SMASH_7", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_victory_road_b1f.json b/res/field/events/events_victory_road_b1f.json index 94e8a009b1..d23237e68b 100644 --- a/res/field/events/events_victory_road_b1f.json +++ b/res/field/events/events_victory_road_b1f.json @@ -34,7 +34,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_B1F_DOUBLE_TEAM_TRAINER_PAT", + "id": "LOCALID_DOUBLE_TEAM_TRAINER_PAT", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_FOLLOW_PARTNER_TRAINER", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -52,7 +52,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_B1F_DOUBLE_TEAM_TRAINER_JO", + "id": "LOCALID_DOUBLE_TEAM_TRAINER_JO", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_WALK_WEST_NORTH_EAST_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -70,7 +70,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_B1F_DRAGON_TAMER_ONDREJ", + "id": "LOCALID_DRAGON_TAMER_ONDREJ", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -87,7 +87,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_B1F_PSYCHIC_VALENCIA", + "id": "LOCALID_PSYCHIC_VALENCIA", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -104,7 +104,7 @@ "y": 0 }, { - "id": "VICTORY_ROAD_B1F_ACE_TRAINER_HENRY", + "id": "LOCALID_ACE_TRAINER_HENRY", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_NORMAL", diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index e33f5d6342..9963679da3 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -106,8 +106,8 @@ _0006: InitDailyRandomLevel SetFlag FLAG_HIDE_IRON_ISLAND_HOUSE_BYRON SetFlag FLAG_HIDE_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE_SAILOR_ELDRITCH - SetFlag FLAG_UNK_0x0252 - SetFlag FLAG_UNK_0x02CA + SetFlag FLAG_HIDE_ROUTE_224_PROF_OAK + SetFlag FLAG_HIDE_ROUTE_224_MARLEY SetFlag FLAG_OBTAINED_FULLMOON_ISLAND_FOREST_LUNAR_WING SetVar VAR_CONSECUTIVE_BONUS_ROUND_WINS, 9 SetFlag FLAG_HIDE_TURNBACK_CAVE_GIRATINA_ROOM_ITEM diff --git a/res/field/scripts/scripts_route_224.s b/res/field/scripts/scripts_route_224.s index 0559e271d5..f45dfb2c88 100644 --- a/res/field/scripts/scripts_route_224.s +++ b/res/field/scripts/scripts_route_224.s @@ -2,213 +2,214 @@ #include "generated/distribution_events.h" #include "generated/hidden_locations.h" #include "res/text/bank/route_224.h" +#include "res/field/events/events_route_224.h" - ScriptEntry _001A - ScriptEntry _0082 - ScriptEntry _00B8 - ScriptEntry _00E4 - ScriptEntry _0458 - ScriptEntry _05F4 + ScriptEntry Route224_OnTransition + ScriptEntry Route224_OnResume + ScriptEntry Route224_Tablet + ScriptEntry Route224_ProfOak + ScriptEntry Route224_TriggerMarley + ScriptEntry Route224_Marley ScriptEntryEnd -_001A: - CallIfEq VAR_SHAYMIN_EVENT_STATE, 1, _00AA - GoToIfSet FLAG_UNK_0x012D, _0080 +Route224_OnTransition: + CallIfEq VAR_SHAYMIN_EVENT_STATE, 1, Route224_IncreaseVars + GoToIfSet FLAG_WROTE_ON_ROUTE_224_TABLET, Route224_DontHideProfOak CheckGameCompleted VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _0080 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, Route224_DontHideProfOak GetNationalDexEnabled VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _0080 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, Route224_DontHideProfOak CheckItem ITEM_OAKS_LETTER, 1, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, FALSE, _0080 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, Route224_DontHideProfOak CheckDistributionEvent DISTRIBUTION_EVENT_SHAYMIN, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, FALSE, _0080 - ClearFlag FLAG_UNK_0x0252 -_0080: + GoToIfEq VAR_MAP_LOCAL_0, FALSE, Route224_DontHideProfOak + ClearFlag FLAG_HIDE_ROUTE_224_PROF_OAK +Route224_DontHideProfOak: End -_0082: - GoToIfSet FLAG_UNK_0x012D, _009A - CallIfEq VAR_UNK_0x408D, 1, _009C -_009A: +Route224_OnResume: + GoToIfSet FLAG_WROTE_ON_ROUTE_224_TABLET, Route224_OnResumeEnd + CallIfEq VAR_ROUTE_224_PROF_OAK_STATE, 1, Route224_SetProfOakDirNorth +Route224_OnResumeEnd: End -_009C: - ScrCmd_18C 3, DIR_NORTH +Route224_SetProfOakDirNorth: + ScrCmd_18C LOCALID_PROF_OAK, DIR_NORTH Return Route224_Unused: - SetFlag FLAG_UNK_0x02CA + SetFlag FLAG_HIDE_ROUTE_224_MARLEY Return -_00AA: +Route224_IncreaseVars: SetVar VAR_SHAYMIN_EVENT_STATE, 2 - SetVar VAR_UNK_0x4085, 1 + SetVar VAR_ROUTE_224_STATE, 1 Return -_00B8: +Route224_Tablet: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x012D, _00D6 - Message 7 + GoToIfSet FLAG_WROTE_ON_ROUTE_224_TABLET, Route224_NameWhomIThank + Message Route224_Text_SurfaceIsUnmarked WaitButton CloseMessage ReleaseAll End -_00D6: +Route224_NameWhomIThank: BufferTabletName 1 - Message 8 + Message Route224_Text_NameWhomIThank WaitButton CloseMessage ReleaseAll End -_00E4: - GoToIfSet FLAG_UNK_0x012D, _022D +Route224_ProfOak: + GoToIfSet FLAG_WROTE_ON_ROUTE_224_TABLET, Route224_WhatWasThatPokemon2Return2 PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - SetVar VAR_UNK_0x408D, 1 + SetVar VAR_ROUTE_224_PROF_OAK_STATE, 1 BufferPlayerName 0 GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_FEMALE, _0219 - Message 0 -_0114: + GoToIfEq VAR_RESULT, GENDER_FEMALE, Route224_ExamineTabletFemale + Message Route224_Text_ExamineTabletMale +Route224_ExamineTablet: CloseMessage - Call _0240 + Call Route224_PlayerWalkToTabletFaceProfOak BufferPlayerName 0 - Message 2 + Message Route224_Text_SayThanksToWhom CloseMessage -_0124: +Route224_ExpressThanks: FadeScreenOut WaitFadeScreen - ScrCmd_271 VAR_RESULT + OpenShayminTabletNamingScreen VAR_RESULT FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 1, _0222 + GoToIfEq VAR_RESULT, 1, Route224_NotSuggestingNoOne BufferPlayerName 0 BufferTabletName 1 - Message 3 + Message Route224_Text_ExpressThanksToName ShowYesNoMenu VAR_RESULT CloseMessage - GoToIfEq VAR_RESULT, MENU_NO, _0124 - Call _029A + GoToIfEq VAR_RESULT, MENU_NO, Route224_ExpressThanks + Call Route224_PlayerProfOakFaceTablet WaitTime 15, VAR_RESULT FadeOutBGM 0, 10 FadeScreenOut FADE_SCREEN_SPEED_SLOW, COLOR_WHITE WaitFadeScreen EnableHiddenLocation HIDDEN_LOCATION_SEABREAK_PATH - ScrCmd_333 0 - Warp MAP_HEADER_ROUTE_224, 0, 0x38C, 0x1EC, DIR_NORTH + SetPlayerVolume SOUND_VOLUME_MIN + Warp MAP_HEADER_ROUTE_224, 0, 908, 492, DIR_NORTH WaitTime 15, VAR_RESULT FadeScreenIn FADE_SCREEN_SPEED_SLOW, COLOR_WHITE WaitFadeScreen - Call _02B8 - CallIfNe VAR_SHAYMIN_EVENT_STATE, 2, _01F0 - CallIfEq VAR_SHAYMIN_EVENT_STATE, 2, _01F5 + Call Route224_ShayminSceneMovement + CallIfNe VAR_SHAYMIN_EVENT_STATE, 2, Route224_WhatWasThatPokemon2Return + CallIfEq VAR_SHAYMIN_EVENT_STATE, 2, Route224_ThankYou WaitButton CloseMessage - ScrCmd_333 127 + SetPlayerVolume SOUND_VOLUME_MAX FadeInBGM 10 - SetFlag FLAG_UNK_0x012D - SetFlag FLAG_UNK_0x0252 - SetFlag FLAG_UNK_0x02CA - SetVar VAR_UNK_0x408D, 0 + SetFlag FLAG_WROTE_ON_ROUTE_224_TABLET + SetFlag FLAG_HIDE_ROUTE_224_PROF_OAK + SetFlag FLAG_HIDE_ROUTE_224_MARLEY + SetVar VAR_ROUTE_224_PROF_OAK_STATE, 0 ReleaseAll End -_01F0: - Message 5 +Route224_WhatWasThatPokemon2Return: + Message Route224_Text_WhatWasThatPokemon2 Return -_01F5: - Message 4 +Route224_ThankYou: + Message Route224_Text_WhatWasThatPokemon CloseMessage - ApplyMovement 21, _05EC + ApplyMovement LOCALID_MARLEY, Route224_Movement_MarleyWalkOnSpotEast WaitMovement - ApplyMovement LOCALID_PLAYER, _0438 + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerWalkOnSpotWest WaitMovement WaitTime 15, VAR_RESULT - Message 11 + Message Route224_Text_ThankYou Return -_0219: - Message 1 - GoTo _0114 +Route224_ExamineTabletFemale: + Message Route224_Text_ExamineTabletFemale + GoTo Route224_ExamineTablet -_0222: - Message 6 +Route224_NotSuggestingNoOne: + Message Route224_Text_NotSuggestingNoOne CloseMessage - GoTo _0124 + GoTo Route224_ExpressThanks -_022D: - NPCMessage 5 +Route224_WhatWasThatPokemon2Return2: + NPCMessage Route224_Text_WhatWasThatPokemon2 End -_0240: +Route224_PlayerWalkToTabletFaceProfOak: GetPlayerMapPos VAR_0x8000, VAR_0x8001 SetVar VAR_0x8008, VAR_0x8000 - GoToIfEq VAR_0x8008, 0x38D, _0272 - GoToIfEq VAR_0x8008, 0x38E, _0286 - ApplyMovement LOCALID_PLAYER, _0328 + GoToIfEq VAR_0x8008, 909, Route224_PlayerWalkToTabletFaceProfOakX909 + GoToIfEq VAR_0x8008, 910, Route224_PlayerWalkToTabletFaceProfOakX910 + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerFaceTabletThenProfOak WaitMovement Return -_0272: - ApplyMovement LOCALID_PLAYER, _0338 - ApplyMovement 3, _0364 +Route224_PlayerWalkToTabletFaceProfOakX909: + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerWalkToTabletFaceProfOakX909 + ApplyMovement LOCALID_PROF_OAK, Route224_Movement_ProfOakWatchPlayerWalkToTabletX909 WaitMovement Return -_0286: - ApplyMovement LOCALID_PLAYER, _034C - ApplyMovement 3, _0370 +Route224_PlayerWalkToTabletFaceProfOakX910: + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerWalkToTabletFaceProfOakX910 + ApplyMovement LOCALID_PROF_OAK, Route224_Movement_ProfOakWatchPlayerWalkToTabletX910 WaitMovement Return -_029A: - ApplyMovement LOCALID_PLAYER, _0384 - ApplyMovement 3, _0384 +Route224_PlayerProfOakFaceTablet: + ApplyMovement LOCALID_PLAYER, Route224_Movement_FaceNorth + ApplyMovement LOCALID_PROF_OAK, Route224_Movement_FaceNorth WaitMovement Return -_02AE: - ApplyMovement 21, _066C +Route224_MarleyNoticeShaymin: + ApplyMovement LOCALID_MARLEY, Route224_Movement_MarleyNoticeShaymin Return -_02B8: - ApplyMovement 3, _0404 - ApplyMovement LOCALID_PLAYER, _03C8 - ApplyMovement 16, _0440 +Route224_ShayminSceneMovement: + ApplyMovement LOCALID_PROF_OAK, Route224_Movement_ProfOakLookAround + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerLookAround + ApplyMovement LOCALID_SHAYMIN, Route224_Movement_ShayminEnter WaitMovement PlayCry SPECIES_SHAYMIN WaitCry - CallIfEq VAR_SHAYMIN_EVENT_STATE, 2, _02AE - ApplyMovement 3, _038C - ApplyMovement 16, _03B0 - ApplyMovement LOCALID_PLAYER, _039C + CallIfEq VAR_SHAYMIN_EVENT_STATE, 2, Route224_MarleyNoticeShaymin + ApplyMovement LOCALID_PROF_OAK, Route224_Movement_ProfOakNoticeShaymin + ApplyMovement LOCALID_SHAYMIN, Route224_Movement_ShayminNoticePeople + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerNoticeShaymin WaitMovement - ApplyMovement 16, _0448 + ApplyMovement LOCALID_SHAYMIN, Route224_Movement_ShayminLeave WaitMovement - SetFlag FLAG_UNK_0x025C - RemoveObject 16 + SetFlag FLAG_HIDE_ROUTE_224_SHAYMIN + RemoveObject LOCALID_SHAYMIN PlayCry SPECIES_SHAYMIN WaitCry - ApplyMovement 3, _03C0 + ApplyMovement LOCALID_PROF_OAK, Route224_Movement_ProfOakFaceWest WaitMovement Return .balign 4, 0 -_0328: +Route224_Movement_PlayerFaceTabletThenProfOak: FaceNorth Delay16 FaceEast EndMovement .balign 4, 0 -_0338: +Route224_Movement_PlayerWalkToTabletFaceProfOakX909: WalkNormalWest WalkNormalNorth Delay16 @@ -216,7 +217,7 @@ _0338: EndMovement .balign 4, 0 -_034C: +Route224_Movement_PlayerWalkToTabletFaceProfOakX910: WalkNormalSouth WalkNormalWest 2 WalkNormalNorth @@ -225,13 +226,13 @@ _034C: EndMovement .balign 4, 0 -_0364: +Route224_Movement_ProfOakWatchPlayerWalkToTabletX909: Delay8 FaceWest EndMovement .balign 4, 0 -_0370: +Route224_Movement_ProfOakWatchPlayerWalkToTabletX910: Delay8 FaceSouth Delay8 2 @@ -239,19 +240,19 @@ _0370: EndMovement .balign 4, 0 -_0384: +Route224_Movement_FaceNorth: FaceNorth EndMovement .balign 4, 0 -_038C: +Route224_Movement_ProfOakNoticeShaymin: FaceEast EmoteExclamationMark Delay16 EndMovement .balign 4, 0 -_039C: +Route224_Movement_PlayerNoticeShaymin: Delay16 FaceEast EmoteExclamationMark @@ -259,19 +260,19 @@ _039C: EndMovement .balign 4, 0 -_03B0: +Route224_Movement_ShayminNoticePeople: FaceWest EmoteExclamationMark Delay16 EndMovement .balign 4, 0 -_03C0: +Route224_Movement_ProfOakFaceWest: FaceWest EndMovement .balign 4, 0 -_03C8: +Route224_Movement_PlayerLookAround: FaceWest Delay16 FaceSouth @@ -289,7 +290,7 @@ _03C8: EndMovement .balign 4, 0 -_0404: +Route224_Movement_ProfOakLookAround: FaceSouth Delay16 FaceEast @@ -307,170 +308,170 @@ Route224_UnusedMovement: EndMovement .balign 4, 0 -_0438: +Route224_Movement_PlayerWalkOnSpotWest: WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0440: +Route224_Movement_ShayminEnter: WalkNormalSouth 12 EndMovement .balign 4, 0 -_0448: +Route224_Movement_ShayminLeave: FaceNorth Delay16 WalkSlightlyFastNorth 12 EndMovement -_0458: +Route224_TriggerMarley: LockAll - ClearFlag FLAG_UNK_0x02CA + ClearFlag FLAG_HIDE_ROUTE_224_MARLEY GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x1F0, _048D - GoToIfEq VAR_0x8005, 0x1F1, _04AF - GoToIfEq VAR_0x8005, 0x1F2, _04D1 + GoToIfEq VAR_0x8005, 496, Route224_MarleyWalkToPlayerZ496 + GoToIfEq VAR_0x8005, 497, Route224_MarleyWalkToPlayerZ497 + GoToIfEq VAR_0x8005, 498, Route224_MarleyWalkToPlayerZ498 End -_048D: - SetObjectEventPos 21, 0x386, 0x1F8 - AddObject 21 - LockObject 21 - ApplyMovement 21, _0598 +Route224_MarleyWalkToPlayerZ496: + SetObjectEventPos LOCALID_MARLEY, 902, 504 + AddObject LOCALID_MARLEY + LockObject LOCALID_MARLEY + ApplyMovement LOCALID_MARLEY, Route224_Movement_MarleyWalkToPlayerZ496 WaitMovement - GoTo _04F3 + GoTo Route224_PokemonThatConveysGratitude End -_04AF: - SetObjectEventPos 21, 0x386, 0x1F9 - AddObject 21 - LockObject 21 - ApplyMovement 21, _05A4 +Route224_MarleyWalkToPlayerZ497: + SetObjectEventPos LOCALID_MARLEY, 902, 505 + AddObject LOCALID_MARLEY + LockObject LOCALID_MARLEY + ApplyMovement LOCALID_MARLEY, Route224_Movement_MarleyWalkToPlayerZ497 WaitMovement - GoTo _04F3 + GoTo Route224_PokemonThatConveysGratitude End -_04D1: - SetObjectEventPos 21, 0x386, 0x1FA - AddObject 21 - LockObject 21 - ApplyMovement 21, _05B0 +Route224_MarleyWalkToPlayerZ498: + SetObjectEventPos LOCALID_MARLEY, 902, 506 + AddObject LOCALID_MARLEY + LockObject LOCALID_MARLEY + ApplyMovement LOCALID_MARLEY, Route224_Movement_MarleyWalkToPlayerZ498 WaitMovement - GoTo _04F3 + GoTo Route224_PokemonThatConveysGratitude End -_04F3: - ApplyMovement LOCALID_PLAYER, _0628 +Route224_PokemonThatConveysGratitude: + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerWalkOnSpotWest2 WaitMovement - Message 9 + Message Route224_Text_PokemonThatConveysGratitude CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x1F0, _0531 - GoToIfEq VAR_0x8005, 0x1F1, _054B - GoToIfEq VAR_0x8005, 0x1F2, _0565 + GoToIfEq VAR_0x8005, 496, Route224_MarleyWalkToTabletZ496 + GoToIfEq VAR_0x8005, 497, Route224_MarleyWalkToTabletZ497 + GoToIfEq VAR_0x8005, 498, Route224_MarleyWalkToTabletZ498 End -_0531: - ApplyMovement 21, _05BC - ApplyMovement LOCALID_PLAYER, _0630 +Route224_MarleyWalkToTabletZ496: + ApplyMovement LOCALID_MARLEY, Route224_Movement_MarleyWalkToTabletZ496 + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerWatchMarleyWalkToTabletZ496 WaitMovement - GoTo _057F + GoTo Route224_ThatStoneTablet End -_054B: - ApplyMovement 21, _05CC - ApplyMovement LOCALID_PLAYER, _0644 +Route224_MarleyWalkToTabletZ497: + ApplyMovement LOCALID_MARLEY, Route224_Movement_MarleyWalkToTabletZ497 + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerWatchMarleyWalkToTabletZ497 WaitMovement - GoTo _057F + GoTo Route224_ThatStoneTablet End -_0565: - ApplyMovement 21, _05DC - ApplyMovement LOCALID_PLAYER, _0658 +Route224_MarleyWalkToTabletZ498: + ApplyMovement LOCALID_MARLEY, Route224_Movement_MarleyWalkToTabletZ498 + ApplyMovement LOCALID_PLAYER, Route224_Movement_PlayerWatchMarleyWalkToTabletZ498 WaitMovement - GoTo _057F + GoTo Route224_ThatStoneTablet End -_057F: +Route224_ThatStoneTablet: SetVar VAR_SHAYMIN_EVENT_STATE, 2 - SetVar VAR_UNK_0x4085, 2 - Message 10 + SetVar VAR_ROUTE_224_STATE, 2 + Message Route224_Text_ThatStoneTablet WaitButton CloseMessage ReleaseAll End .balign 4, 0 -_0598: +Route224_Movement_MarleyWalkToPlayerZ496: WalkNormalNorth 8 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_05A4: +Route224_Movement_MarleyWalkToPlayerZ497: WalkNormalNorth 8 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_05B0: +Route224_Movement_MarleyWalkToPlayerZ498: WalkNormalNorth 8 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_05BC: +Route224_Movement_MarleyWalkToTabletZ496: WalkNormalSouth WalkNormalEast 5 WalkNormalNorth 4 EndMovement .balign 4, 0 -_05CC: +Route224_Movement_MarleyWalkToTabletZ497: WalkNormalNorth WalkNormalEast 5 WalkNormalNorth 3 EndMovement .balign 4, 0 -_05DC: +Route224_Movement_MarleyWalkToTabletZ498: WalkNormalNorth 2 WalkNormalEast 5 WalkNormalNorth 3 EndMovement .balign 4, 0 -_05EC: +Route224_Movement_MarleyWalkOnSpotEast: WalkOnSpotNormalEast EndMovement -_05F4: +Route224_Marley: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x012D, _061C - Message 10 + GoToIfSet FLAG_WROTE_ON_ROUTE_224_TABLET, Route224_ThankYouToo + Message Route224_Text_ThatStoneTablet WaitButton CloseMessage - ApplyMovement 21, _0664 + ApplyMovement LOCALID_MARLEY, Route224_Movement_MarleyFaceNorth WaitMovement ReleaseAll End -_061C: - Message 12 +Route224_ThankYouToo: + Message Route224_Text_ThankYouToo WaitButton CloseMessage ReleaseAll End .balign 4, 0 -_0628: +Route224_Movement_PlayerWalkOnSpotWest2: WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0630: +Route224_Movement_PlayerWatchMarleyWalkToTabletZ496: Delay8 2 WalkOnSpotNormalEast Delay8 4 @@ -478,7 +479,7 @@ _0630: EndMovement .balign 4, 0 -_0644: +Route224_Movement_PlayerWatchMarleyWalkToTabletZ497: Delay8 2 WalkOnSpotNormalEast Delay8 3 @@ -486,18 +487,18 @@ _0644: EndMovement .balign 4, 0 -_0658: +Route224_Movement_PlayerWatchMarleyWalkToTabletZ498: Delay8 2 WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0664: +Route224_Movement_MarleyFaceNorth: FaceNorth EndMovement .balign 4, 0 -_066C: +Route224_Movement_MarleyNoticeShaymin: FaceEast EmoteExclamationMark EndMovement diff --git a/res/field/scripts/scripts_victory_road_1f.s b/res/field/scripts/scripts_victory_road_1f.s index c165ffa065..4750e10b45 100644 --- a/res/field/scripts/scripts_victory_road_1f.s +++ b/res/field/scripts/scripts_victory_road_1f.s @@ -2,34 +2,34 @@ #include "res/text/bank/victory_road_1f.h" - ScriptEntry _000A - ScriptEntry _0031 + ScriptEntry VictoryRoad_OnTransition + ScriptEntry VictoryRoad_Collector ScriptEntryEnd -_000A: +VictoryRoad_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_VICTORY_ROAD - GoToIfUnset FLAG_GAME_COMPLETED, _002F + GoToIfUnset FLAG_GAME_COMPLETED, VictoryRoad_DontHideCollector GetNationalDexEnabled VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _002F - SetFlag FLAG_UNK_0x027E -_002F: + GoToIfEq VAR_MAP_LOCAL_0, FALSE, VictoryRoad_DontHideCollector + SetFlag FLAG_HIDE_VICTORY_ROAD_1F_COLLECTOR +VictoryRoad_DontHideCollector: End -_0031: +VictoryRoad_Collector: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_GAME_COMPLETED, _004F - Message 0 - GoTo _005A + GoToIfSet FLAG_GAME_COMPLETED, VictoryRoad1F_YoullMeetManyPokemon + Message VictoryRoad1F_Text_AimForPokemonLeague + GoTo VictoryRoad1F_CollectorEnd End -_004F: - Message 1 - GoTo _005A +VictoryRoad1F_YoullMeetManyPokemon: + Message VictoryRoad1F_Text_YoullMeetManyPokemon + GoTo VictoryRoad1F_CollectorEnd End -_005A: +VictoryRoad1F_CollectorEnd: WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_victory_road_1f_room_2.s b/res/field/scripts/scripts_victory_road_1f_room_2.s index 19bf3334b7..bbd553f74a 100644 --- a/res/field/scripts/scripts_victory_road_1f_room_2.s +++ b/res/field/scripts/scripts_victory_road_1f_room_2.s @@ -1,188 +1,189 @@ #include "macros/scrcmd.inc" #include "res/text/bank/victory_road_1f_room_2.h" +#include "res/field/events/events_victory_road_1f_room_2.h" - ScriptEntry _0027 - ScriptEntry _0190 - ScriptEntry _02E4 - ScriptEntry _0012 + ScriptEntry VictoryRoad1FRoom2_TriggerStartFollowingMarley + ScriptEntry VictoryRoad1FRoom2_TriggerPlayerLeaveMarley + ScriptEntry VictoryRoad1FRoom2_TriggerMarleyLeavePlayer + ScriptEntry VictoryRoad1FRoom2_OnTransition ScriptEntryEnd -_0012: - GoToIfUnset FLAG_TRAVELED_WITH_MARLEY, _001F +VictoryRoad1FRoom2_OnTransition: + GoToIfUnset FLAG_TRAVELED_WITH_MARLEY, VictoryRoad1FRoom2_ResetFollowerMarleyState End -_001F: - SetVar VAR_UNK_0x4090, 0 +VictoryRoad1FRoom2_ResetFollowerMarleyState: + SetVar VAR_VICTORY_ROAD_1F_ROOM_2_FOLLOWER_MARLEY_STATE, 0 End -_0027: +VictoryRoad1FRoom2_TriggerStartFollowingMarley: LockAll SetPlayerBike FALSE - ApplyMovement 28, _0140 + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyNoticePlayer WaitMovement GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 55, _008C - GoToIfEq VAR_0x8005, 56, _009C - GoToIfEq VAR_0x8005, 57, _00AC - GoToIfEq VAR_0x8005, 58, _00BC - GoToIfEq VAR_0x8005, 59, _00CC - GoToIfEq VAR_0x8005, 60, _00DC + GoToIfEq VAR_0x8005, 55, VictoryRoad1FRoom2_MarleyWalkToPlayerZ55 + GoToIfEq VAR_0x8005, 56, VictoryRoad1FRoom2_MarleyWalkToPlayerZ56 + GoToIfEq VAR_0x8005, 57, VictoryRoad1FRoom2_MarleyWalkToPlayerZ57 + GoToIfEq VAR_0x8005, 58, VictoryRoad1FRoom2_MarleyWalkToPlayerZ58 + GoToIfEq VAR_0x8005, 59, VictoryRoad1FRoom2_MarleyWalkToPlayerZ59 + GoToIfEq VAR_0x8005, 60, VictoryRoad1FRoom2_MarleyWalkToPlayerZ60 End -_008C: - ApplyMovement 28, _014C +VictoryRoad1FRoom2_MarleyWalkToPlayerZ55: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ55 WaitMovement - GoTo _00EC + GoTo VictoryRoad1FRoom2_StartFollowingMarley -_009C: - ApplyMovement 28, _0158 +VictoryRoad1FRoom2_MarleyWalkToPlayerZ56: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ56 WaitMovement - GoTo _00EC + GoTo VictoryRoad1FRoom2_StartFollowingMarley -_00AC: - ApplyMovement 28, _0164 +VictoryRoad1FRoom2_MarleyWalkToPlayerZ57: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ57 WaitMovement - GoTo _00EC + GoTo VictoryRoad1FRoom2_StartFollowingMarley -_00BC: - ApplyMovement 28, _0170 +VictoryRoad1FRoom2_MarleyWalkToPlayerZ58: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ58 WaitMovement - GoTo _00EC + GoTo VictoryRoad1FRoom2_StartFollowingMarley -_00CC: - ApplyMovement 28, _0178 +VictoryRoad1FRoom2_MarleyWalkToPlayerZ59: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ59 WaitMovement - GoTo _00EC + GoTo VictoryRoad1FRoom2_StartFollowingMarley -_00DC: - ApplyMovement 28, _0184 +VictoryRoad1FRoom2_MarleyWalkToPlayerZ60: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ60 WaitMovement - GoTo _00EC + GoTo VictoryRoad1FRoom2_StartFollowingMarley -_00EC: +VictoryRoad1FRoom2_StartFollowingMarley: BufferPlayerName 0 - CallIfUnset FLAG_UNK_0x00DF, _0134 - CallIfSet FLAG_UNK_0x00DF, _0139 + CallIfUnset FLAG_TALKED_TO_VICTORY_ROAD_1F_ROOM_2_MARLEY, VictoryRoad1FRoom2_LetMeGoWithYou + CallIfSet FLAG_TALKED_TO_VICTORY_ROAD_1F_ROOM_2_MARLEY, VictoryRoad1FRoom2_YouTookSoLong BufferPlayerName 0 PlayFanfare SEQ_GONIN - Message 1 + Message VictoryRoad1FRoom2_Text_DecidedToGoWithMarley WaitFanfare - SetFlag FLAG_UNK_0x00DF - SetVar VAR_UNK_0x4090, 1 - Message 2 + SetFlag FLAG_TALKED_TO_VICTORY_ROAD_1F_ROOM_2_MARLEY + SetVar VAR_VICTORY_ROAD_1F_ROOM_2_FOLLOWER_MARLEY_STATE, 1 + Message VictoryRoad1FRoom2_Text_IllHealPokemon WaitButton CloseMessage SetVar VAR_PARTNER_TRAINER_ID, TRAINER_MARLEY_VICTORY_ROAD SetHasPartner - SetMovementType 28, 48 + SetMovementType LOCALID_MARLEY, MOVEMENT_TYPE_FOLLOW_PLAYER ReleaseAll End -_0134: - Message 0 +VictoryRoad1FRoom2_LetMeGoWithYou: + Message VictoryRoad1FRoom2_Text_LetMeGoWithYou Return -_0139: - Message 3 +VictoryRoad1FRoom2_YouTookSoLong: + Message VictoryRoad1FRoom2_Text_YouTookSoLong Return .balign 4, 0 -_0140: +VictoryRoad1FRoom2_Movement_MarleyNoticePlayer: WalkOnSpotNormalWest EmoteExclamationMark EndMovement .balign 4, 0 -_014C: +VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ55: WalkNormalNorth 3 WalkNormalWest EndMovement .balign 4, 0 -_0158: +VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ56: WalkNormalNorth 2 WalkNormalWest EndMovement .balign 4, 0 -_0164: +VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ57: WalkNormalNorth WalkNormalWest EndMovement .balign 4, 0 -_0170: +VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ58: WalkNormalWest EndMovement .balign 4, 0 -_0178: +VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ59: WalkNormalSouth WalkNormalWest EndMovement .balign 4, 0 -_0184: +VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ60: WalkNormalSouth 2 WalkNormalWest EndMovement -_0190: +VictoryRoad1FRoom2_TriggerPlayerLeaveMarley: LockAll - ApplyMovement LOCALID_PLAYER, _0274 - ApplyMovement 28, _02DC + ApplyMovement LOCALID_PLAYER, VictoryRoad1FRoom2_Movement_PlayerWalkOnSpotEast + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyFaceWest WaitMovement - Message 4 + Message VictoryRoad1FRoom2_Text_YoureGoingBack CloseMessage - SetVar VAR_UNK_0x4090, 0 + SetVar VAR_VICTORY_ROAD_1F_ROOM_2_FOLLOWER_MARLEY_STATE, 0 ClearHasPartner - SetMovementType 28, 14 + SetMovementType LOCALID_MARLEY, MOVEMENT_TYPE_LOOK_NORTH GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 55, _020D - GoToIfEq VAR_0x8005, 56, _021D - GoToIfEq VAR_0x8005, 57, _022D - GoToIfEq VAR_0x8005, 58, _023D - GoToIfEq VAR_0x8005, 59, _024D - GoToIfEq VAR_0x8005, 60, _025D + GoToIfEq VAR_0x8005, 55, VictoryRoad1FRoom2_MarleyWalkBackZ55 + GoToIfEq VAR_0x8005, 56, VictoryRoad1FRoom2_MarleyWalkBackZ56 + GoToIfEq VAR_0x8005, 57, VictoryRoad1FRoom2_MarleyWalkBackZ57 + GoToIfEq VAR_0x8005, 58, VictoryRoad1FRoom2_MarleyWalkBackZ58 + GoToIfEq VAR_0x8005, 59, VictoryRoad1FRoom2_MarleyWalkBackZ59 + GoToIfEq VAR_0x8005, 60, VictoryRoad1FRoom2_MarleyWalkBackZ60 End -_020D: - ApplyMovement 28, _0284 +VictoryRoad1FRoom2_MarleyWalkBackZ55: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkBackZ55 WaitMovement - GoTo _026D + GoTo VictoryRoad1FRoom2_PlayerLeaveMarleyEnd -_021D: - ApplyMovement 28, _0294 +VictoryRoad1FRoom2_MarleyWalkBackZ56: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkBackZ56 WaitMovement - GoTo _026D + GoTo VictoryRoad1FRoom2_PlayerLeaveMarleyEnd -_022D: - ApplyMovement 28, _02A4 +VictoryRoad1FRoom2_MarleyWalkBackZ57: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkBackZ57 WaitMovement - GoTo _026D + GoTo VictoryRoad1FRoom2_PlayerLeaveMarleyEnd -_023D: - ApplyMovement 28, _02B4 +VictoryRoad1FRoom2_MarleyWalkBackZ58: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkBackZ58 WaitMovement - GoTo _026D + GoTo VictoryRoad1FRoom2_PlayerLeaveMarleyEnd -_024D: - ApplyMovement 28, _02BC +VictoryRoad1FRoom2_MarleyWalkBackZ59: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkBackZ59 WaitMovement - GoTo _026D + GoTo VictoryRoad1FRoom2_PlayerLeaveMarleyEnd -_025D: - ApplyMovement 28, _02CC +VictoryRoad1FRoom2_MarleyWalkBackZ60: + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkBackZ60 WaitMovement - GoTo _026D + GoTo VictoryRoad1FRoom2_PlayerLeaveMarleyEnd -_026D: +VictoryRoad1FRoom2_PlayerLeaveMarleyEnd: ReleaseAll End .balign 4, 0 -_0274: +VictoryRoad1FRoom2_Movement_PlayerWalkOnSpotEast: WalkOnSpotNormalEast EndMovement @@ -191,125 +192,125 @@ VictoryRoad1FRoom2_UnusedMovement: EndMovement .balign 4, 0 -_0284: +VictoryRoad1FRoom2_Movement_MarleyWalkBackZ55: WalkNormalEast 2 WalkNormalSouth 3 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0294: +VictoryRoad1FRoom2_Movement_MarleyWalkBackZ56: WalkNormalEast 2 WalkNormalSouth 2 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_02A4: +VictoryRoad1FRoom2_Movement_MarleyWalkBackZ57: WalkNormalEast 2 WalkNormalSouth WalkOnSpotNormalEast EndMovement .balign 4, 0 -_02B4: +VictoryRoad1FRoom2_Movement_MarleyWalkBackZ58: WalkNormalEast 2 EndMovement .balign 4, 0 -_02BC: +VictoryRoad1FRoom2_Movement_MarleyWalkBackZ59: WalkNormalEast 2 WalkNormalNorth WalkOnSpotNormalEast EndMovement .balign 4, 0 -_02CC: +VictoryRoad1FRoom2_Movement_MarleyWalkBackZ60: WalkNormalEast 2 WalkNormalNorth 2 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_02DC: +VictoryRoad1FRoom2_Movement_MarleyFaceWest: FaceWest EndMovement -_02E4: +VictoryRoad1FRoom2_TriggerMarleyLeavePlayer: LockAll ClearHasPartner - SetMovementType 28, 14 - ApplyMovement LOCALID_PLAYER, _03B4 - ApplyMovement 28, _03E0 + SetMovementType LOCALID_MARLEY, MOVEMENT_TYPE_LOOK_NORTH + ApplyMovement LOCALID_PLAYER, VictoryRoad1FRoom2_Movement_PlayerFaceMarley + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyFacePlayer WaitMovement - Message 5 + Message VictoryRoad1FRoom2_Text_IAppreciateEscorting CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8004, 51, _0341 - GoToIfEq VAR_0x8004, 52, _0359 - GoToIfEq VAR_0x8004, 53, _0371 - GoToIfEq VAR_0x8004, 54, _0389 + GoToIfEq VAR_0x8004, 51, VictoryRoad1FRoom2_MarleyLeaveX51 + GoToIfEq VAR_0x8004, 52, VictoryRoad1FRoom2_MarleyLeaveX52 + GoToIfEq VAR_0x8004, 53, VictoryRoad1FRoom2_MarleyLeaveX53 + GoToIfEq VAR_0x8004, 54, VictoryRoad1FRoom2_MarleyLeaveX54 End -_0341: - ApplyMovement LOCALID_PLAYER, _03C0 - ApplyMovement 28, _03EC +VictoryRoad1FRoom2_MarleyLeaveX51: + ApplyMovement LOCALID_PLAYER, VictoryRoad1FRoom2_Movement_PlayerWatchMarleyLeaveWest + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyLeaveX51 WaitMovement - GoTo _03A1 + GoTo VictoryRoad1FRoom2_RemoveMarley -_0359: - ApplyMovement LOCALID_PLAYER, _03C0 - ApplyMovement 28, _0400 +VictoryRoad1FRoom2_MarleyLeaveX52: + ApplyMovement LOCALID_PLAYER, VictoryRoad1FRoom2_Movement_PlayerWatchMarleyLeaveWest + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyLeaveX52 WaitMovement - GoTo _03A1 + GoTo VictoryRoad1FRoom2_RemoveMarley -_0371: - ApplyMovement LOCALID_PLAYER, _03C0 - ApplyMovement 28, _0414 +VictoryRoad1FRoom2_MarleyLeaveX53: + ApplyMovement LOCALID_PLAYER, VictoryRoad1FRoom2_Movement_PlayerWatchMarleyLeaveWest + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyLeaveX53 WaitMovement - GoTo _03A1 + GoTo VictoryRoad1FRoom2_RemoveMarley -_0389: - ApplyMovement LOCALID_PLAYER, _03D0 - ApplyMovement 28, _0428 +VictoryRoad1FRoom2_MarleyLeaveX54: + ApplyMovement LOCALID_PLAYER, VictoryRoad1FRoom2_Movement_PlayerWatchMarleyLeaveEast + ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyLeaveX54 WaitMovement - GoTo _03A1 + GoTo VictoryRoad1FRoom2_RemoveMarley -_03A1: - RemoveObject 28 +VictoryRoad1FRoom2_RemoveMarley: + RemoveObject LOCALID_MARLEY SetFlag FLAG_TRAVELED_WITH_MARLEY - SetVar VAR_UNK_0x4090, 2 + SetVar VAR_VICTORY_ROAD_1F_ROOM_2_FOLLOWER_MARLEY_STATE, 2 ReleaseAll End .balign 4, 0 -_03B4: +VictoryRoad1FRoom2_Movement_PlayerFaceMarley: Delay8 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_03C0: +VictoryRoad1FRoom2_Movement_PlayerWatchMarleyLeaveWest: Delay8 WalkOnSpotNormalEast WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_03D0: +VictoryRoad1FRoom2_Movement_PlayerWatchMarleyLeaveEast: Delay8 WalkOnSpotNormalWest WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_03E0: +VictoryRoad1FRoom2_Movement_MarleyFacePlayer: WalkOnSpotNormalNorth EmoteExclamationMark EndMovement .balign 4, 0 -_03EC: +VictoryRoad1FRoom2_Movement_MarleyLeaveX51: WalkNormalEast WalkNormalNorth 7 WalkNormalEast 4 @@ -317,7 +318,7 @@ _03EC: EndMovement .balign 4, 0 -_0400: +VictoryRoad1FRoom2_Movement_MarleyLeaveX52: WalkNormalEast WalkNormalNorth 7 WalkNormalEast 3 @@ -325,7 +326,7 @@ _0400: EndMovement .balign 4, 0 -_0414: +VictoryRoad1FRoom2_Movement_MarleyLeaveX53: WalkNormalEast WalkNormalNorth 7 WalkNormalEast 2 @@ -333,7 +334,7 @@ _0414: EndMovement .balign 4, 0 -_0428: +VictoryRoad1FRoom2_Movement_MarleyLeaveX54: WalkNormalWest WalkNormalNorth 7 WalkNormalEast 3 diff --git a/res/text/route_224.json b/res/text/route_224.json index 7b7c4d220a..ac1edcab5d 100644 --- a/res/text/route_224.json +++ b/res/text/route_224.json @@ -2,7 +2,7 @@ "key": 38536, "messages": [ { - "id": "pl_msg_00000521_00000", + "id": "Route224_Text_ExamineTabletMale", "en_US": [ "Oak: Ah, {STRVAR_1 3, 0, 0}!\n", "It’s good to see you!\r", @@ -15,7 +15,7 @@ ] }, { - "id": "pl_msg_00000521_00001", + "id": "Route224_Text_ExamineTabletFemale", "en_US": [ "Oak: Ah, {STRVAR_1 3, 0, 0}!\n", "It’s good to see you!\r", @@ -28,7 +28,7 @@ ] }, { - "id": "pl_msg_00000521_00002", + "id": "Route224_Text_SayThanksToWhom", "en_US": [ "I tried deciphering the engravings on\n", "the stone tablet.\r", @@ -49,7 +49,7 @@ ] }, { - "id": "pl_msg_00000521_00003", + "id": "Route224_Text_ExpressThanksToName", "en_US": [ "Hm...\r", "You most want to express your\n", @@ -58,7 +58,7 @@ ] }, { - "id": "pl_msg_00000521_00004", + "id": "Route224_Text_WhatWasThatPokemon", "en_US": [ "Oak: ?!\n", "What was that Pokémon?\r", @@ -69,7 +69,7 @@ ] }, { - "id": "pl_msg_00000521_00005", + "id": "Route224_Text_WhatWasThatPokemon2", "en_US": [ "Oak: ?!\n", "What was that Pokémon?\r", @@ -80,7 +80,7 @@ ] }, { - "id": "pl_msg_00000521_00006", + "id": "Route224_Text_NotSuggestingNoOne", "en_US": [ "Oak: What’s wrong? You’re not\n", "suggesting there’s no one?\r", @@ -89,21 +89,21 @@ ] }, { - "id": "pl_msg_00000521_00007", + "id": "Route224_Text_SurfaceIsUnmarked", "en_US": [ "The surface is unmarked.\n", "It is polished like a mirror." ] }, { - "id": "pl_msg_00000521_00008", + "id": "Route224_Text_NameWhomIThank", "en_US": [ "{STRVAR_1 28, 1, 0}, to whom I give\n", "my thanks." ] }, { - "id": "pl_msg_00000521_00009", + "id": "Route224_Text_PokemonThatConveysGratitude", "en_US": [ "Marley: I...\n", "I don’t like to talk...\r", @@ -117,14 +117,14 @@ ] }, { - "id": "pl_msg_00000521_00010", + "id": "Route224_Text_ThatStoneTablet", "en_US": [ "Marley: That stone tablet...\n", "It has a strange feel to it..." ] }, { - "id": "pl_msg_00000521_00011", + "id": "Route224_Text_ThankYou", "en_US": [ "Marley: Thank you...\r", "That must have been the Pokémon that\n", @@ -135,7 +135,7 @@ ] }, { - "id": "pl_msg_00000521_00012", + "id": "Route224_Text_ThankYouToo", "en_US": [ "Marley: To you, too...\r", "Thank you..." diff --git a/res/text/victory_road_1f.json b/res/text/victory_road_1f.json index fac92e8309..8eb8f58907 100644 --- a/res/text/victory_road_1f.json +++ b/res/text/victory_road_1f.json @@ -2,7 +2,7 @@ "key": 41986, "messages": [ { - "id": "pl_msg_00000250_00000", + "id": "VictoryRoad1F_Text_AimForPokemonLeague", "en_US": [ "Let me size you up...\r", "Aim for the Pokémon League!\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000250_00001", + "id": "VictoryRoad1F_Text_YoullMeetManyPokemon", "en_US": [ "Let me size you up...\r", "You’ll meet many, many Pokémon.\n", @@ -20,47 +20,47 @@ ] }, { - "id": "pl_msg_00000250_00002", + "id": "VictoryRoad1F_Text_Dummy2", "garbage": 72 }, { - "id": "pl_msg_00000250_00003", + "id": "VictoryRoad1F_Text_Dummy3", "garbage": 32 }, { - "id": "pl_msg_00000250_00004", + "id": "VictoryRoad1F_Text_Dummy4", "garbage": 37 }, { - "id": "pl_msg_00000250_00005", + "id": "VictoryRoad1F_Text_Dummy5", "garbage": 26 }, { - "id": "pl_msg_00000250_00006", + "id": "VictoryRoad1F_Text_Dummy6", "garbage": 67 }, { - "id": "pl_msg_00000250_00007", + "id": "VictoryRoad1F_Text_Dummy7", "garbage": 15 }, { - "id": "pl_msg_00000250_00008", + "id": "VictoryRoad1F_Text_Dummy8", "garbage": 15 }, { - "id": "pl_msg_00000250_00009", + "id": "VictoryRoad1F_Text_Dummy9", "garbage": 22 }, { - "id": "pl_msg_00000250_00010", + "id": "VictoryRoad1F_Text_Dummy10", "garbage": 13 }, { - "id": "pl_msg_00000250_00011", + "id": "VictoryRoad1F_Text_Dummy11", "garbage": 14 }, { - "id": "pl_msg_00000250_00012", + "id": "VictoryRoad1F_Text_Dummy12", "garbage": 11 } ] diff --git a/res/text/victory_road_1f_room_2.json b/res/text/victory_road_1f_room_2.json index 29bd07c012..9e254e14ee 100644 --- a/res/text/victory_road_1f_room_2.json +++ b/res/text/victory_road_1f_room_2.json @@ -2,7 +2,7 @@ "key": 42006, "messages": [ { - "id": "pl_msg_00000251_00000", + "id": "VictoryRoad1FRoom2_Text_LetMeGoWithYou", "en_US": [ "...I’m Marley.\n", "...You are?\r", @@ -13,21 +13,21 @@ ] }, { - "id": "pl_msg_00000251_00001", + "id": "VictoryRoad1FRoom2_Text_DecidedToGoWithMarley", "en_US": [ "{STRVAR_1 3, 0, 0} decided to go with\n", "Marley!" ] }, { - "id": "pl_msg_00000251_00002", + "id": "VictoryRoad1FRoom2_Text_IllHealPokemon", "en_US": [ "Marley: ...Pokémon shouldn’t be\n", "hurt... I’ll heal them..." ] }, { - "id": "pl_msg_00000251_00003", + "id": "VictoryRoad1FRoom2_Text_YouTookSoLong", "en_US": [ "Marley: ...You took so long...\n", "Please, don’t make me wait...\r", @@ -35,14 +35,14 @@ ] }, { - "id": "pl_msg_00000251_00004", + "id": "VictoryRoad1FRoom2_Text_YoureGoingBack", "en_US": [ "Marley: ...You’re going back...\n", "Too bad... Bye-bye...\r" ] }, { - "id": "pl_msg_00000251_00005", + "id": "VictoryRoad1FRoom2_Text_IAppreciateEscorting", "en_US": [ "Marley: ...Oh! This is it.\n", "There’s a stone tablet ahead...\r", @@ -53,27 +53,27 @@ ] }, { - "id": "pl_msg_00000251_00006", + "id": "VictoryRoad1FRoom2_Text_Dummy6", "garbage": 15 }, { - "id": "pl_msg_00000251_00007", + "id": "VictoryRoad1FRoom2_Text_Dummy7", "garbage": 15 }, { - "id": "pl_msg_00000251_00008", + "id": "VictoryRoad1FRoom2_Text_Dummy8", "garbage": 22 }, { - "id": "pl_msg_00000251_00009", + "id": "VictoryRoad1FRoom2_Text_Dummy9", "garbage": 13 }, { - "id": "pl_msg_00000251_00010", + "id": "VictoryRoad1FRoom2_Text_Dummy10", "garbage": 14 }, { - "id": "pl_msg_00000251_00011", + "id": "VictoryRoad1FRoom2_Text_Dummy11", "garbage": 11 } ] diff --git a/src/applications/naming_screen.c b/src/applications/naming_screen.c index c9d99ee0bd..9981364bdd 100644 --- a/src/applications/naming_screen.c +++ b/src/applications/naming_screen.c @@ -2113,7 +2113,7 @@ static void NamingScreen_InitIconSprite(NamingScreen *namingScreen, AffineSprite case NAMING_SCREEN_TYPE_RIVAL: Sprite_SetAnim(namingScreen->entitySprite[0], 51); break; - case NAMING_SCREEN_TYPE_UNK6: + case NAMING_SCREEN_TYPE_SHAYMIN_TABLET: Sprite_SetAnim(namingScreen->entitySprite[0], 55); break; case NAMING_SCREEN_TYPE_GROUP: diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 45a8b61f03..808aa7de08 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -1080,10 +1080,10 @@ BOOL ScrCmd_LogLinkInfoInWiFiHistory(ScriptContext *ctx) return TRUE; } -BOOL ScrCmd_333(ScriptContext *ctx) +BOOL ScrCmd_SetPlayerVolume(ScriptContext *ctx) { - u16 v0 = ScriptContext_GetVar(ctx); + u16 volume = ScriptContext_GetVar(ctx); - Sound_SetPlayerVolume(1, v0); - return 0; + Sound_SetPlayerVolume(PLAYER_FIELD, volume); + return FALSE; } diff --git a/src/scrcmd.c b/src/scrcmd.c index a90aafe304..78df08ebe2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -397,7 +397,7 @@ static BOOL ScrCmd_StartChooseStarterScene(ScriptContext *ctx); static BOOL ScrCmd_SaveChosenStarter(ScriptContext *ctx); static BOOL ScrCmd_Unused_0BA(ScriptContext *ctx); static BOOL ScrCmd_OpenPokemonNamingScreen(ScriptContext *ctx); -static BOOL ScrCmd_271(ScriptContext *ctx); +static BOOL ScrCmd_OpenShayminTabletNamingScreen(ScriptContext *ctx); static BOOL ScrCmd_FadeScreen(ScriptContext *ctx); static BOOL ScrCmd_WaitFadeScreen(ScriptContext *ctx); static BOOL ScriptContext_ScreenWipeDone(ScriptContext *ctx); @@ -3473,9 +3473,9 @@ static BOOL ScrCmd_OpenPokemonNamingScreen(ScriptContext *ctx) return TRUE; } -static BOOL ScrCmd_271(ScriptContext *ctx) +static BOOL ScrCmd_OpenShayminTabletNamingScreen(ScriptContext *ctx) { - sub_0203DFE8(ctx->task, NAMING_SCREEN_TYPE_UNK6, 0, 10, 0, NULL, ScriptContext_GetVarPointer(ctx)); + sub_0203DFE8(ctx->task, NAMING_SCREEN_TYPE_SHAYMIN_TABLET, 0, 10, 0, NULL, ScriptContext_GetVarPointer(ctx)); return TRUE; } diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 0a3d99df8f..7055e4e293 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -1204,7 +1204,7 @@ static void sub_0203DF68(FieldTask *param0) RecordMixedRNG *v5 = SaveData_GetRecordMixedRNG(fieldSystem->saveData); RecordMixedRNG_GetEntryNameAsString(v5, 0, 0, v1->unk_0C->textInputStr); } break; - case NAMING_SCREEN_TYPE_UNK6: { + case NAMING_SCREEN_TYPE_SHAYMIN_TABLET: { MiscSaveBlock *v6 = SaveData_MiscSaveBlock(fieldSystem->saveData); MiscSaveBlock_SetTabletName(v6, v1->unk_0C->textInputStr); } break;