From 6e9358e98cbfe6c8a3b91b2ef6b066385b044789 Mon Sep 17 00:00:00 2001 From: Viperio <146665252+Viperio19@users.noreply.github.com> Date: Sun, 17 May 2026 20:30:24 +0200 Subject: [PATCH] Document common scripts (#1154) --- asm/macros/scrcmd.inc | 24 +- generated/game_records.txt | 2 +- include/data/scripts/scrcmd.h | 10 +- include/scrcmd_tv_broadcast.h | 2 +- .../events_canalave_city_pokecenter_1f.json | 14 +- .../events_celestic_town_pokecenter_1f.json | 12 +- .../events_eterna_city_pokecenter_1f.json | 14 +- .../events_fight_area_pokecenter_1f.json | 12 +- .../events_floaroma_town_pokecenter_1f.json | 12 +- .../events_hearthome_city_pokecenter_1f.json | 12 +- .../events_jubilife_city_pokecenter_1f.json | 14 +- .../events_oreburgh_city_pokecenter_1f.json | 18 +- .../events_pastoria_city_pokecenter_1f.json | 10 +- ...ts_pokemon_league_north_pokecenter_1f.json | 14 +- ...ts_pokemon_league_south_pokecenter_1f.json | 6 +- .../events_resort_area_pokecenter_1f.json | 10 +- .../events_sandgem_town_pokecenter_1f.json | 10 +- .../events_snowpoint_city_pokecenter_1f.json | 14 +- .../events_solaceon_town_pokecenter_1f.json | 12 +- .../events_sunyshore_city_pokecenter_1f.json | 12 +- .../events_survival_area_pokecenter_1f.json | 8 +- .../events_twinleaf_town_player_house_1f.json | 2 +- .../events_veilstone_city_pokecenter_1f.json | 10 +- .../scripts_canalave_city_pokecenter_1f.s | 2 +- .../scripts_celestic_town_pokecenter_1f.s | 2 +- res/field/scripts/scripts_common.s | 1011 +++++++++-------- .../scripts_eterna_city_pokecenter_1f.s | 2 +- .../scripts_fight_area_pokecenter_1f.s | 2 +- .../scripts_floaroma_town_pokecenter_1f.s | 2 +- .../scripts_hearthome_city_pokecenter_1f.s | 2 +- .../scripts_jubilife_city_pokecenter_1f.s | 2 +- .../scripts_oreburgh_city_pokecenter_1f.s | 2 +- .../scripts_pastoria_city_pokecenter_1f.s | 2 +- ...ripts_pokemon_league_north_pokecenter_1f.s | 24 +- ...ripts_pokemon_league_south_pokecenter_1f.s | 3 +- .../scripts_resort_area_pokecenter_1f.s | 2 +- .../scripts_sandgem_town_pokecenter_1f.s | 6 +- .../scripts_snowpoint_city_pokecenter_1f.s | 8 +- .../scripts_solaceon_town_pokecenter_1f.s | 2 +- .../scripts_sunyshore_city_pokecenter_1f.s | 2 +- .../scripts_survival_area_pokecenter_1f.s | 2 +- .../scripts_twinleaf_town_player_house_1f.s | 36 +- .../scripts_veilstone_city_pokecenter_1f.s | 2 +- res/text/common_strings.json | 186 +-- res/text/menu_entries.json | 50 +- src/game_records.c | 2 +- src/overlay005/scrcmd_move_tutor.c | 10 +- src/scrcmd.c | 34 +- src/scrcmd_tv_broadcast.c | 2 +- src/string_template.c | 4 +- 50 files changed, 839 insertions(+), 819 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 2ff51fae0b..27d3fdc557 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -1130,8 +1130,8 @@ .short SCRCMD_CLEARGAME .endm - .macro ScrCmd_0B1 - .short SCRCMD_0B1 + .macro OpenPCHallOfFameScreen + .short SCRCMD_OPENPCHALLOFFAMESCREEN .endm .macro TryStartGTSApp connectToWiFi, destVar @@ -1797,8 +1797,8 @@ .short SCRCMD_STARTHONEYTREEBATTLE .endm - .macro ScrCmd_12A - .short SCRCMD_12A + .macro StopHoneyTreeShaking + .short SCRCMD_STOPHONEYTREESHAKING .endm .macro StartSignatureApp @@ -4103,9 +4103,9 @@ .short \customMessageWord4 .endm - .macro ScrCmd_2AB arg0 - .short SCRCMD_2AB - .short \arg0 + .macro CountUniqueSealsInSealCase destVar + .short SCRCMD_COUNTUNIQUESEALSINSEALCASE + .short \destVar .endm .macro UnlockMysteryGift @@ -4643,8 +4643,8 @@ .short \scoreID .endm - .macro ScrCmd_30B - .short SCRCMD_30B + .macro SaveTVSegmentPokemonStorageBulletin + .short SCRCMD_SAVETVSEGMENTPOKEMONSTORAGEBULLETIN .endm .macro SaveTVSegmentHomeAndManorNoFurniture @@ -4876,9 +4876,9 @@ .long \value .endm - .macro ScrCmd_336 arg0 - .short SCRCMD_336 - .short \arg0 + .macro CheckIsHallOfFameCorrupted destVar + .short SCRCMD_CHECKISHALLOFFAMECORRUPTED + .short \destVar .endm .macro CheckHasSeenSpecies species, ret diff --git a/generated/game_records.txt b/generated/game_records.txt index 960256c3c4..7935847749 100644 --- a/generated/game_records.txt +++ b/generated/game_records.txt @@ -115,7 +115,7 @@ RECORD_UNK_113 RECORD_TIMES_SIGNED_TRAINER_CARD RECORD_POKEMON_RECEIVED_FROM_FOSSIL_REVIVAL RECORD_CHECKED_FOOTPRINTS -RECORD_UNK_117 +RECORD_HONEY_TREE_POKEMON_ENCOUNTERED RECORD_UNK_118 RECORD_UNK_119 RECORD_UNK_120 diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h index fc364dffd7..a5cc3dd13b 100644 --- a/include/data/scripts/scrcmd.h +++ b/include/data/scripts/scrcmd.h @@ -182,7 +182,7 @@ ScriptCommand(SCRCMD_OPENUNIONROOMTRAINERCASE, ScrCm ScriptCommand(SCRCMD_0AE, ScrCmd_0AE) ScriptCommand(SCRCMD_0AF, ScrCmd_0AF) ScriptCommand(SCRCMD_CLEARGAME, ScrCmd_ClearGame) -ScriptCommand(SCRCMD_0B1, ScrCmd_0B1) +ScriptCommand(SCRCMD_OPENPCHALLOFFAMESCREEN, ScrCmd_OpenPCHallOfFameScreen) ScriptCommand(SCRCMD_TRYSTARTGTSAPP, ScrCmd_TryStartGTSApp) ScriptCommand(SCRCMD_0B3, ScrCmd_0B3) ScriptCommand(SCRCMD_STARTCHOOSESTARTERSCENE, ScrCmd_StartChooseStarterScene) @@ -303,7 +303,7 @@ ScriptCommand(SCRCMD_STARTCATCHINGTUTORIAL, ScrCm ScriptCommand(SCRCMD_SLATHERHONEYTREE, ScrCmd_SlatherHoneyTree) ScriptCommand(SCRCMD_GETHONEYTREESTATUS, ScrCmd_GetHoneyTreeStatus) ScriptCommand(SCRCMD_STARTHONEYTREEBATTLE, ScrCmd_StartHoneyTreeBattle) -ScriptCommand(SCRCMD_12A, ScrCmd_12A) +ScriptCommand(SCRCMD_STOPHONEYTREESHAKING, ScrCmd_StopHoneyTreeShaking) ScriptCommand(SCRCMD_STARTSIGNATUREAPP, ScrCmd_StartSignatureApp) ScriptCommand(SCRCMD_CHECKSAVETYPE, ScrCmd_CheckSaveType) ScriptCommand(SCRCMD_TRYSAVEGAME, ScrCmd_TrySaveGame) @@ -688,7 +688,7 @@ ScriptCommand(SCRCMD_CHECKITEMISPLATE, ScrCm ScriptCommand(SCRCMD_SUBTRACTCOINSFROMVAR, ScrCmd_SubtractCoinsFromVar) ScriptCommand(SCRCMD_HASCOINSFROMVAR, ScrCmd_HasCoinsFromVar) ScriptCommand(SCRCMD_CHECKISMYSTERYGIFTPHRASE, ScrCmd_CheckIsMysteryGiftPhrase) -ScriptCommand(SCRCMD_2AB, ScrCmd_2AB) +ScriptCommand(SCRCMD_COUNTUNIQUESEALSINSEALCASE, ScrCmd_CountUniqueSealsInSealCase) ScriptCommand(SCRCMD_UNLOCKMYSTERYGIFT, ScrCmd_UnlockMysteryGift) ScriptCommand(SCRCMD_GETMOVEMENTTYPE, ScrCmd_GetMovementType) ScriptCommand(SCRCMD_ISSEQUENCEPLAYING, ScrCmd_IsSequencePlaying) @@ -784,7 +784,7 @@ ScriptCommand(SCRCMD_GETEMPTYPOFFINCASESLOTCOUNT, ScrCm ScriptCommand(SCRCMD_ADDCAMERAOVERRIDEOBJECT, ScrCmd_AddCameraOverrideObject) ScriptCommand(SCRCMD_REMOVECAMERAOVERRIDEOBJECT, ScrCmd_RemoveCameraOverrideObject) ScriptCommand(SCRCMD_INCREMENTTRAINERSCORE, ScrCmd_IncrementTrainerScore) -ScriptCommand(SCRCMD_30B, ScrCmd_30B) +ScriptCommand(SCRCMD_SAVETVSEGMENTPOKEMONSTORAGEBULLETIN, ScrCmd_SaveTVSegmentPokemonStorageBulletin) ScriptCommand(SCRCMD_SAVETVSEGMENTHOMEANDMANORNOFURNITURE, ScrCmd_SaveTVSegmentHomeAndManorNoFurniture) ScriptCommand(SCRCMD_SAVETVSEGMENTHOMEANDMANOR, ScrCmd_SaveTVSegmentHomeAndManor) ScriptCommand(SCRCMD_30E, ScrCmd_30E) @@ -827,7 +827,7 @@ ScriptCommand(SCRCMD_332, ScrCm ScriptCommand(SCRCMD_SETPLAYERVOLUME, ScrCmd_SetPlayerVolume) ScriptCommand(SCRCMD_ADDTOGAMERECORD, ScrCmd_AddToGameRecord) ScriptCommand(SCRCMD_ADDTOGAMERECORDBIGVALUE, ScrCmd_AddToGameRecordBigValue) -ScriptCommand(SCRCMD_336, ScrCmd_336) +ScriptCommand(SCRCMD_CHECKISHALLOFFAMECORRUPTED, ScrCmd_CheckIsHallOfFameCorrupted) ScriptCommand(SCRCMD_CHECKHASSEENSPECIES, ScrCmd_CheckHasSeenSpecies) ScriptCommand(SCRCMD_338, ScrCmd_338) ScriptCommand(SCRCMD_339, ScrCmd_339) diff --git a/include/scrcmd_tv_broadcast.h b/include/scrcmd_tv_broadcast.h index 991167da88..fed12e1545 100644 --- a/include/scrcmd_tv_broadcast.h +++ b/include/scrcmd_tv_broadcast.h @@ -6,7 +6,7 @@ BOOL ScrCmd_CallTVBroadcast(ScriptContext *param0); BOOL ScrCmd_236(ScriptContext *param0); BOOL ScrCmd_2B8(ScriptContext *param0); -BOOL ScrCmd_30B(ScriptContext *param0); +BOOL ScrCmd_SaveTVSegmentPokemonStorageBulletin(ScriptContext *ctx); BOOL ScrCmd_SaveTVSegmentHomeAndManorNoFurniture(ScriptContext *ctx); BOOL ScrCmd_SaveTVSegmentHomeAndManor(ScriptContext *ctx); BOOL ScrCmd_CallTVInterview(ScriptContext *ctx); diff --git a/res/field/events/events_canalave_city_pokecenter_1f.json b/res/field/events/events_canalave_city_pokecenter_1f.json index ef1c0278b7..5eb6edd22b 100644 --- a/res/field/events/events_canalave_city_pokecenter_1f.json +++ b/res/field/events/events_canalave_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_LASS", + "id": "LOCALID_CANALAVE_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_CANALAVE_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_POKEMON_BREEDER_F", + "id": "LOCALID_CANALAVE_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_CANALAVE_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_CANALAVE_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_BUG_CATCHER", + "id": "LOCALID_CANALAVE_BUG_CATCHER", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "LOCALID_SCIENTIST_M", + "id": "LOCALID_CANALAVE_SCIENTIST_M", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_celestic_town_pokecenter_1f.json b/res/field/events/events_celestic_town_pokecenter_1f.json index 1dd003dd44..3eb90b4134 100644 --- a/res/field/events/events_celestic_town_pokecenter_1f.json +++ b/res/field/events/events_celestic_town_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_CELESTIC_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_EXPERT_F", + "id": "LOCALID_CELESTIC_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_TWIN", + "id": "LOCALID_CELESTIC_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_POKEFAN_M", + "id": "LOCALID_CELESTIC_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_CELESTIC_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_CELESTIC_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_eterna_city_pokecenter_1f.json b/res/field/events/events_eterna_city_pokecenter_1f.json index 80e8073d94..e76c527385 100644 --- a/res/field/events/events_eterna_city_pokecenter_1f.json +++ b/res/field/events/events_eterna_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_SCHOOL_KID_M", + "id": "LOCALID_ETERNA_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_BATTLE_GIRL", + "id": "LOCALID_ETERNA_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_BUNEARY", + "id": "LOCALID_ETERNA_BUNEARY", "graphics_id": "OBJ_EVENT_GFX_BUNEARY", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_ETERNA_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_POKEMON_BREEDER_F", + "id": "LOCALID_ETERNA_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_ETERNA_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_ETERNA_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_fight_area_pokecenter_1f.json b/res/field/events/events_fight_area_pokecenter_1f.json index 65801bebb5..80ff2fa3bf 100644 --- a/res/field/events/events_fight_area_pokecenter_1f.json +++ b/res/field/events/events_fight_area_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_FIGHT_AREA_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_GUITARIST", + "id": "LOCALID_FIGHT_AREA_GUITARIST", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_WAITRESS", + "id": "LOCALID_FIGHT_AREA_WAITRESS", "graphics_id": "OBJ_EVENT_GFX_WAITRESS", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_BLACK_BELT", + "id": "LOCALID_FIGHT_AREA_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_FIGHT_AREA_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_FIGHT_AREA_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_floaroma_town_pokecenter_1f.json b/res/field/events/events_floaroma_town_pokecenter_1f.json index 935665de77..4203be1452 100644 --- a/res/field/events/events_floaroma_town_pokecenter_1f.json +++ b/res/field/events/events_floaroma_town_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_ACE_TRAINER_F", + "id": "LOCALID_FLOAROMA_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_BATTLE_GIRL", + "id": "LOCALID_FLOAROMA_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_FLOAROMA_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_POKEFAN_M", + "id": "LOCALID_FLOAROMA_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_FLOAROMA_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_FLOAROMA_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_hearthome_city_pokecenter_1f.json b/res/field/events/events_hearthome_city_pokecenter_1f.json index 4c997796cc..3c245f7aa0 100644 --- a/res/field/events/events_hearthome_city_pokecenter_1f.json +++ b/res/field/events/events_hearthome_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_HEARTHOME_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_YOUNGSTER", + "id": "LOCALID_HEARTHOME_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_SOCIALITE", + "id": "LOCALID_HEARTHOME_SOCIALITE", "graphics_id": "OBJ_EVENT_GFX_SOCIALITE", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_GUITARIST", + "id": "LOCALID_HEARTHOME_GUITARIST", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_HEARTHOME_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_HEARTHOME_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_pokecenter_1f.json b/res/field/events/events_jubilife_city_pokecenter_1f.json index 2d9d2630d7..d70af55047 100644 --- a/res/field/events/events_jubilife_city_pokecenter_1f.json +++ b/res/field/events/events_jubilife_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_ACE_TRAINER_F", + "id": "LOCALID_JUBILIFE_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_SCHOOL_KID_M", + "id": "LOCALID_JUBILIFE_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_TWIN", + "id": "LOCALID_JUBILIFE_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_JUBILIFE_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_TEALA", + "id": "LOCALID_JUBILIFE_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_JUBILIFE_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_JUBILIFE_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_pokecenter_1f.json b/res/field/events/events_oreburgh_city_pokecenter_1f.json index ed2a408e6a..53a672c99d 100644 --- a/res/field/events/events_oreburgh_city_pokecenter_1f.json +++ b/res/field/events/events_oreburgh_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_PSYCHIC", + "id": "LOCALID_OREBURGH_PSYCHIC", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_ACE_TRAINER_F", + "id": "LOCALID_OREBURGH_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_NINJA_BOY", + "id": "LOCALID_OREBURGH_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_OREBURGH_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_GENTLEMAN", + "id": "LOCALID_OREBURGH_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_OREBURGH_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_OREBURGH_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -107,7 +107,7 @@ "y": 0 }, { - "id": "LOCALID_KID_WITH_NDS_WEST", + "id": "LOCALID_OREBURGH_KID_WITH_NDS_WEST", "graphics_id": "OBJ_EVENT_GFX_KID_WITH_NDS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -122,7 +122,7 @@ "y": 0 }, { - "id": "LOCALID_KID_WITH_NDS_EAST", + "id": "LOCALID_OREBURGH_KID_WITH_NDS_EAST", "graphics_id": "OBJ_EVENT_GFX_KID_WITH_NDS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_pastoria_city_pokecenter_1f.json b/res/field/events/events_pastoria_city_pokecenter_1f.json index 790cb20db9..fe327dc2a4 100644 --- a/res/field/events/events_pastoria_city_pokecenter_1f.json +++ b/res/field/events/events_pastoria_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_PASTORIA_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_BLACK_BELT", + "id": "LOCALID_PASTORIA_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_SCHOOL_KID_F", + "id": "LOCALID_PASTORIA_SCHOOL_KID_F", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_PASTORIA_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_PASTORIA_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_pokemon_league_north_pokecenter_1f.json b/res/field/events/events_pokemon_league_north_pokecenter_1f.json index 567201451b..14121013e4 100644 --- a/res/field/events/events_pokemon_league_north_pokecenter_1f.json +++ b/res/field/events/events_pokemon_league_north_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_ACE_TRAINER_M", + "id": "LOCALID_LEAGUE_NORTH_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_CASHIER_F", + "id": "LOCALID_LEAGUE_NORTH_CASHIER_F", "graphics_id": "OBJ_EVENT_GFX_CASHIER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_CASHIER_M", + "id": "LOCALID_LEAGUE_NORTH_CASHIER_M", "graphics_id": "OBJ_EVENT_GFX_CASHIER_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_LEAGUE_NORTH_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_ACE_TRAINER_F", + "id": "LOCALID_LEAGUE_NORTH_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_RIVAL", + "id": "LOCALID_LEAGUE_NORTH_RIVAL", "graphics_id": "OBJ_EVENT_GFX_BARRY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "LOCALID_GUITARIST", + "id": "LOCALID_LEAGUE_NORTH_GUITARIST", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_pokemon_league_south_pokecenter_1f.json b/res/field/events/events_pokemon_league_south_pokecenter_1f.json index 26404837f4..aad5cfb3bb 100644 --- a/res/field/events/events_pokemon_league_south_pokecenter_1f.json +++ b/res/field/events/events_pokemon_league_south_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_LEAGUE_SOUTH_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_POKEFAN_M", + "id": "LOCALID_LEAGUE_SOUTH_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_ACE_TRAINER_F", + "id": "LOCALID_LEAGUE_SOUTH_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_resort_area_pokecenter_1f.json b/res/field/events/events_resort_area_pokecenter_1f.json index e202246a1e..c2fb1fc1df 100644 --- a/res/field/events/events_resort_area_pokecenter_1f.json +++ b/res/field/events/events_resort_area_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_RESORT_AREA_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_RICH_BOY", + "id": "LOCALID_RESORT_AREA_RICH_BOY", "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_IDOL", + "id": "LOCALID_RESORT_AREA_IDOL", "graphics_id": "OBJ_EVENT_GFX_IDOL", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_RESORT_AREA_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_RESORT_AREA_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sandgem_town_pokecenter_1f.json b/res/field/events/events_sandgem_town_pokecenter_1f.json index 4cbf94cb52..fa30e60519 100644 --- a/res/field/events/events_sandgem_town_pokecenter_1f.json +++ b/res/field/events/events_sandgem_town_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKEMON_BREEDER_M", + "id": "LOCALID_SANDGEM_POKEMON_BREEDER_M", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_EXPERT_M", + "id": "LOCALID_SANDGEM_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_LASS", + "id": "LOCALID_SANDGEM_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_SANDGEM_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_TEALA", + "id": "LOCALID_SANDGEM_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_snowpoint_city_pokecenter_1f.json b/res/field/events/events_snowpoint_city_pokecenter_1f.json index 3e47057a67..d248f5a4e8 100644 --- a/res/field/events/events_snowpoint_city_pokecenter_1f.json +++ b/res/field/events/events_snowpoint_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_SNOWPOINT_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_LASS", + "id": "LOCALID_SNOWPOINT_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_BATTLE_GIRL", + "id": "LOCALID_SNOWPOINT_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_PSYDUCK", + "id": "LOCALID_SNOWPOINT_PSYDUCK", "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_MAYLENE", + "id": "LOCALID_SNOWPOINT_MAYLENE", "graphics_id": "OBJ_EVENT_GFX_MAYLENE", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_SNOWPOINT_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_SNOWPOINT_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_solaceon_town_pokecenter_1f.json b/res/field/events/events_solaceon_town_pokecenter_1f.json index e7a085a87d..ab08828ce8 100644 --- a/res/field/events/events_solaceon_town_pokecenter_1f.json +++ b/res/field/events/events_solaceon_town_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_SOLACEON_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_OLD_MAN", + "id": "LOCALID_SOLACEON_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_LASS", + "id": "LOCALID_SOLACEON_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_SOLACEON_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_SOLACEON_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_RUIN_MANIAC", + "id": "LOCALID_SOLACEON_RUIN_MANIAC", "graphics_id": "OBJ_EVENT_GFX_RUIN_MANIAC", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sunyshore_city_pokecenter_1f.json b/res/field/events/events_sunyshore_city_pokecenter_1f.json index 451e869cbe..f172ec6c74 100644 --- a/res/field/events/events_sunyshore_city_pokecenter_1f.json +++ b/res/field/events/events_sunyshore_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_SUNYSHORE_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_OLD_MAN", + "id": "LOCALID_SUNYSHORE_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_NINJA_BOY", + "id": "LOCALID_SUNYSHORE_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_MIDDLE_AGED_MAN", + "id": "LOCALID_SUNYSHORE_MIDDLE_AGED_MAN", "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_SUNYSHORE_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_SUNYSHORE_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_survival_area_pokecenter_1f.json b/res/field/events/events_survival_area_pokecenter_1f.json index 3167a36a63..8ad44ac7d7 100644 --- a/res/field/events/events_survival_area_pokecenter_1f.json +++ b/res/field/events/events_survival_area_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_SURVIVAL_AREA_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_ACE_TRAINER_M", + "id": "LOCALID_SURVIVAL_AREA_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_EXPERT_M", + "id": "LOCALID_SURVIVAL_AREA_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_PSYCHIC", + "id": "LOCALID_SURVIVAL_AREA_PSYCHIC", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_twinleaf_town_player_house_1f.json b/res/field/events/events_twinleaf_town_player_house_1f.json index ad6b78a2cb..6d16242174 100644 --- a/res/field/events/events_twinleaf_town_player_house_1f.json +++ b/res/field/events/events_twinleaf_town_player_house_1f.json @@ -67,7 +67,7 @@ ], "object_events": [ { - "id": "LOCALID_MOM", + "id": "LOCALID_PLAYER_HOUSE_MOM", "graphics_id": "OBJ_EVENT_GFX_MOM", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_veilstone_city_pokecenter_1f.json b/res/field/events/events_veilstone_city_pokecenter_1f.json index 7f92679e0a..3756923010 100644 --- a/res/field/events/events_veilstone_city_pokecenter_1f.json +++ b/res/field/events/events_veilstone_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LOCALID_POKECENTER_NURSE", + "id": "LOCALID_VEILSTONE_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LOCALID_SOCIALITE", + "id": "LOCALID_VEILSTONE_SOCIALITE", "graphics_id": "OBJ_EVENT_GFX_SOCIALITE", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "LOCALID_SCHOOL_KID_M", + "id": "LOCALID_VEILSTONE_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_1", + "id": "LOCALID_VEILSTONE_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_VAR_A", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "LOCALID_DAILY_TRAINER_2", + "id": "LOCALID_VEILSTONE_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_VAR_B", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/scripts/scripts_canalave_city_pokecenter_1f.s b/res/field/scripts/scripts_canalave_city_pokecenter_1f.s index 2cfee5e3cd..fd14adf47c 100644 --- a/res/field/scripts/scripts_canalave_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_canalave_city_pokecenter_1f.s @@ -11,7 +11,7 @@ ScriptEntryEnd CanalaveCityPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_CANALAVE_NURSE End CanalaveCityPokecenter1F_PokemonBreederF: diff --git a/res/field/scripts/scripts_celestic_town_pokecenter_1f.s b/res/field/scripts/scripts_celestic_town_pokecenter_1f.s index 0b9fbcd95a..0f5f65b2c2 100644 --- a/res/field/scripts/scripts_celestic_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_celestic_town_pokecenter_1f.s @@ -10,7 +10,7 @@ ScriptEntryEnd CelesticTownPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_CELESTIC_NURSE End CelesticTownPokecenter1F_ExpertF: diff --git a/res/field/scripts/scripts_common.s b/res/field/scripts/scripts_common.s index 2d102c1911..c91111846d 100644 --- a/res/field/scripts/scripts_common.s +++ b/res/field/scripts/scripts_common.s @@ -2,51 +2,70 @@ #include "generated/distribution_events.h" #include "generated/player_transitions.h" #include "generated/time_of_day.h" -#include "constants/trainer_card_levels.h" #include "generated/tutor_locations.h" +#include "constants/trainer_card_levels.h" #include "res/text/bank/common_strings.h" #include "res/text/bank/menu_entries.h" +#include "res/field/events/events_twinleaf_town_player_house_1f.h" +#include "res/field/events/events_canalave_city_pokecenter_1f.h" +#include "res/field/events/events_celestic_town_pokecenter_1f.h" +#include "res/field/events/events_eterna_city_pokecenter_1f.h" +#include "res/field/events/events_fight_area_pokecenter_1f.h" +#include "res/field/events/events_floaroma_town_pokecenter_1f.h" +#include "res/field/events/events_hearthome_city_pokecenter_1f.h" +#include "res/field/events/events_jubilife_city_pokecenter_1f.h" +#include "res/field/events/events_oreburgh_city_pokecenter_1f.h" +#include "res/field/events/events_pastoria_city_pokecenter_1f.h" +#include "res/field/events/events_pokemon_league_south_pokecenter_1f.h" +#include "res/field/events/events_pokemon_league_north_pokecenter_1f.h" +#include "res/field/events/events_resort_area_pokecenter_1f.h" +#include "res/field/events/events_sandgem_town_pokecenter_1f.h" +#include "res/field/events/events_snowpoint_city_pokecenter_1f.h" +#include "res/field/events/events_solaceon_town_pokecenter_1f.h" +#include "res/field/events/events_sunyshore_city_pokecenter_1f.h" +#include "res/field/events/events_survival_area_pokecenter_1f.h" +#include "res/field/events/events_veilstone_city_pokecenter_1f.h" ScriptEntry CommonScript_HandleSignpostInput @ 0x7D0 ScriptEntry CommonScript_CheckBagPocketForItem @ 0x7D1 ScriptEntry CommonScript_PokecenterNurse @ 0x7D2 - ScriptEntry _03E8 @ 0x7D3 - ScriptEntry _043B @ 0x7D4 + ScriptEntry CommonScript_FieldEffectPoisonFainted @ 0x7D3 + ScriptEntry CommonScript_2004 @ 0x7D4 ScriptEntry CommonScript_SaveAndStoreResult @ 0x7D5 ScriptEntry CommonScript_SaveGame @ 0x7D6 - ScriptEntry CommonScript_EmptyScript2 @ 0x7D7 - ScriptEntry _05EA @ 0x7D8 + ScriptEntry CommonScript_EmptyScript2007 @ 0x7D7 + ScriptEntry CommonScript_HoneyTree @ 0x7D8 ScriptEntry CommonScript_ObtainPoketchApp @ 0x7D9 - ScriptEntry CommonScript_EmptyScript1 @ 0x7DA - ScriptEntry CommonScript_EmptyScript3 @ 0x7DB + ScriptEntry CommonScript_EmptyScript2010 @ 0x7DA + ScriptEntry CommonScript_EmptyScript2011 @ 0x7DB ScriptEntry CommonScript_SendToUndergroundPC @ 0x7DC ScriptEntry CommonScript_ObtainUndergroundTrap @ 0x7DD ScriptEntry CommonScript_ObtainUndergroundSphere @ 0x7DE ScriptEntry CommonScript_ObtainAccessoryWaitForConfirm @ 0x7DF ScriptEntry CommonScript_AddItemQuantityNoLineFeed @ 0x7E0 ScriptEntry CommonScript_BagIsFull @ 0x7E1 - ScriptEntry _0BEE @ 0x7E2 + ScriptEntry CommonScript_PC @ 0x7E2 ScriptEntry CommonScript_VendorGreetingGeneric @ 0x7E3 ScriptEntry CommonScript_PlayerHouseBlackOutRecover @ 0x7E4 ScriptEntry CommonScript_PokecenterBlackOutRecover @ 0x7E5 - ScriptEntry CommonScript_EmptyScript4 @ 0x7E6 - ScriptEntry _0FA7 @ 0x7E7 - ScriptEntry CommonScript_EmptyScript5 @ 0x7E8 - ScriptEntry _1282 @ 0x7E9 - ScriptEntry _12A8 @ 0x7EA + ScriptEntry CommonScript_EmptyScript2022 @ 0x7E6 + ScriptEntry CommonScript_2023 @ 0x7E7 + ScriptEntry CommonScript_EmptyScript2024 @ 0x7E8 + ScriptEntry CommonScript_Geonet @ 0x7E9 + ScriptEntry CommonScript_2026 @ 0x7EA ScriptEntry CommonScript_Vent @ 0x7EB - ScriptEntry _12CD @ 0x7EC - ScriptEntry _12E0 @ 0x7ED - ScriptEntry _12F3 @ 0x7EE + ScriptEntry CommonScript_SweetScentNothingHere @ 0x7EC + ScriptEntry CommonScript_SweetScentFaded @ 0x7ED + ScriptEntry CommonScript_BikeParking @ 0x7EE ScriptEntry CommonScript_HatchEgg @ 0x7EF - ScriptEntry _138C @ 0x7F0 + ScriptEntry CommonScript_RepelsEffectWoreOff @ 0x7F0 ScriptEntry _139D @ 0x7F1 - ScriptEntry _048B @ 0x7F2 - ScriptEntry _13AB @ 0x7F3 + ScriptEntry CommonScript_ImpossibleToSave @ 0x7F2 + ScriptEntry CommonScript_BlockPokecenterBasement @ 0x7F3 ScriptEntry CommonScript_ObtainContestBackdropWaitForConfirm @ 0x7F4 - ScriptEntry CommonScript_EmptyScript6 @ 0x7F5 - ScriptEntry CommonScript_PrintPlateObtainedMessage @ 0x7F6 - ScriptEntry _1477 @ 0x7F7 + ScriptEntry CommonScript_EmptyScript2037 @ 0x7F5 + ScriptEntry CommonScript_PlateObtainedEngraving @ 0x7F6 + ScriptEntry CommonScript_TryUseAzureFlute @ 0x7F7 ScriptEntry CommonScript_SetCounterpartBGM @ 0x7F8 ScriptEntry CommonScript_FadeToDefaultMusic @ 0x7F9 ScriptEntry CommonScript_SetRivalBGM @ 0x7FA @@ -57,20 +76,20 @@ ScriptEntry CommonScript_ObtainAccessory @ 0x7FF ScriptEntry CommonScript_SetFollowMeBGM @ 0x800 ScriptEntry CommonScript_FadeToDefaultMusic @ 0x801 - ScriptEntry _15E7 @ 0x802 - ScriptEntry _1636 @ 0x803 - ScriptEntry _164A @ 0x804 - ScriptEntry _165E @ 0x805 - ScriptEntry CommonScript_Frontier_CheckAllFrontierGoldPrintsObtained @ 0x806 + ScriptEntry CommonScript_GlobalTerminalMachine @ 0x802 + ScriptEntry CommonScript_ShardCostWindowRoute212 @ 0x803 + ScriptEntry CommonScript_ShardCostWindowSurvivalArea @ 0x804 + ScriptEntry CommonScript_ShardCostWindowSnowpointCity @ 0x805 + ScriptEntry CommonScript_CheckObtainedAllGoldPrints @ 0x806 ScriptEntry CommonScript_SetLookerBGM @ 0x807 ScriptEntry CommonScript_FadeToDefaultMusic @ 0x808 ScriptEntry CommonScript_GriseousOrbCouldNotBeRemoved @ 0x809 ScriptEntryEnd -CommonScript_EmptyScript1: +CommonScript_EmptyScript2010: End -CommonScript_EmptyScript2: +CommonScript_EmptyScript2007: End CommonScript_PokecenterNurse: @@ -78,23 +97,23 @@ CommonScript_PokecenterNurse: LockAll FacePlayer GetTrainerCardLevel VAR_RESULT - GoToIfGe VAR_RESULT, TRAINER_CARD_LEVEL_GOLD, CommonScript_PokecenterNurse_GoldCard + GoToIfGe VAR_RESULT, TRAINER_CARD_LEVEL_GOLD, CommonScript_NurseGoldCard SetVar VAR_0x8004, CommonStrings_Text_PokecenterGreeting_Day GetTimeOfDay VAR_RESULT Dummy1F9 VAR_RESULT SetVar VAR_0x8004, CommonStrings_Text_PokecenterGreeting_Morning - GoToIfEq VAR_RESULT, TIMEOFDAY_MORNING, CommonScript_PokecenterNurse_Greeting + GoToIfEq VAR_RESULT, TIMEOFDAY_MORNING, CommonScript_NurseGreeting SetVar VAR_0x8004, CommonStrings_Text_PokecenterGreeting_Night - GoToIfEq VAR_RESULT, TIMEOFDAY_DAY, CommonScript_PokecenterNurse_Greeting + GoToIfEq VAR_RESULT, TIMEOFDAY_DAY, CommonScript_NurseGreeting SetVar VAR_0x8004, CommonStrings_Text_PokecenterGreeting_Day -CommonScript_PokecenterNurse_Greeting: +CommonScript_NurseGreeting: MessageVar VAR_0x8004 ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, CommonScript_PokecenterNurse_AcceptHealPokemon - GoToIfEq VAR_RESULT, MENU_NO, CommonScript_PokecenterNurse_DeclineHealPokemon + GoToIfEq VAR_RESULT, MENU_YES, CommonScript_NurseAcceptHealPokemon + GoToIfEq VAR_RESULT, MENU_NO, CommonScript_NurseDeclineHealPokemon End -CommonScript_PokecenterNurse_DeclineHealPokemon: +CommonScript_NurseDeclineHealPokemon: Message CommonStrings_Text_PokecenterHopeToSeeYouAgain1 WaitButton CloseMessage @@ -102,44 +121,44 @@ CommonScript_PokecenterNurse_DeclineHealPokemon: ReturnCommonScript End -CommonScript_PokecenterNurse_AcceptHealPokemon: +CommonScript_NurseAcceptHealPokemon: SetPlayerState PLAYER_TRANSITION_HEALING ChangePlayerState - ApplyMovement LOCALID_PLAYER, CommonScript_PokecenterNurse_PlayerGivePokemonMovement + ApplyMovement LOCALID_PLAYER, CommonScript_Movement_PlayerGivePokemon WaitMovement GetTrainerCardLevel VAR_RESULT - CallIfGe VAR_RESULT, TRAINER_CARD_LEVEL_GOLD, CommonScript_PokecenterNurse_TakePokemonMessage_GoldCard - CallIfLt VAR_RESULT, TRAINER_CARD_LEVEL_GOLD, CommonScript_PokecenterNurse_TakePokemonMessage - Call CommonScript_PokecenterNurse_HealPokemon - GoToIfUnset FLAG_POKECENTER_IDENTIFIED_POKERUS, CommonScript_PokecenterNurse_CheckPokerus - GoTo CommonScript_PokecenterNurse_FarewellAfterHeal + CallIfGe VAR_RESULT, TRAINER_CARD_LEVEL_GOLD, CommonScript_TakePokemonGoldCard + CallIfLt VAR_RESULT, TRAINER_CARD_LEVEL_GOLD, CommonScript_TakePokemon + Call CommonScript_NurseHealPokemon + GoToIfUnset FLAG_POKECENTER_IDENTIFIED_POKERUS, CommonScript_NurseCheckPokerus + GoTo CommonScript_NurseFarewellAfterHeal -CommonScript_PokecenterNurse_TakePokemonMessage: +CommonScript_TakePokemon: Message CommonStrings_Text_PokecenterTakeYourPokemon Return -CommonScript_PokecenterNurse_TakePokemonMessage_GoldCard: +CommonScript_TakePokemonGoldCard: Message CommonStrings_Text_PokecenterTakeYourPokemon_GoldCard Return -CommonScript_PokecenterNurse_HealPokemon: - ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_TurnToMachineMovement +CommonScript_NurseHealPokemon: + ApplyMovement VAR_0x8007, CommonScript_Movement_NurseTurnToMachine WaitMovement CountPartyNonEggs VAR_0x8006 PlayPokecenterHealingAnimation VAR_0x8006 - ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_TurnToPlayerMovement + ApplyMovement VAR_0x8007, CommonScript_Movement_NurseTurnToPlayer WaitMovement HealParty Return -CommonScript_PokecenterNurse_FarewellAfterHeal: - GoToIfEq VAR_0x8004, TRUE, CommonScript_PokecenterNurse_FarewellAfterHeal_GoldCard +CommonScript_NurseFarewellAfterHeal: + GoToIfEq VAR_0x8004, TRUE, CommonScript_NurseFarewellAfterHealGoldCard Message CommonStrings_Text_PokecenterRestoredYourPokemon - ApplyMovement LOCALID_PLAYER, CommonScript_PokecenterNurse_PlayerRetrievePokemonMovement + ApplyMovement LOCALID_PLAYER, CommonScript_Movement_PlayerRetrievePokemon WaitMovement SetPlayerState PLAYER_TRANSITION_WALKING ChangePlayerState - ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_NurseBowMovement + ApplyMovement VAR_0x8007, CommonScript_Movement_NurseBow WaitMovement Message CommonStrings_Text_PokecenterHopeToSeeYouAgain1 WaitButton @@ -148,13 +167,13 @@ CommonScript_PokecenterNurse_FarewellAfterHeal: ReturnCommonScript End -CommonScript_PokecenterNurse_FarewellAfterHeal_GoldCard: +CommonScript_NurseFarewellAfterHealGoldCard: Message CommonStrings_Text_PokecenterThankYouForWaiting - ApplyMovement LOCALID_PLAYER, CommonScript_PokecenterNurse_PlayerRetrievePokemonMovement + ApplyMovement LOCALID_PLAYER, CommonScript_Movement_PlayerRetrievePokemon WaitMovement SetPlayerState PLAYER_TRANSITION_WALKING ChangePlayerState - ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_NurseBowMovement + ApplyMovement VAR_0x8007, CommonScript_Movement_NurseBow WaitMovement Message CommonStrings_Text_PokecenterHopeToSeeYouAgain2 WaitButton @@ -163,14 +182,14 @@ CommonScript_PokecenterNurse_FarewellAfterHeal_GoldCard: ReturnCommonScript End -CommonScript_PokecenterNurse_CheckPokerus: +CommonScript_NurseCheckPokerus: CheckPartyPokerus VAR_0x8006 - GoToIfEq VAR_0x8006, TRUE, CommonScript_PokecenterNurse_IdentifiedPokerus - GoTo CommonScript_PokecenterNurse_FarewellAfterHeal + GoToIfEq VAR_0x8006, TRUE, CommonScript_NurseIdentifiedPokerus + GoTo CommonScript_NurseFarewellAfterHeal -CommonScript_PokecenterNurse_IdentifiedPokerus: +CommonScript_NurseIdentifiedPokerus: SetFlag FLAG_POKECENTER_IDENTIFIED_POKERUS - ApplyMovement LOCALID_PLAYER, CommonScript_PokecenterNurse_PlayerRetrievePokemonMovement + ApplyMovement LOCALID_PLAYER, CommonScript_Movement_PlayerRetrievePokemon WaitMovement SetPlayerState PLAYER_TRANSITION_WALKING ChangePlayerState @@ -181,14 +200,14 @@ CommonScript_PokecenterNurse_IdentifiedPokerus: ReturnCommonScript End -CommonScript_PokecenterNurse_GoldCard: - GoToIfSet FLAG_POKECENTER_GOLD_TRAINER_CARD_SEEN, CommonScript_PokecenterNurse_GoldCard_PreviouslySeen +CommonScript_NurseGoldCard: + GoToIfSet FLAG_POKECENTER_GOLD_TRAINER_CARD_SEEN, CommonScript_NurseGoldCardPreviouslySeen SetFlag FLAG_POKECENTER_GOLD_TRAINER_CARD_SEEN Message CommonStrings_Text_PokecenterGreeting_Interrupted BufferPlayerName 0 Message CommonStrings_Text_PokecenterThatTrainerCard ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, CommonScript_PokecenterNurse_AcceptHealPokemon_GoldCard + GoToIfEq VAR_RESULT, MENU_YES, CommonScript_NurseAcceptHealPokemonGoldCard Message CommonStrings_Text_PokecenterHopeToSeeYouAgain2 WaitButton CloseMessage @@ -196,11 +215,11 @@ CommonScript_PokecenterNurse_GoldCard: ReturnCommonScript End -CommonScript_PokecenterNurse_GoldCard_PreviouslySeen: +CommonScript_NurseGoldCardPreviouslySeen: BufferPlayerName 0 Message CommonStrings_Text_PokecenterGreatToSeeYou ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, CommonScript_PokecenterNurse_AcceptHealPokemon_GoldCard + GoToIfEq VAR_RESULT, MENU_YES, CommonScript_NurseAcceptHealPokemonGoldCard Message CommonStrings_Text_PokecenterHopeToSeeYouAgain2 WaitButton CloseMessage @@ -208,23 +227,23 @@ CommonScript_PokecenterNurse_GoldCard_PreviouslySeen: ReturnCommonScript End -CommonScript_PokecenterNurse_AcceptHealPokemon_GoldCard: +CommonScript_NurseAcceptHealPokemonGoldCard: SetVar VAR_0x8004, TRUE - GoTo CommonScript_PokecenterNurse_AcceptHealPokemon + GoTo CommonScript_NurseAcceptHealPokemon .balign 4, 0 -CommonScript_PokecenterNurse_NurseBowMovement: +CommonScript_Movement_NurseBow: PokecenterNurseBow Delay4 EndMovement .balign 4, 0 -CommonScript_PokecenterNurse_PlayerGivePokemonMovement: +CommonScript_Movement_PlayerGivePokemon: PlayerGive EndMovement .balign 4, 0 -CommonScript_PokecenterNurse_PlayerRetrievePokemonMovement: +CommonScript_Movement_PlayerRetrievePokemon: PlayerReceive EndMovement @@ -289,25 +308,25 @@ CommonScript_Unused: ReturnCommonScript End -_03E8: +CommonScript_FieldEffectPoisonFainted: LockAll GetPartyCount VAR_0x8004 SetVar VAR_0x8005, 0 -_03F4: +CommonScript_TrySurvivePoison: SurvivePoison VAR_RESULT, VAR_0x8005 - GoToIfEq VAR_RESULT, 0, _040F + GoToIfEq VAR_RESULT, FALSE, CommonScript_FaintedFromPoison BufferPartyMonNickname 0, VAR_0x8005 - Message pl_msg_00000213_00066 -_040F: + Message CommonStrings_Text_PokemonSurvivedThePoisoning +CommonScript_FaintedFromPoison: AddVar VAR_0x8005, 1 - GoToIfNe VAR_0x8004, VAR_0x8005, _03F4 + GoToIfNe VAR_0x8004, VAR_0x8005, CommonScript_TrySurvivePoison CountAliveMonsExcept VAR_RESULT, 6 - GoToIfEq VAR_RESULT, 0, _0457 + GoToIfEq VAR_RESULT, 0, CommonScript_PoisonWhiteout CloseMessage ReleaseAll End -_043B: +CommonScript_2004: FadeScreenIn WaitFadeScreen WaitABPress @@ -315,9 +334,9 @@ _043B: WaitFadeScreen End -_0457: +CommonScript_PoisonWhiteout: BufferPlayerName 0 - Message pl_msg_00000213_00011 + Message CommonStrings_Text_OutOfPokemonVisionDimmed WaitABPress CloseMessage FadeOutBGM 0, 10 @@ -329,75 +348,75 @@ _0457: CommonScript_SaveAndStoreResult: ClearFlag FLAG_SAVE_EXTRA_BLOCK - Call CommonScript_SaveGame_Dialog + Call CommonScript_TrySaveGame StoreSaveResult VAR_RESULT CloseMessage End -_048B: - Message pl_msg_00000213_00020 +CommonScript_ImpossibleToSave: + Message CommonStrings_Text_ImpossibleToSave WaitABPress CloseMessage End CommonScript_SaveGame: SetFlag FLAG_SAVE_EXTRA_BLOCK - Call CommonScript_SaveGame_Dialog + Call CommonScript_TrySaveGame SetVar VAR_MAP_LOCAL_0, VAR_RESULT ReturnCommonScript End -CommonScript_SaveGame_Dialog: +CommonScript_TrySaveGame: CheckSaveType VAR_RESULT - GoToIfEq VAR_RESULT, SAVE_TYPE_OVERWRITE, CommonScript_SaveGame_ImpossibleToSave + GoToIfEq VAR_RESULT, SAVE_TYPE_OVERWRITE, CommonScript_SaveTypeOverwrite OpenSaveInfo - Message pl_msg_00000213_00013 + Message CommonStrings_Text_WouldYouLikeToSave ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, CommonScript_SaveGame_Cancel + GoToIfEq VAR_RESULT, MENU_NO, CommonScript_CancelSave CheckSaveType VAR_RESULT - GoToIfEq VAR_RESULT, SAVE_TYPE_NO_DATA_EXISTS, CommonScript_SaveGame_SavingALotOfData - GoToIfEq VAR_RESULT, SAVE_TYPE_FULL_SAVE, CommonScript_SaveGame_FullSave_OverwriteCheck - GoToIfEq VAR_RESULT, SAVE_TYPE_QUICK_SAVE, CommonScript_SaveGame_QuickSave_OverwriteCheck + GoToIfEq VAR_RESULT, SAVE_TYPE_NO_DATA_EXISTS, CommonScript_SavingALotOfData + GoToIfEq VAR_RESULT, SAVE_TYPE_FULL_SAVE, CommonScript_FullSaveAskOverwrite + GoToIfEq VAR_RESULT, SAVE_TYPE_QUICK_SAVE, CommonScript_QuickSaveAskOverwrite End -CommonScript_SaveGame_ImpossibleToSave: - Message pl_msg_00000213_00020 +CommonScript_SaveTypeOverwrite: + Message CommonStrings_Text_ImpossibleToSave WaitABPress SetVar VAR_RESULT, 0 Return -CommonScript_SaveGame_FullSave_OverwriteCheck: - Message pl_msg_00000213_00014 +CommonScript_FullSaveAskOverwrite: + Message CommonStrings_Text_OKToOverwriteSavedFile ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, CommonScript_SaveGame_Cancel -CommonScript_SaveGame_SavingALotOfData: - Message pl_msg_00000213_00021 - GoTo CommonScript_SaveGame_StartSave + GoToIfEq VAR_RESULT, MENU_NO, CommonScript_CancelSave +CommonScript_SavingALotOfData: + Message CommonStrings_Text_SavingALotOfData + GoTo CommonScript_StartSave -CommonScript_SaveGame_QuickSave_OverwriteCheck: - Message pl_msg_00000213_00014 +CommonScript_QuickSaveAskOverwrite: + Message CommonStrings_Text_OKToOverwriteSavedFile ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, CommonScript_SaveGame_Cancel - GoToIfUnset FLAG_SAVE_EXTRA_BLOCK, CommonScript_QuickSave_Save - GoToIfSet FLAG_SAVE_EXTRA_BLOCK, CommonScript_QuickSave_CheckMiscFlag + GoToIfEq VAR_RESULT, MENU_NO, CommonScript_CancelSave + GoToIfUnset FLAG_SAVE_EXTRA_BLOCK, CommonScript_StartQuickSave + GoToIfSet FLAG_SAVE_EXTRA_BLOCK, CommonScript_QuickSaveCheckMiscFlag End -CommonScript_SaveGame_StartSave: +CommonScript_StartSave: ScrCmd_258 WaitTime 2, VAR_RESULT - Call CommonScript_SaveGame_DoSave + Call CommonScript_DoSave ScrCmd_259 - GoTo CommonScript_SaveGame_SaveComplete + GoTo CommonScript_SaveComplete -CommonScript_SaveGame_DoSave: +CommonScript_DoSave: ShowSavingIcon - CallIfSet FLAG_SAVE_EXTRA_BLOCK, CommonScript_SaveGame_SaveExtraBlock + CallIfSet FLAG_SAVE_EXTRA_BLOCK, CommonScript_SaveExtraBlock TrySaveGame VAR_RESULT HideSavingIcon Return -CommonScript_SaveGame_SaveComplete: - GoToIfEq VAR_RESULT, 0, CommonScript_SaveGame_SaveError +CommonScript_SaveComplete: + GoToIfEq VAR_RESULT, 0, CommonScript_SaveError BufferPlayerName 0 Message CommonStrings_Text_PlayerSavedTheGame PlaySE SEQ_SE_DP_SAVE @@ -406,119 +425,119 @@ CommonScript_SaveGame_SaveComplete: CloseSaveInfo Return -CommonScript_SaveGame_Cancel: +CommonScript_CancelSave: CloseSaveInfo SetVar VAR_RESULT, 0 Return -CommonScript_SaveGame_SaveError: +CommonScript_SaveError: Message CommonStrings_Text_SaveError WaitABPress CloseSaveInfo Return -CommonScript_QuickSave_DoFullSave: - Message pl_msg_00000213_00021 - GoTo CommonScript_SaveGame_StartSave +CommonScript_QuickSaveStartFullStave: + Message CommonStrings_Text_SavingALotOfData + GoTo CommonScript_StartSave End -CommonScript_SaveGame_SaveExtraBlock: +CommonScript_SaveExtraBlock: SaveExtraData ClearFlag FLAG_SAVE_EXTRA_BLOCK Return -CommonScript_QuickSave_Save: +CommonScript_StartQuickSave: Message CommonStrings_Text_SavingDontTurnOffThePower - GoTo CommonScript_SaveGame_StartSave + GoTo CommonScript_StartSave End -CommonScript_QuickSave_CheckMiscFlag: +CommonScript_QuickSaveCheckMiscFlag: CheckIsMiscSaveInit VAR_RESULT - GoToIfEq VAR_RESULT, 0, CommonScript_QuickSave_DoFullSave - GoTo CommonScript_QuickSave_Save + GoToIfEq VAR_RESULT, 0, CommonScript_QuickSaveStartFullStave + GoTo CommonScript_StartQuickSave End -_05EA: +CommonScript_HoneyTree: PlaySE SEQ_SE_CONFIRM LockAll CheckItem ITEM_HONEY, 1, VAR_RESULT - GoToIfNe VAR_RESULT, 0, _0632 + GoToIfNe VAR_RESULT, FALSE, CommonScript_HoneyTreeWithHoney GetHoneyTreeStatus VAR_RESULT - GoToIfEq VAR_RESULT, TREE_STATUS_BARE, _065F - GoToIfEq VAR_RESULT, TREE_STATUS_SLATHERED, _066A - GoToIfEq VAR_RESULT, TREE_STATUS_ENCOUNTER, _06F4 + GoToIfEq VAR_RESULT, TREE_STATUS_BARE, CommonScript_HoneyTreeBareNoHoney + GoToIfEq VAR_RESULT, TREE_STATUS_SLATHERED, CommonScript_HoneyTreeSlatheredNoHoney + GoToIfEq VAR_RESULT, TREE_STATUS_ENCOUNTER, CommonScript_HoneyTreeEncounter End -_0632: +CommonScript_HoneyTreeWithHoney: GetHoneyTreeStatus VAR_RESULT - GoToIfEq VAR_RESULT, TREE_STATUS_BARE, _0675 - GoToIfEq VAR_RESULT, TREE_STATUS_SLATHERED, _067E - GoToIfEq VAR_RESULT, TREE_STATUS_ENCOUNTER, _06F4 + GoToIfEq VAR_RESULT, TREE_STATUS_BARE, CommonScript_HoneyTreeBareWithHoney + GoToIfEq VAR_RESULT, TREE_STATUS_SLATHERED, CommonScript_HoneyTreeSlatheredWithHoney + GoToIfEq VAR_RESULT, TREE_STATUS_ENCOUNTER, CommonScript_HoneyTreeEncounter End -_065F: - Message pl_msg_00000213_00046 +CommonScript_HoneyTreeBareNoHoney: + Message CommonStrings_Text_HoneyTreeSweetScentNoHoney WaitButton CloseMessage ReleaseAll End -_066A: - Message pl_msg_00000213_00048 +CommonScript_HoneyTreeSlatheredNoHoney: + Message CommonStrings_Text_HoneyTreeSlatheredNoHoney WaitButton CloseMessage ReleaseAll End -_0675: - Message pl_msg_00000213_00047 - GoTo _06BB +CommonScript_HoneyTreeBareWithHoney: + Message CommonStrings_Text_HoneyTreeSweetScent + GoTo CommonScript_AskSlatherHoneyTree -_067E: - Message pl_msg_00000213_00049 - GoTo _06BB +CommonScript_HoneyTreeSlatheredWithHoney: + Message CommonStrings_Text_HoneyTreeSlathered + GoTo CommonScript_AskSlatherHoneyTree CommonScript_Unused2: CheckItem ITEM_HONEY, 1, VAR_RESULT - GoToIfNe VAR_RESULT, 0, _06BB + GoToIfNe VAR_RESULT, FALSE, CommonScript_AskSlatherHoneyTree CloseMessage ReleaseAll End -_06A2: +CommonScript_HoneyTreePostBattle: CheckItem ITEM_HONEY, 1, VAR_RESULT - GoToIfNe VAR_RESULT, 0, _06BB + GoToIfNe VAR_RESULT, FALSE, CommonScript_AskSlatherHoneyTree ReleaseAll End -_06BB: - Message pl_msg_00000213_00050 +CommonScript_AskSlatherHoneyTree: + Message CommonStrings_Text_SlatherBarkWithHoney ShowYesNoMenu VAR_RESULT CloseMessage - GoToIfEq VAR_RESULT, MENU_YES, _06D5 + GoToIfEq VAR_RESULT, MENU_YES, CommonScript_SlatherHoneyTree ReleaseAll End -_06D5: +CommonScript_SlatherHoneyTree: RemoveItem ITEM_HONEY, 1, VAR_RESULT IncrementTrainerScore2 TRAINER_SCORE_EVENT_HONEY_USED SlatherHoneyTree WaitTime 10, VAR_RESULT - Message pl_msg_00000213_00051 + Message CommonStrings_Text_BarkWasSlathered WaitButton CloseMessage ReleaseAll End -_06F4: - IncrementGameRecord RECORD_UNK_117 +CommonScript_HoneyTreeEncounter: + IncrementGameRecord RECORD_HONEY_TREE_POKEMON_ENCOUNTERED StartHoneyTreeBattle CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _0713 - ScrCmd_12A - GoTo _06A2 + GoToIfEq VAR_RESULT, FALSE, CommonScript_LostHoneyTreeBattle + StopHoneyTreeShaking + GoTo CommonScript_HoneyTreePostBattle -_0713: +CommonScript_LostHoneyTreeBattle: BlackOutFromBattle ReleaseAll End @@ -564,43 +583,43 @@ CommonScript_InternalObtainPoketchApp: Return CommonScript_ObtainedPoketchDigitalWatch: - Message pl_msg_00000213_00083 + Message CommonStrings_Text_ObtainedPoketchDigitalWatch Return CommonScript_ObtainedPoketchCalculator: - Message pl_msg_00000213_00084 + Message CommonStrings_Text_ObtainedPoketchCalculator Return CommonScript_ObtainedPoketchMemopad: - Message pl_msg_00000213_00085 + Message CommonStrings_Text_ObtainedPoketchMemoPad Return CommonScript_ObtainedPoketchPedometer: - Message pl_msg_00000213_00086 + Message CommonStrings_Text_ObtainedPoketchPedometer Return CommonScript_ObtainedPoketchPartyStatus: - Message pl_msg_00000213_00087 + Message CommonStrings_Text_ObtainedPoketchPokemonList Return CommonScript_ObtainedPoketchFriendshipChecker: - Message pl_msg_00000213_00088 + Message CommonStrings_Text_ObtainedPoketchFriendshipChecker Return CommonScript_ObtainedPoketchDowsingMachine: - Message pl_msg_00000213_00089 + Message CommonStrings_Text_ObtainedPoketchDowsingMachine Return CommonScript_ObtainedPoketchBerrySearcher: - Message pl_msg_00000213_00090 + Message CommonStrings_Text_ObtainedPoketchBerrySearcher Return CommonScript_ObtainedPoketchDayCareChecker: - Message pl_msg_00000213_00091 + Message CommonStrings_Text_ObtainedPoketchDayCareChecker Return CommonScript_ObtainedPoketchPokemonHistory: - Message pl_msg_00000213_00092 + Message CommonStrings_Text_ObtainedPoketchPokemonHistory Return CommonScript_ObtainedPoketchCounter: @@ -608,74 +627,74 @@ CommonScript_ObtainedPoketchCounter: Return CommonScript_ObtainedPoketchAnalogWatch: - Message pl_msg_00000213_00094 + Message CommonStrings_Text_ObtainedPoketchAnalogWatch Return CommonScript_ObtainedPoketchMarkingMap: - Message pl_msg_00000213_00095 + Message CommonStrings_Text_ObtainedPoketchMarkingMap Return CommonScript_ObtainedPoketchLinkSearcher: - Message pl_msg_00000213_00096 + Message CommonStrings_Text_ObtainedPoketchLinkSearcher Return CommonScript_ObtainedPoketchCoinToss: - Message pl_msg_00000213_00097 + Message CommonStrings_Text_ObtainedPoketchCoinToss Return CommonScript_ObtainedPoketchMoveTester: - Message pl_msg_00000213_00098 + Message CommonStrings_Text_ObtainedPoketchMoveTester Return CommonScript_ObtainedPoketchCalendar: - Message pl_msg_00000213_00099 + Message CommonStrings_Text_ObtainedPoketchCalendar Return CommonScript_ObtainedPoketchDotArt: - Message pl_msg_00000213_00100 + Message CommonStrings_Text_ObtainedPoketchDotArtist Return CommonScript_ObtainedPoketchRoulette: - Message pl_msg_00000213_00101 + Message CommonStrings_Text_ObtainedPoketchRoulette Return CommonScript_ObtainedPoketchRadarChainCounter: - Message pl_msg_00000213_00102 + Message CommonStrings_Text_ObtainedPoketchTrainerCounter Return CommonScript_ObtainedPoketchKitchenTimer: - Message pl_msg_00000213_00103 + Message CommonStrings_Text_ObtainedPoketchKitchenTimer Return CommonScript_ObtainedPoketchColorChanger: - Message pl_msg_00000213_00104 + Message CommonStrings_Text_ObtainedPoketchColorChanger Return CommonScript_ObtainedPoketchMatchupChecker: - Message pl_msg_00000213_00105 + Message CommonStrings_Text_ObtainedPoketchMatchupChecker Return CommonScript_ObtainedPoketchStopwatch: - Message pl_msg_00000213_00106 + Message CommonStrings_Text_ObtainedPoketchStopwatch Return CommonScript_ObtainedPoketchAlarmClock: - Message pl_msg_00000213_00107 + Message CommonStrings_Text_ObtainedPoketchAlarmClock Return -CommonScript_EmptyScript3: +CommonScript_EmptyScript2011: End CommonScript_SendToUndergroundPC: Call CommonScript_ObtainUndergroundItem - Message pl_msg_00000213_00109 + Message CommonStrings_Text_ItemWasSentToUndergroundPC WaitButton ReturnCommonScript End CommonScript_SendToUndergroundPCWithLinefeed: Call CommonScript_ObtainUndergroundItem - Message pl_msg_00000213_00128 + Message CommonStrings_Text_ItemWasSentToUndergroundPC_ArrowPrompt ReturnCommonScript End @@ -683,7 +702,7 @@ CommonScript_ObtainUndergroundItem: PlayFanfare SEQ_FANFA4 SendGoodToPC VAR_0x8004, VAR_0x8005, VAR_RESULT BufferUndergroundGoodsNameWithArticle 0, VAR_0x8004 - Message pl_msg_00000213_00108 + Message CommonStrings_Text_ObtainedUndergroundItem BufferUndergroundGoodsName 0, VAR_0x8004 WaitFanfare Return @@ -697,7 +716,7 @@ CommonScript_InternalObtainUndergroundTrap: PlayFanfare SEQ_FANFA4 GiveTrap VAR_0x8004, VAR_0x8005, VAR_RESULT BufferUndergroundTrapName 0, VAR_0x8004 - Message pl_msg_00000213_00080 + Message CommonStrings_Text_ObtainedTheUndergroundTrap WaitFanfare Return @@ -711,7 +730,7 @@ CommonScript_InternalObtainUndergroundSphere: GiveSphere VAR_0x8004, VAR_0x8005, VAR_RESULT BufferUndergroundItemName 0, VAR_0x8004 BufferNumber 1, VAR_0x8005 - Message pl_msg_00000213_00081 + Message CommonStrings_Text_ObtainedTheUndergroundSphere WaitFanfare Return @@ -770,7 +789,7 @@ CommonScript_InternalAddItemQuantityNoLineFeed: Call CommonScript_GetBagPocketForItem AddItem VAR_0x8004, VAR_0x8005, VAR_RESULT GetItemPocket VAR_0x8004, VAR_RESULT - CallIfEq VAR_RESULT, POCKET_KEY_ITEMS, CommonScript_PrintMessageObtainedKeyItem + CallIfEq VAR_RESULT, POCKET_KEY_ITEMS, CommonScript_ObtainedKeyItem CallIfNe VAR_RESULT, POCKET_KEY_ITEMS, CommonScript_PrepareMessageObtainedItem Message CommonStrings_Text_PutItemInThePocketNoLineFeed WaitButton @@ -785,32 +804,32 @@ CommonScript_InternalAddItemQuantity: Call CommonScript_GetBagPocketForItem AddItem VAR_0x8004, VAR_0x8005, VAR_RESULT GetItemPocket VAR_0x8004, VAR_RESULT - CallIfEq VAR_RESULT, POCKET_KEY_ITEMS, CommonScript_PrintMessageObtainedKeyItem + CallIfEq VAR_RESULT, POCKET_KEY_ITEMS, CommonScript_ObtainedKeyItem CallIfNe VAR_RESULT, POCKET_KEY_ITEMS, CommonScript_PrepareMessageObtainedItem Message CommonStrings_Text_PutItemInThePocket Return -CommonScript_PrintMessageObtainedKeyItem: +CommonScript_ObtainedKeyItem: BufferPlayerName 0 BufferItemName 1, VAR_0x8004 Message CommonStrings_Text_ObtainedKeyItem GoTo CommonScript_AfterObtainedItem CommonScript_PrepareMessageObtainedItem: - GoToIfGt VAR_0x8005, 1, CommonScript_PrintMessageObtainedItemsPlural + GoToIfGt VAR_0x8005, 1, CommonScript_ObtainedItemsPlural BufferItemName 0, VAR_0x8004 - GoTo CommonScript_PrintMessageObtainedItem + GoTo CommonScript_ObtainedItem -CommonScript_PrintMessageObtainedItemsPlural: +CommonScript_ObtainedItemsPlural: BufferItemNamePlural 0, VAR_0x8004 -CommonScript_PrintMessageObtainedItem: +CommonScript_ObtainedItem: Message CommonStrings_Text_ObtainedItem GoTo CommonScript_AfterObtainedItem CommonScript_AfterObtainedItem: WaitFanfare CheckItemIsPlate VAR_0x8004, VAR_RESULT - CallIfEq VAR_RESULT, TRUE, CommonScript_DeterminePlateMessage + CallIfEq VAR_RESULT, TRUE, CommonScript_DeterminePlateEngraving BufferPlayerName 0 GoToIfGt VAR_0x8005, 1, CommonScript_BufferPocketNameItemsPlural BufferItemName 1, VAR_0x8004 @@ -884,255 +903,255 @@ CommonScript_InternalBagIsFull: WaitButton Return -_0BEE: +CommonScript_PC: LockAll PlaySE SEQ_SE_DP_PC_ON - Call _0C06 + Call CommonScript_PCBootUpAnimation BufferPlayerName 0 - Message pl_msg_00000213_00032 - GoTo _0C1C + Message CommonStrings_Text_BootedUpThePC + GoTo CommonScript_AccessWhichPC -_0C06: +CommonScript_PCBootUpAnimation: LoadPCAnimation ANIMATION_TAG_PC PlayPCBootUpAnimation ANIMATION_TAG_PC WaitForAnimation ANIMATION_TAG_PC Return -_0C11: +CommonScript_PCShutDownAnimation: PlayPCShutDownAnimation ANIMATION_TAG_PC WaitForAnimation ANIMATION_TAG_PC UnloadAnimation ANIMATION_TAG_PC Return -_0C1C: +CommonScript_AccessWhichPC: BufferPlayerName 0 - Message pl_msg_00000213_00033 + Message CommonStrings_Text_AccessWhichPC InitGlobalTextMenu 1, 1, 0, VAR_0x8006 - CallIfUnset FLAG_MET_BEBE, _0C7B - CallIfSet FLAG_MET_BEBE, _0C81 - AddMenuEntryImm 60, 1 + CallIfUnset FLAG_MET_BEBE, CommonScript_AddMenuEntrySomeonesPC + CallIfSet FLAG_MET_BEBE, CommonScript_AddMenuEntryBebesPC + AddMenuEntryImm MenuEntries_Text_PC_PlayersPC, 1 GetNationalDexEnabled VAR_RESULT - CallIfEq VAR_RESULT, 0, _0C87 - CallIfEq VAR_RESULT, 1, _0C8D - GoToIfSet FLAG_GAME_COMPLETED, _0C93 - GoToIfUnset FLAG_GAME_COMPLETED, _0CDD + CallIfEq VAR_RESULT, FALSE, CommonScript_AddMenuEntryRowansPC + CallIfEq VAR_RESULT, TRUE, CommonScript_AddMenuEntryOaksPC + GoToIfSet FLAG_GAME_COMPLETED, CommonScript_PCMenuHallOfFame + GoToIfUnset FLAG_GAME_COMPLETED, CommonScript_PCMenu End -_0C7B: - AddMenuEntryImm 58, 0 +CommonScript_AddMenuEntrySomeonesPC: + AddMenuEntryImm MenuEntries_Text_PC_SomeonesPC, 0 Return -_0C81: - AddMenuEntryImm 59, 0 +CommonScript_AddMenuEntryBebesPC: + AddMenuEntryImm MenuEntries_Text_PC_BebesPC, 0 Return -_0C87: - AddMenuEntryImm 63, 2 +CommonScript_AddMenuEntryRowansPC: + AddMenuEntryImm MenuEntries_Text_PC_RowansPC, 2 Return -_0C8D: - AddMenuEntryImm 62, 2 +CommonScript_AddMenuEntryOaksPC: + AddMenuEntryImm MenuEntries_Text_PC_OaksPC, 2 Return -_0C93: - AddMenuEntryImm 61, 3 - AddMenuEntryImm 64, 4 +CommonScript_PCMenuHallOfFame: + AddMenuEntryImm MenuEntries_Text_PC_HallOfFame, 3 + AddMenuEntryImm MenuEntries_Text_PC_SwitchOff, 4 ShowMenu SetVar VAR_0x8008, VAR_0x8006 - GoToIfEq VAR_0x8008, 0, _0D16 - GoToIfEq VAR_0x8008, 1, _0E45 - GoToIfEq VAR_0x8008, 2, _0F62 - GoToIfEq VAR_0x8008, 3, _0F2C - GoTo _0F70 + GoToIfEq VAR_0x8008, 0, CommonScript_StorageSystem + GoToIfEq VAR_0x8008, 1, CommonScript_PlayersPC + GoToIfEq VAR_0x8008, 2, CommonScript_ProfsPC + GoToIfEq VAR_0x8008, 3, CommonScript_PCHallOfFame + GoTo CommonScript_PCSwitchOff -_0CDD: - AddMenuEntryImm 64, 3 +CommonScript_PCMenu: + AddMenuEntryImm MenuEntries_Text_PC_SwitchOff, 3 ShowMenu SetVar VAR_0x8008, VAR_0x8006 - GoToIfEq VAR_0x8008, 0, _0D16 - GoToIfEq VAR_0x8008, 1, _0E45 - GoToIfEq VAR_0x8008, 2, _0F62 - GoTo _0F70 + GoToIfEq VAR_0x8008, 0, CommonScript_StorageSystem + GoToIfEq VAR_0x8008, 1, CommonScript_PlayersPC + GoToIfEq VAR_0x8008, 2, CommonScript_ProfsPC + GoTo CommonScript_PCSwitchOff -_0D16: +CommonScript_StorageSystem: PlaySE SEQ_SE_DP_PC_LOGIN BufferPlayerName 0 - Message pl_msg_00000213_00034 - Call _0D2C - GoTo _0D73 + Message CommonStrings_Text_AccessedPokemonStorage + Call CommonScript_InitStorageSystemMenu + GoTo CommonScript_HandleStorageSystemMenuInput -_0D2C: +CommonScript_InitStorageSystemMenu: InitGlobalTextListMenu 1, 1, 0, VAR_RESULT - AddListMenuEntry MenuEntries_Text_PokemonStorageDepositPokemon, 0, MenuEntries_Text_PokemonStorageDepositPokemonDescription - AddListMenuEntry MenuEntries_Text_PokemonStorageWithdrawPokemon, 1, MenuEntries_Text_PokemonStorageWithdrawPokemonDescription - AddListMenuEntry MenuEntries_Text_PokemonStorageMovePokemon, 2, MenuEntries_Text_PokemonStorageMovePokemonDescription - AddListMenuEntry MenuEntries_Text_PokemonStorageMoveItems, 3, MenuEntries_Text_PokemonStorageMoveItemsDescription - CallIfSet FLAG_CONTEST_HALL_VISITED, _0D69 - AddListMenuEntry MenuEntries_Text_PokemonStorageSeeYa, 5, MenuEntries_Text_PokemonStorageSeeYaDescription + AddListMenuEntry MenuEntries_Text_PC_DepositPokemon, 0, MenuEntries_Text_PC_DescriptionDepositPokemon + AddListMenuEntry MenuEntries_Text_PC_WithdrawPokemon, 1, MenuEntries_Text_PC_DescriptionWithdrawPokemon + AddListMenuEntry MenuEntries_Text_PC_MovePokemon, 2, MenuEntries_Text_PC_DescriptionMovePokemon + AddListMenuEntry MenuEntries_Text_PC_MoveItems, 3, MenuEntries_Text_PC_DescriptionMoveItems + CallIfSet FLAG_CONTEST_HALL_VISITED, CommonScript_AddMenuEntryComparePokemon + AddListMenuEntry MenuEntries_Text_PC_SeeYa, 5, MenuEntries_Text_PC_DescriptionSeeYa Return -_0D69: - AddListMenuEntry MenuEntries_Text_PokemonStorageComparePokemon, 4, MenuEntries_Text_PokemonStorageComparePokemonDescription +CommonScript_AddMenuEntryComparePokemon: + AddListMenuEntry MenuEntries_Text_PC_ComparePokemon, 4, MenuEntries_Text_PC_DescriptionComparePokemon Return -_0D73: +CommonScript_HandleStorageSystemMenuInput: ShowListMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0DC2 - GoToIfEq VAR_0x8008, 1, _0DD5 - GoToIfEq VAR_0x8008, 2, _0DE8 - GoToIfEq VAR_0x8008, 3, _0DFB - GoToIfEq VAR_0x8008, 4, _0E0E - GoTo _0C1C + GoToIfEq VAR_0x8008, 0, CommonScript_DepositPokemon + GoToIfEq VAR_0x8008, 1, CommonScript_WithdrawPokemon + GoToIfEq VAR_0x8008, 2, CommonScript_MovePokemon + GoToIfEq VAR_0x8008, 3, CommonScript_MoveItems + GoToIfEq VAR_0x8008, 4, CommonScript_ComparePokemon + GoTo CommonScript_AccessWhichPC -_0DC2: +CommonScript_DepositPokemon: CloseMessage - Call _0F94 + Call CommonScript_PCFadeOut OpenPokemonStorage 0 ReturnToField - GoTo _0E21 + GoTo CommonScript_PCFadeInAccessWhichPC -_0DD5: +CommonScript_WithdrawPokemon: CloseMessage - Call _0F94 + Call CommonScript_PCFadeOut OpenPokemonStorage 1 ReturnToField - GoTo _0E21 + GoTo CommonScript_PCFadeInAccessWhichPC -_0DE8: +CommonScript_MovePokemon: CloseMessage - Call _0F94 + Call CommonScript_PCFadeOut OpenPokemonStorage 2 ReturnToField - GoTo _0E21 + GoTo CommonScript_PCFadeInAccessWhichPC -_0DFB: +CommonScript_MoveItems: CloseMessage - Call _0F94 + Call CommonScript_PCFadeOut OpenPokemonStorage 3 ReturnToField - GoTo _0E21 + GoTo CommonScript_PCFadeInAccessWhichPC -_0E0E: +CommonScript_ComparePokemon: CloseMessage - Call _0F94 + Call CommonScript_PCFadeOut OpenPokemonStorage 4 ReturnToField - GoTo _0E21 + GoTo CommonScript_PCFadeInAccessWhichPC -_0E21: - ScrCmd_30B +CommonScript_PCFadeInAccessWhichPC: + SaveTVSegmentPokemonStorageBulletin BufferPlayerName 0 - MessageInstant 33 - Call _0D2C - Call _0C06 + MessageInstant CommonStrings_Text_AccessWhichPC + Call CommonScript_InitStorageSystemMenu + Call CommonScript_PCBootUpAnimation FadeScreenIn - GoTo _0D73 + GoTo CommonScript_HandleStorageSystemMenuInput -_0E45: +CommonScript_PlayersPC: PlaySE SEQ_SE_DP_PC_LOGIN BufferPlayerName 0 - Message pl_msg_00000213_00035 - GoTo _0E55 + Message CommonStrings_Text_AccessedPlayersPC + GoTo CommonScript_PlayersPCMenu -_0E55: - Call _0E61 - GoTo _0E83 +CommonScript_PlayersPCMenu: + Call CommonScript_InitPlayersPCMenu + GoTo CommonScript_HandlePlayersPCMenuInput -_0E61: +CommonScript_InitPlayersPCMenu: InitGlobalTextListMenu 1, 1, 0, VAR_RESULT - AddListMenuEntry 71, 0, 80 - AddListMenuEntry 72, 1, 81 - AddListMenuEntry 73, 3, 82 + AddListMenuEntry MenuEntries_Text_PC_Mailbox, 0, MenuEntries_Text_PC_DescriptionMailBox + AddListMenuEntry MenuEntries_Text_PC_BallCapsules, 1, MenuEntries_Text_PC_DescriptionBallCapsules + AddListMenuEntry MenuEntries_Text_PC_LogOut, 3, MenuEntries_Text_PC_DescriptionLogOut Return -_0E83: +CommonScript_HandlePlayersPCMenuInput: ShowListMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0EAB - GoToIfEq VAR_0x8008, 1, _0EE0 - GoTo _0C1C + GoToIfEq VAR_0x8008, 0, CommonScript_Mailbox + GoToIfEq VAR_0x8008, 1, CommonScript_BallCapsules + GoTo CommonScript_AccessWhichPC -_0EAB: +CommonScript_Mailbox: CloseMessage CountMailInMailbox VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0EC6 + GoToIfEq VAR_RESULT, 0, CommonScript_NoMailInMailbox ScrCmd_1B3 - GoTo _0ECF + GoTo CommonScript_MailboxClose -_0EC6: - Message pl_msg_00000213_00052 - GoTo _0E55 +CommonScript_NoMailInMailbox: + Message CommonStrings_Text_NoMailInMailbox + GoTo CommonScript_PlayersPCMenu -_0ECF: +CommonScript_MailboxClose: BufferPlayerName 0 OpenMessage - Call _0E61 - GoTo _0E83 + Call CommonScript_InitPlayersPCMenu + GoTo CommonScript_HandlePlayersPCMenuInput -_0EE0: - ScrCmd_2AB VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0F01 +CommonScript_BallCapsules: + CountUniqueSealsInSealCase VAR_RESULT + GoToIfEq VAR_RESULT, 0, CommonScript_NoSeals CloseMessage - Call _0F94 + Call CommonScript_PCFadeOut OpenSealCapsuleEditor - GoTo _0F0A + GoTo CommonScript_BallCapsulesEnd -_0F01: - Message pl_msg_00000213_00118 - GoTo _0E55 +CommonScript_NoSeals: + Message CommonStrings_Text_NoSeals + GoTo CommonScript_PlayersPCMenu -_0F0A: +CommonScript_BallCapsulesEnd: BufferPlayerName 0 - MessageInstant 33 - Call _0E61 - Call _0C06 + MessageInstant CommonStrings_Text_AccessWhichPC + Call CommonScript_InitPlayersPCMenu + Call CommonScript_PCBootUpAnimation FadeScreenIn - GoTo _0E83 + GoTo CommonScript_HandlePlayersPCMenuInput -_0F2C: +CommonScript_PCHallOfFame: PlaySE SEQ_SE_DP_PC_LOGIN CloseMessage - ScrCmd_336 VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0F59 - Call _0F94 - ScrCmd_0B1 + CheckIsHallOfFameCorrupted VAR_RESULT + GoToIfEq VAR_RESULT, TRUE, CommonScript_HallOfFameDataCorrupted + Call CommonScript_PCFadeOut + OpenPCHallOfFameScreen ReturnToField - Call _0F80 - GoTo _0C1C + Call CommonScript_PCFadeIn + GoTo CommonScript_AccessWhichPC -_0F59: - Message pl_msg_00000213_00131 - GoTo _0C1C +CommonScript_HallOfFameDataCorrupted: + Message CommonStrings_Text_HallOfFameDataCorrupted + GoTo CommonScript_AccessWhichPC -_0F62: +CommonScript_ProfsPC: PlaySE SEQ_SE_DP_PC_LOGIN CallCommonScript 0x26DF - GoTo _0C1C + GoTo CommonScript_AccessWhichPC -_0F70: +CommonScript_PCSwitchOff: CloseMessage PlaySE SEQ_SE_DP_PC_LOGOFF - Call _0C11 + Call CommonScript_PCShutDownAnimation ReleaseAll End -_0F80: - Call _0C06 +CommonScript_PCFadeIn: + Call CommonScript_PCBootUpAnimation FadeScreenIn WaitFadeScreen Return -_0F94: +CommonScript_PCFadeOut: FadeScreenOut WaitFadeScreen UnloadAnimation ANIMATION_TAG_PC Return -CommonScript_EmptyScript4: +CommonScript_EmptyScript2022: End -_0FA7: +CommonScript_2023: FadeScreenOut WaitFadeScreen OpenSealCapsuleEditor @@ -1147,8 +1166,8 @@ CommonScript_VendorGreetingGeneric: CommonScript_PlayerHouseBlackOutRecover: LockAll - ApplyMovement LOCALID_PLAYER, CommonScript_PlayerHouseBlackOutRecover_PlayerTurnToMomMovement - ApplyMovement 0, CommonScript_PlayerHouseBlackOutRecover_MomTurnToPlayerMovement + ApplyMovement LOCALID_PLAYER, CommonScript_Movement_PlayerTurnToMom + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, CommonScript_Movement_MomTurnToPlayer WaitMovement FadeScreenIn WaitFadeScreen @@ -1162,19 +1181,19 @@ CommonScript_PlayerHouseBlackOutRecover: HealParty FadeScreenIn WaitFadeScreen - CallIfSet FLAG_HAS_POKEDEX, CommonScript_PlayerHouseBlackOutRecover_BeforePokedexMessage - CallIfUnset FLAG_HAS_POKEDEX, CommonScript_PlayerHouseBlackOutRecover_AfterPokedexMessage + CallIfSet FLAG_HAS_POKEDEX, CommonScript_PlayerHouseBlackOutBeforePokedexMessage + CallIfUnset FLAG_HAS_POKEDEX, CommonScript_PlayerHouseBlackOutAfterPokedexMessage WaitButton CloseMessage ReleaseAll End -CommonScript_PlayerHouseBlackOutRecover_BeforePokedexMessage: - Message CommonStrings_Text_YourPokemonAreLookingGreat_BeforePokedex +CommonScript_PlayerHouseBlackOutBeforePokedexMessage: + Message CommonStrings_Text_PokemonLookingGreatBeforePokedex Return -CommonScript_PlayerHouseBlackOutRecover_AfterPokedexMessage: - Message CommonStrings_Text_YourPokemonAreLookingGreat_AfterPokedex +CommonScript_PlayerHouseBlackOutAfterPokedexMessage: + Message CommonStrings_Text_PokemonLookingGreatAfterPokedex Return CommonScript_PokecenterBlackOutRecover: @@ -1183,18 +1202,18 @@ CommonScript_PokecenterBlackOutRecover: WaitFadeScreen SetPlayerState PLAYER_TRANSITION_HEALING ChangePlayerState - ApplyMovement LOCALID_PLAYER, CommonScript_PokecenterNurse_PlayerGivePokemonMovement + ApplyMovement LOCALID_PLAYER, CommonScript_Movement_PlayerGivePokemon WaitMovement Message CommonStrings_Text_PokecenterFirstLetsRestoreYourPokemon - Call CommonScript_PokecenterNurse_FindNurseObject - Call CommonScript_PokecenterNurse_HealPokemon - GoToIfBadgeAcquired BADGE_ID_COAL, CommonScript_PokecenterBlackOutRecover_HasCoalBadge + Call CommonScript_GetNurseID + Call CommonScript_NurseHealPokemon + GoToIfBadgeAcquired BADGE_ID_COAL, CommonScript_PokecenterBlackOutRecoverHasCoalBadge Message CommonStrings_Text_PokecenterHealedToPerfectHealth - ApplyMovement LOCALID_PLAYER, CommonScript_PokecenterNurse_PlayerRetrievePokemonMovement + ApplyMovement LOCALID_PLAYER, CommonScript_Movement_PlayerRetrievePokemon WaitMovement SetPlayerState PLAYER_TRANSITION_WALKING ChangePlayerState - ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_NurseBowMovement + ApplyMovement VAR_0x8007, CommonScript_Movement_NurseBow WaitMovement Message CommonStrings_Text_PokecenterGoodLuckTrainer WaitButton @@ -1202,12 +1221,12 @@ CommonScript_PokecenterBlackOutRecover: ReleaseAll End -CommonScript_PokecenterBlackOutRecover_HasCoalBadge: - ApplyMovement LOCALID_PLAYER, CommonScript_PokecenterNurse_PlayerRetrievePokemonMovement +CommonScript_PokecenterBlackOutRecoverHasCoalBadge: + ApplyMovement LOCALID_PLAYER, CommonScript_Movement_PlayerRetrievePokemon WaitMovement SetPlayerState PLAYER_TRANSITION_WALKING ChangePlayerState - ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_NurseBowMovement + ApplyMovement VAR_0x8007, CommonScript_Movement_NurseBow WaitMovement Message CommonStrings_Text_PokecenterAllHappyAndHealthy WaitButton @@ -1215,113 +1234,113 @@ CommonScript_PokecenterBlackOutRecover_HasCoalBadge: ReleaseAll End -CommonScript_PokecenterNurse_FindNurseObject: +CommonScript_GetNurseID: GetCurrentMapID VAR_0x8004 - GoToIfEq VAR_0x8004, MAP_HEADER_JUBILIFE_CITY_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Jubilife - GoToIfEq VAR_0x8004, MAP_HEADER_CANALAVE_CITY_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Canalave - GoToIfEq VAR_0x8004, MAP_HEADER_OREBURGH_CITY_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Oreburgh - GoToIfEq VAR_0x8004, MAP_HEADER_ETERNA_CITY_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Eterna - GoToIfEq VAR_0x8004, MAP_HEADER_HEARTHOME_CITY_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Hearthome - GoToIfEq VAR_0x8004, MAP_HEADER_PASTORIA_CITY_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Pastoria - GoToIfEq VAR_0x8004, MAP_HEADER_VEILSTONE_CITY_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Veilstone - GoToIfEq VAR_0x8004, MAP_HEADER_SUNYSHORE_CITY_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Sunyshore - GoToIfEq VAR_0x8004, MAP_HEADER_SNOWPOINT_CITY_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Snowpoint - GoToIfEq VAR_0x8004, MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_PokemonLeagueSouth - GoToIfEq VAR_0x8004, MAP_HEADER_FIGHT_AREA_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_FightArea - GoToIfEq VAR_0x8004, MAP_HEADER_SANDGEM_TOWN_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Sandgem - GoToIfEq VAR_0x8004, MAP_HEADER_FLOAROMA_TOWN_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Floaroma - GoToIfEq VAR_0x8004, MAP_HEADER_SOLACEON_TOWN_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Solaceon - GoToIfEq VAR_0x8004, MAP_HEADER_CELESTIC_TOWN_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_Celestic - GoToIfEq VAR_0x8004, MAP_HEADER_SURVIVAL_AREA_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_SurvivalArea - GoToIfEq VAR_0x8004, MAP_HEADER_RESORT_AREA_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_ResortArea - GoToIfEq VAR_0x8004, MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_1F, CommonScript_PokecenterNurse_FindNurseObject_PokemonLeagueNorth + GoToIfEq VAR_0x8004, MAP_HEADER_JUBILIFE_CITY_POKECENTER_1F, CommonScript_SetNurseIDJubilife + GoToIfEq VAR_0x8004, MAP_HEADER_CANALAVE_CITY_POKECENTER_1F, CommonScript_SetNurseIDCanalave + GoToIfEq VAR_0x8004, MAP_HEADER_OREBURGH_CITY_POKECENTER_1F, CommonScript_SetNurseIDOreburgh + GoToIfEq VAR_0x8004, MAP_HEADER_ETERNA_CITY_POKECENTER_1F, CommonScript_SetNurseIDEterna + GoToIfEq VAR_0x8004, MAP_HEADER_HEARTHOME_CITY_POKECENTER_1F, CommonScript_SetNurseIDHearthome + GoToIfEq VAR_0x8004, MAP_HEADER_PASTORIA_CITY_POKECENTER_1F, CommonScript_SetNurseIDPastoria + GoToIfEq VAR_0x8004, MAP_HEADER_VEILSTONE_CITY_POKECENTER_1F, CommonScript_SetNurseIDVeilstone + GoToIfEq VAR_0x8004, MAP_HEADER_SUNYSHORE_CITY_POKECENTER_1F, CommonScript_SetNurseIDSunyshore + GoToIfEq VAR_0x8004, MAP_HEADER_SNOWPOINT_CITY_POKECENTER_1F, CommonScript_SetNurseIDSnowpoint + GoToIfEq VAR_0x8004, MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_1F, CommonScript_SetNurseIDPokemonLeagueSouth + GoToIfEq VAR_0x8004, MAP_HEADER_FIGHT_AREA_POKECENTER_1F, CommonScript_SetNurseIDFightArea + GoToIfEq VAR_0x8004, MAP_HEADER_SANDGEM_TOWN_POKECENTER_1F, CommonScript_SetNurseIDSandgem + GoToIfEq VAR_0x8004, MAP_HEADER_FLOAROMA_TOWN_POKECENTER_1F, CommonScript_SetNurseIDFloaroma + GoToIfEq VAR_0x8004, MAP_HEADER_SOLACEON_TOWN_POKECENTER_1F, CommonScript_SetNurseIDSolaceon + GoToIfEq VAR_0x8004, MAP_HEADER_CELESTIC_TOWN_POKECENTER_1F, CommonScript_SetNurseIDCelestic + GoToIfEq VAR_0x8004, MAP_HEADER_SURVIVAL_AREA_POKECENTER_1F, CommonScript_SetNurseIDSurvivalArea + GoToIfEq VAR_0x8004, MAP_HEADER_RESORT_AREA_POKECENTER_1F, CommonScript_SetNurseIDResortArea + GoToIfEq VAR_0x8004, MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_1F, CommonScript_SetNurseIDPokemonLeagueNorth SetVar VAR_0x8007, 0 Return -CommonScript_PokecenterNurse_FindNurseObject_Jubilife: - SetVar VAR_0x8007, 3 +CommonScript_SetNurseIDJubilife: + SetVar VAR_0x8007, LOCALID_JUBILIFE_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Canalave: - SetVar VAR_0x8007, 1 +CommonScript_SetNurseIDCanalave: + SetVar VAR_0x8007, LOCALID_CANALAVE_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Oreburgh: - SetVar VAR_0x8007, 3 +CommonScript_SetNurseIDOreburgh: + SetVar VAR_0x8007, LOCALID_OREBURGH_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Eterna: - SetVar VAR_0x8007, 3 +CommonScript_SetNurseIDEterna: + SetVar VAR_0x8007, LOCALID_ETERNA_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Hearthome: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDHearthome: + SetVar VAR_0x8007, LOCALID_HEARTHOME_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Pastoria: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDPastoria: + SetVar VAR_0x8007, LOCALID_PASTORIA_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Veilstone: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDVeilstone: + SetVar VAR_0x8007, LOCALID_VEILSTONE_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Sunyshore: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDSunyshore: + SetVar VAR_0x8007, LOCALID_SUNYSHORE_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Snowpoint: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDSnowpoint: + SetVar VAR_0x8007, LOCALID_SNOWPOINT_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_PokemonLeagueSouth: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDPokemonLeagueSouth: + SetVar VAR_0x8007, LOCALID_LEAGUE_SOUTH_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_FightArea: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDFightArea: + SetVar VAR_0x8007, LOCALID_FIGHT_AREA_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Sandgem: - SetVar VAR_0x8007, 3 +CommonScript_SetNurseIDSandgem: + SetVar VAR_0x8007, LOCALID_SANDGEM_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Floaroma: - SetVar VAR_0x8007, 2 +CommonScript_SetNurseIDFloaroma: + SetVar VAR_0x8007, LOCALID_FLOAROMA_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Solaceon: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDSolaceon: + SetVar VAR_0x8007, LOCALID_SOLACEON_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_Celestic: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDCelestic: + SetVar VAR_0x8007, LOCALID_CELESTIC_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_SurvivalArea: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDSurvivalArea: + SetVar VAR_0x8007, LOCALID_SURVIVAL_AREA_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_ResortArea: - SetVar VAR_0x8007, 0 +CommonScript_SetNurseIDResortArea: + SetVar VAR_0x8007, LOCALID_RESORT_AREA_NURSE Return -CommonScript_PokecenterNurse_FindNurseObject_PokemonLeagueNorth: - SetVar VAR_0x8007, 3 +CommonScript_SetNurseIDPokemonLeagueNorth: + SetVar VAR_0x8007, LOCALID_LEAGUE_NORTH_NURSE Return .balign 4, 0 -CommonScript_PlayerHouseBlackOutRecover_PlayerTurnToMomMovement: +CommonScript_Movement_PlayerTurnToMom: FaceWest EndMovement .balign 4, 0 -CommonScript_PlayerHouseBlackOutRecover_MomTurnToPlayerMovement: +CommonScript_Movement_MomTurnToPlayer: FaceEast EndMovement .balign 4, 0 -CommonScript_PokecenterNurse_TurnToMachineMovement: +CommonScript_Movement_NurseTurnToMachine: FaceWest EndMovement @@ -1334,14 +1353,14 @@ CommonScript_UnusedMovement2: EndMovement .balign 4, 0 -CommonScript_PokecenterNurse_TurnToPlayerMovement: +CommonScript_Movement_NurseTurnToPlayer: FaceSouth EndMovement -CommonScript_EmptyScript5: +CommonScript_EmptyScript2024: End -_1282: +CommonScript_Geonet: PlaySE SEQ_SE_CONFIRM LockAll FadeScreenOut @@ -1353,7 +1372,7 @@ _1282: ReleaseAll End -_12A8: +CommonScript_2026: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer @@ -1364,47 +1383,47 @@ _12A8: End CommonScript_Vent: - NPCMessage CommonStrings_Text_ItsAnAirVentThatExchangesTheUndergroundTunnelsAir + NPCMessage CommonStrings_Text_VentThatExchangesAir End -_12CD: - NPCMessage pl_msg_00000213_00070 +CommonScript_SweetScentNothingHere: + NPCMessage CommonStrings_Text_SweetScentNothingHere End -_12E0: - NPCMessage pl_msg_00000213_00071 +CommonScript_SweetScentFaded: + NPCMessage CommonStrings_Text_SweetScentFaded End -_12F3: +CommonScript_BikeParking: CheckItem ITEM_BICYCLE, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 0, CommonScript_End + GoToIfEq VAR_RESULT, FALSE, CommonScript_BikeParkingEnd LockAll PlaySE SEQ_SE_CONFIRM CheckPlayerOnBike VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, _133C - Message pl_msg_00000213_00073 + GoToIfEq VAR_RESULT, TRUE, CommonScript_AskGetOffYourBike + Message CommonStrings_Text_RideYourBike ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _1359 + GoToIfEq VAR_RESULT, MENU_NO, CommonScript_BikeParkingCloseMessage SetPlayerBike TRUE CloseMessage ReleaseAll End -_133C: - Message pl_msg_00000213_00074 +CommonScript_AskGetOffYourBike: + Message CommonStrings_Text_GetOffYourBike ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _1359 + GoToIfEq VAR_RESULT, MENU_NO, CommonScript_BikeParkingCloseMessage SetPlayerBike FALSE CloseMessage ReleaseAll End -_1359: +CommonScript_BikeParkingCloseMessage: CloseMessage ReleaseAll End -CommonScript_End: +CommonScript_BikeParkingEnd: End CommonScript_HatchEgg: @@ -1421,10 +1440,10 @@ CommonScript_HatchEgg: ReleaseAll End -_138C: +CommonScript_RepelsEffectWoreOff: PlaySE SEQ_SE_CONFIRM LockAll - Message pl_msg_00000213_00079 + Message CommonStrings_Text_RepelsEffectWoreOff WaitABPress CloseMessage ReleaseAll @@ -1438,117 +1457,117 @@ _139D: ReleaseAll End -_13AB: - NPCMessage pl_msg_00000213_00082 +CommonScript_BlockPokecenterBasement: + NPCMessage CommonStrings_Text_UndergroundOffLimits End -CommonScript_PrintPlateObtainedMessage: - Call CommonScript_DeterminePlateMessage +CommonScript_PlateObtainedEngraving: + Call CommonScript_DeterminePlateEngraving ReturnCommonScript End -CommonScript_DeterminePlateMessage: +CommonScript_DeterminePlateEngraving: AddVar VAR_NUM_PLATES_OBTAINED, 1 CallIfGe VAR_NUM_PLATES_OBTAINED, 9, CommonScript_ResetPlateCount - CallIfEq VAR_NUM_PLATES_OBTAINED, 1, CommonScript_Print1PlateObtainedMessage - CallIfEq VAR_NUM_PLATES_OBTAINED, 2, CommonScript_Print2PlatesObtainedMessage - CallIfEq VAR_NUM_PLATES_OBTAINED, 3, CommonScript_Print3PlatesObtainedMessage - CallIfEq VAR_NUM_PLATES_OBTAINED, 4, CommonScript_Print4PlatesObtainedMessage - CallIfEq VAR_NUM_PLATES_OBTAINED, 5, CommonScript_Print5PlatesObtainedMessage - CallIfEq VAR_NUM_PLATES_OBTAINED, 6, CommonScript_Print6PlatesObtainedMessage - CallIfEq VAR_NUM_PLATES_OBTAINED, 7, CommonScript_Print7PlatesObtainedMessage - CallIfEq VAR_NUM_PLATES_OBTAINED, 8, CommonScript_Print8PlatesObtainedMessage + CallIfEq VAR_NUM_PLATES_OBTAINED, 1, CommonScript_Engraving1PlateObtained + CallIfEq VAR_NUM_PLATES_OBTAINED, 2, CommonScript_Engraving2PlatesObtained + CallIfEq VAR_NUM_PLATES_OBTAINED, 3, CommonScript_Engraving3PlatesObtained + CallIfEq VAR_NUM_PLATES_OBTAINED, 4, CommonScript_Engraving4PlatesObtained + CallIfEq VAR_NUM_PLATES_OBTAINED, 5, CommonScript_Engraving5PlatesObtained + CallIfEq VAR_NUM_PLATES_OBTAINED, 6, CommonScript_Engraving6PlatesObtained + CallIfEq VAR_NUM_PLATES_OBTAINED, 7, CommonScript_Engraving7PlatesObtained + CallIfEq VAR_NUM_PLATES_OBTAINED, 8, CommonScript_Engraving8PlatesObtained Return CommonScript_ResetPlateCount: SetVar VAR_NUM_PLATES_OBTAINED, 1 Return -CommonScript_Print1PlateObtainedMessage: - Message pl_msg_00000213_00110 +CommonScript_Engraving1PlateObtained: + Message CommonStrings_Text_Engraving1PlateObtained Return -CommonScript_Print2PlatesObtainedMessage: - Message pl_msg_00000213_00111 +CommonScript_Engraving2PlatesObtained: + Message CommonStrings_Text_Engraving2PlatesObtained Return -CommonScript_Print3PlatesObtainedMessage: - Message pl_msg_00000213_00112 +CommonScript_Engraving3PlatesObtained: + Message CommonStrings_Text_Engraving3PlatesObtained Return -CommonScript_Print4PlatesObtainedMessage: - Message pl_msg_00000213_00113 +CommonScript_Engraving4PlatesObtained: + Message CommonStrings_Text_Engraving4PlatesObtained Return -CommonScript_Print5PlatesObtainedMessage: - Message pl_msg_00000213_00114 +CommonScript_Engraving5PlatesObtained: + Message CommonStrings_Text_Engraving5PlatesObtained Return -CommonScript_Print6PlatesObtainedMessage: - Message pl_msg_00000213_00115 +CommonScript_Engraving6PlatesObtained: + Message CommonStrings_Text_Engraving6PlatesObtained Return -CommonScript_Print7PlatesObtainedMessage: - Message pl_msg_00000213_00116 +CommonScript_Engraving7PlatesObtained: + Message CommonStrings_Text_Engraving7PlatesObtained Return -CommonScript_Print8PlatesObtainedMessage: - Message pl_msg_00000213_00117 +CommonScript_Engraving8PlatesObtained: + Message CommonStrings_Text_Engraving8PlatesObtained Return -CommonScript_EmptyScript6: +CommonScript_EmptyScript2037: End -_1477: +CommonScript_TryUseAzureFlute: LockAll GetCurrentMapID VAR_0x8004 - GoToIfEq VAR_0x8004, 220, _14AC - GoToIfEq VAR_0x8004, 0x248, _14AC - GoToIfEq VAR_0x8004, 0x249, _14AC - GoTo _1570 + GoToIfEq VAR_0x8004, 220, CommonScript_AskUseAzureFlute + GoToIfEq VAR_0x8004, 584, CommonScript_AskUseAzureFlute + GoToIfEq VAR_0x8004, 585, CommonScript_AskUseAzureFlute + GoTo CommonScript_CantUseAzureFlute End -_14AC: +CommonScript_AskUseAzureFlute: GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfNe VAR_0x8004, 31, _1570 - GoToIfNe VAR_0x8005, 52, _1570 + GoToIfNe VAR_0x8004, 31, CommonScript_CantUseAzureFlute + GoToIfNe VAR_0x8005, 52, CommonScript_CantUseAzureFlute CheckGameCompleted VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, FALSE, _1570 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, CommonScript_CantUseAzureFlute GetNationalDexEnabled VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _1570 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, CommonScript_CantUseAzureFlute CheckDistributionEvent DISTRIBUTION_EVENT_ARCEUS, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, FALSE, _1570 - GoToIfSet FLAG_CAUGHT_ARCEUS, _1570 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, CommonScript_CantUseAzureFlute + GoToIfSet FLAG_CAUGHT_ARCEUS, CommonScript_CantUseAzureFlute BufferPlayerName 0 - Message pl_msg_00000213_00122 + Message CommonStrings_Text_AskBlowIntoAzureFlute ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _157B + GoToIfEq VAR_RESULT, MENU_NO, CommonScript_DontUseAzureFlute BufferPlayerName 0 - Message pl_msg_00000213_00123 + Message CommonStrings_Text_PlayerBlewAzureFlute CloseMessage WaitTime 30, VAR_RESULT PlayMusic SEQ_FUE - WaitTime 0x21C, VAR_RESULT + WaitTime 540, VAR_RESULT GetPlayerMapPos VAR_0x8004, VAR_0x8005 FadeScreenOut FADE_SCREEN_SPEED_SLOW, COLOR_WHITE WaitFadeScreen Warp MAP_HEADER_HALL_OF_ORIGIN, 0, VAR_0x8004, VAR_0x8005, DIR_NORTH FadeScreenIn FADE_SCREEN_SPEED_SLOW, COLOR_WHITE WaitFadeScreen - Message pl_msg_00000213_00124 + Message CommonStrings_Text_GlowingStairwayAppeared WaitButton CloseMessage ReleaseAll End -_1570: - Message pl_msg_00000213_00125 +CommonScript_CantUseAzureFlute: + Message CommonStrings_Text_MeaninglessUsingAzureFlute WaitButton CloseMessage ReleaseAll End -_157B: +CommonScript_DontUseAzureFlute: CloseMessage ReleaseAll End @@ -1594,76 +1613,76 @@ CommonScript_FadeToDefaultMusic: ReturnCommonScript End -_15E7: +CommonScript_GlobalTerminalMachine: FadeScreenOut WaitFadeScreen ScrCmd_0B3 VAR_RESULT SetVar VAR_0x8004, VAR_RESULT ScrCmd_2F6 VAR_0x8005, VAR_0x8004, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _1624 + GoToIfEq VAR_RESULT, FALSE, CommonScript_GlobalTerminalMachineNoValidLogin ReturnToField FadeScreenIn WaitFadeScreen ReturnCommonScript End -_1624: +CommonScript_GlobalTerminalMachineNoValidLogin: ReturnToField FadeScreenIn WaitFadeScreen ReturnCommonScript End -_1636: +CommonScript_ShardCostWindowRoute212: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8004, TUTOR_LOCATION_ROUTE_212 - GoTo _1672 + GoTo CommonScript_ShardCostWindow End -_164A: +CommonScript_ShardCostWindowSurvivalArea: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8004, TUTOR_LOCATION_SURVIVAL_AREA - GoTo _1672 + GoTo CommonScript_ShardCostWindow End -_165E: +CommonScript_ShardCostWindowSnowpointCity: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8004, TUTOR_LOCATION_SNOWPOINT_CITY - GoTo _1672 + GoTo CommonScript_ShardCostWindow End -_1672: - Message pl_msg_00000213_00129 - ShowMoveTutorMoveSelectionMenu 0xFF, VAR_0x8004, VAR_RESULT +CommonScript_ShardCostWindow: + Message CommonStrings_Text_CheckShardsNeededForMove + ShowMoveTutorMoveSelectionMenu PARTY_SLOT_NONE, VAR_0x8004, VAR_RESULT SetVar VAR_0x8003, VAR_RESULT - GoToIfEq VAR_0x8003, -2, _16A4 + GoToIfEq VAR_0x8003, -2, CommonScript_NoMoveSelected ShowShardCost 21, 1, VAR_0x8003, VAR_RESULT WaitABPress CloseShardCostWindow - GoTo _16A4 + GoTo CommonScript_NoMoveSelected End -_16A4: +CommonScript_NoMoveSelected: CloseMessage ReleaseAll End -CommonScript_Frontier_CheckAllFrontierGoldPrintsObtained: - GoToIfSet FLAG_OBTAINED_ALL_BATTLE_FRONTIER_GOLD_PRINTS, CommonScript_Frontier_End - GoToIfNe VAR_BATTLE_FACTORY_PRINT_STATE, 4, CommonScript_Frontier_End - GoToIfNe VAR_BATTLE_HALL_PRINT_STATE, 4, CommonScript_Frontier_End - GoToIfNe VAR_BATTLE_CASTLE_PRINT_STATE, 4, CommonScript_Frontier_End - GoToIfNe VAR_BATTLE_ARCADE_PRINT_STATE, 4, CommonScript_Frontier_End - GoToIfNe VAR_BATTLE_TOWER_PRINT_STATE, 4, CommonScript_Frontier_End +CommonScript_CheckObtainedAllGoldPrints: + GoToIfSet FLAG_OBTAINED_ALL_BATTLE_FRONTIER_GOLD_PRINTS, CommonScript_CheckObtainedAllGoldPrintsEnd + GoToIfNe VAR_BATTLE_FACTORY_PRINT_STATE, 4, CommonScript_CheckObtainedAllGoldPrintsEnd + GoToIfNe VAR_BATTLE_HALL_PRINT_STATE, 4, CommonScript_CheckObtainedAllGoldPrintsEnd + GoToIfNe VAR_BATTLE_CASTLE_PRINT_STATE, 4, CommonScript_CheckObtainedAllGoldPrintsEnd + GoToIfNe VAR_BATTLE_ARCADE_PRINT_STATE, 4, CommonScript_CheckObtainedAllGoldPrintsEnd + GoToIfNe VAR_BATTLE_TOWER_PRINT_STATE, 4, CommonScript_CheckObtainedAllGoldPrintsEnd SetFlag FLAG_OBTAINED_ALL_BATTLE_FRONTIER_GOLD_PRINTS IncrementTrainerScore TRAINER_SCORE_EVENT_ALL_BATTLE_FRONTIER_GOLD_PRINTS - GoTo CommonScript_Frontier_End + GoTo CommonScript_CheckObtainedAllGoldPrintsEnd End -CommonScript_Frontier_End: +CommonScript_CheckObtainedAllGoldPrintsEnd: ReturnCommonScript End diff --git a/res/field/scripts/scripts_eterna_city_pokecenter_1f.s b/res/field/scripts/scripts_eterna_city_pokecenter_1f.s index e8d1a3b658..55f91e15ca 100644 --- a/res/field/scripts/scripts_eterna_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_eterna_city_pokecenter_1f.s @@ -11,7 +11,7 @@ ScriptEntryEnd EternaCityPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_ETERNA_NURSE End EternaCityPokecenter1F_BattleGirl: diff --git a/res/field/scripts/scripts_fight_area_pokecenter_1f.s b/res/field/scripts/scripts_fight_area_pokecenter_1f.s index e25d22c384..69816c25a3 100644 --- a/res/field/scripts/scripts_fight_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_fight_area_pokecenter_1f.s @@ -10,7 +10,7 @@ ScriptEntryEnd FightAreaPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_FIGHT_AREA_NURSE End FightAreaPokecenter1F_Guitarist: diff --git a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s index 70567f36e4..bed197bd78 100644 --- a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s @@ -10,7 +10,7 @@ ScriptEntryEnd FloaromaTownPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_FLOAROMA_NURSE End FloaromaTownPokecenter1F_PokefanM: diff --git a/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s b/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s index 7fdbd1fb63..361e5c2446 100644 --- a/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s @@ -10,7 +10,7 @@ ScriptEntryEnd HearthomeCityPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_HEARTHOME_NURSE End HearthomeCityPokecenter1F_Youngster: diff --git a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s index 9bdc187ab8..3c70105833 100644 --- a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s @@ -10,7 +10,7 @@ ScriptEntryEnd JubilifeCityPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_JUBILIFE_NURSE End JubilifeCityPokecenter1F_Twin: diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s index c933634b8d..2cdeea96ec 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s @@ -14,7 +14,7 @@ ScriptEntryEnd OreburghCityPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_OREBURGH_NURSE End OreburghCityPokecenter1F_NinjaBoy: diff --git a/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s b/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s index 6196fb26f3..15ebaf9082 100644 --- a/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s @@ -9,7 +9,7 @@ ScriptEntryEnd PastoriaCityPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_PASTORIA_NURSE End PastoriaCityPokecenter1F_BlackBelt: diff --git a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s index 2bcd4f809c..791ac64dc5 100644 --- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s @@ -50,17 +50,17 @@ PokemonLeagueNorthPokecenter1F_DoorGuard: End PokemonLeagueNorthPokecenter1F_DoorGuardMoveAwayEastSouth: - ApplyMovement LOCALID_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastSouth + ApplyMovement LOCALID_LEAGUE_NORTH_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastSouth WaitMovement GoTo PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway PokemonLeagueNorthPokecenter1F_DoorGuardMoveAwayWest: - ApplyMovement LOCALID_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayWest + ApplyMovement LOCALID_LEAGUE_NORTH_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayWest WaitMovement GoTo PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway PokemonLeagueNorthPokecenter1F_DoorGuardMoveAwayEastWest: - ApplyMovement LOCALID_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastWest + ApplyMovement LOCALID_LEAGUE_NORTH_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastWest WaitMovement GoTo PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway @@ -108,7 +108,7 @@ PokemonLeagueNorthPokecenter1F_VendorSpecial: PokemonLeagueNorthPokecenter1F_RivalTrigger: LockAll ClearFlag FLAG_HIDE_POKEMON_LEAGUE_NORTH_POKECENTER_1F_RIVAL - AddObject LOCALID_RIVAL + AddObject LOCALID_LEAGUE_NORTH_RIVAL Common_SetRivalBGM GetPlayerMapPos VAR_0x8004, VAR_0x8005 GoToIfEq VAR_0x8004, 10, PokemonLeagueNorthPokecenter1F_RivalEnterWest @@ -117,17 +117,17 @@ PokemonLeagueNorthPokecenter1F_RivalTrigger: End PokemonLeagueNorthPokecenter1F_RivalEnterWest: - ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterWest + ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterWest WaitMovement GoTo PokemonLeagueNorthPokecenter1F_RivalIntro PokemonLeagueNorthPokecenter1F_RivalEnterNorth: - ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterNorth + ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterNorth WaitMovement GoTo PokemonLeagueNorthPokecenter1F_RivalIntro PokemonLeagueNorthPokecenter1F_RivalEnterEast: - ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterEast + ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterEast WaitMovement GoTo PokemonLeagueNorthPokecenter1F_RivalIntro @@ -168,23 +168,23 @@ PokemonLeagueNorthPokecenter1F_RivalPostBattle: End PokemonLeagueNorthPokecenter1F_RivalLeaveEast: - ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveEast + ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveEast WaitMovement GoTo PokemonLeagueNorthPokecenter1F_RemoveRival PokemonLeagueNorthPokecenter1F_RivalLeaveSouth: - ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveSouth + ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveSouth WaitMovement GoTo PokemonLeagueNorthPokecenter1F_RemoveRival PokemonLeagueNorthPokecenter1F_RivalLeaveWest: - ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveWest + ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveWest WaitMovement GoTo PokemonLeagueNorthPokecenter1F_RemoveRival PokemonLeagueNorthPokecenter1F_RemoveRival: PlaySE SEQ_SE_DP_KAIDAN2 - RemoveObject LOCALID_RIVAL + RemoveObject LOCALID_LEAGUE_NORTH_RIVAL WaitSE SEQ_SE_DP_KAIDAN2 SetVar VAR_RIVAL_BEAT_SUNYSHORE_GYM, 1 ReleaseAll @@ -248,7 +248,7 @@ PokemonLeagueNorthPokecenter1F_Guitarist: End PokemonLeagueNorthPokecenter1F_Nurse: - Common_CallPokecenterNurse 3 + Common_CallPokecenterNurse LOCALID_LEAGUE_NORTH_NURSE End .balign 4, 0 diff --git a/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s b/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s index 5bd2c37380..4244688767 100644 --- a/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s @@ -1,5 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league_south_pokecenter_1f.h" +#include "res/field/events/events_pokemon_league_south_pokecenter_1f.h" ScriptEntry PokemonLeagueSouthPokecenter1F_Nurse @@ -15,7 +16,7 @@ PokemonLeagueSouthPokecenter1F_OnTransition: End PokemonLeagueSouthPokecenter1F_Nurse: - Common_CallPokecenterNurse 0 + Common_CallPokecenterNurse LOCALID_LEAGUE_SOUTH_NURSE End PokemonLeagueSouthPokecenter1F_UnusedVendor2: diff --git a/res/field/scripts/scripts_resort_area_pokecenter_1f.s b/res/field/scripts/scripts_resort_area_pokecenter_1f.s index d0d8101dbf..575802ccea 100644 --- a/res/field/scripts/scripts_resort_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_resort_area_pokecenter_1f.s @@ -9,7 +9,7 @@ ScriptEntryEnd ResortAreaPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_RESORT_AREA_NURSE End ResortAreaPokecenter1F_RichBoy: diff --git a/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s b/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s index 720dd161ce..ff64f9bd66 100644 --- a/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s @@ -3,14 +3,14 @@ #include "res/field/events/events_sandgem_town_pokecenter_1f.h" - ScriptEntry SandgemTownPokecenter1F_PokecenterNurse + ScriptEntry SandgemTownPokecenter1F_Nurse ScriptEntry SandgemTownPokecenter1F_BreederM ScriptEntry SandgemTownPokecenter1F_ExpertM ScriptEntry SandgemTownPokecenter1F_Lass ScriptEntryEnd -SandgemTownPokecenter1F_PokecenterNurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE +SandgemTownPokecenter1F_Nurse: + Common_CallPokecenterNurse LOCALID_SANDGEM_NURSE End SandgemTownPokecenter1F_BreederM: diff --git a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s index 232a78444b..96fd4ac3a6 100644 --- a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s @@ -11,7 +11,7 @@ ScriptEntryEnd SnowpointCityPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_SNOWPOINT_NURSE End SnowpointCityPokecenter1F_Lass: @@ -44,17 +44,17 @@ SnowpointCityPokecenter1F_Maylene: End SnowpointCityPokecenter1F_MayleneWalkOnSpotSouth: - ApplyMovement LOCALID_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotSouth + ApplyMovement LOCALID_SNOWPOINT_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotSouth WaitMovement Return SnowpointCityPokecenter1F_MayleneWalkOnSpotEast: - ApplyMovement LOCALID_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotEast + ApplyMovement LOCALID_SNOWPOINT_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotEast WaitMovement Return SnowpointCityPokecenter1F_MayleneWalkOnSpotWest: - ApplyMovement LOCALID_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotWest + ApplyMovement LOCALID_SNOWPOINT_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotWest WaitMovement Return diff --git a/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s b/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s index 5d4ec58f3e..353b4b76a6 100644 --- a/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s @@ -10,7 +10,7 @@ ScriptEntryEnd SolaceonTownPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_SOLACEON_NURSE End SolaceonTownPokecenter1F_OldMan: diff --git a/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s b/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s index 1c14dd567c..27da802105 100644 --- a/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s @@ -10,7 +10,7 @@ ScriptEntryEnd SunyshoreCityPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_SUNYSHORE_NURSE End SunyshoreCityPokecenter1F_OldMan: diff --git a/res/field/scripts/scripts_survival_area_pokecenter_1f.s b/res/field/scripts/scripts_survival_area_pokecenter_1f.s index 5b99243a8e..dbf1525351 100644 --- a/res/field/scripts/scripts_survival_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_survival_area_pokecenter_1f.s @@ -10,7 +10,7 @@ ScriptEntryEnd SurvivalAreaPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_SURVIVAL_AREA_NURSE End SurvivalAreaPokecenter1F_AceTrainerM: diff --git a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s index 04b9d0c59b..d2367e8b69 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s @@ -22,9 +22,9 @@ TwinleafTownPlayerHouse1F_OnTransition: End TwinleafTownPlayerHouse1F_SetMomPositionForCutsceneAfterRivalBattle: - SetObjectEventPos LOCALID_MOM, 2, 4 - SetObjectEventDir LOCALID_MOM, DIR_NORTH - SetObjectEventMovementType LOCALID_MOM, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventPos LOCALID_PLAYER_HOUSE_MOM, 2, 4 + SetObjectEventDir LOCALID_PLAYER_HOUSE_MOM, DIR_NORTH + SetObjectEventMovementType LOCALID_PLAYER_HOUSE_MOM, MOVEMENT_TYPE_LOOK_NORTH Return TwinleafTownPlayerHouse1F_HideRivalsMom: @@ -34,7 +34,7 @@ TwinleafTownPlayerHouse1F_HideRivalsMom: TwinleafTownPlayerHouse1F_OnFrame_RivalAlreadyLeft: LockAll ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerFaceMom - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromCouchToPlayer + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromCouchToPlayer WaitMovement SetFlag FLAG_TALKED_TO_MOM BufferPlayerName 0 @@ -42,7 +42,7 @@ TwinleafTownPlayerHouse1F_OnFrame_RivalAlreadyLeft: Message TwinleafTownPlayerHouse1F_Text_RivalAlreadyLeft CloseMessage WaitTime 15, VAR_RESULT - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromPlayerToCouch + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromPlayerToCouch WaitMovement SetVar VAR_PLAYER_HOUSE_STATE, 1 ReleaseAll @@ -81,7 +81,7 @@ TwinleafTownPlayerHouse1F_OnFrame_Postgame: GoToIfEq VAR_RESULT, FALSE, TwinleafTownPlayerHouse1F_PostgameRelease TwinleafTownPlayerHouse1F_DoMomPostgameSequence: ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerFaceMomPostgame - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomNoticePlayer + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomNoticePlayer WaitMovement BufferPlayerName 0 BufferRivalName 1 @@ -119,7 +119,7 @@ TwinleafTownPlayerHouse1F_Movement_MomNoticePlayer: TwinleafTownPlayerHouse1F_OnFrame_CutsceneAfterRivalBattle: LockAll WaitTime 30, VAR_RESULT - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromKitchenToCouch + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromKitchenToCouch ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerFollowMomToCouch WaitMovement WaitTime 30, VAR_RESULT @@ -269,13 +269,13 @@ TwinleafTownPlayerHouse1F_MomGiveJournal: End TwinleafTownPlayerHouse1F_MotherTurnAwaySouth: - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MotherTurnAwaySouth + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MotherTurnAwaySouth WaitMovement GoTo TwinleafTownPlayerHouse1F_RivalsMomEnters End TwinleafTownPlayerHouse1F_MotherTurnAwayNorth: - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MotherTurnAwayNorth + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MotherTurnAwayNorth WaitMovement GoTo TwinleafTownPlayerHouse1F_RivalsMomEnters End @@ -290,7 +290,7 @@ TwinleafTownPlayerHouse1F_RivalsMomEnters: ClearFlag FLAG_HIDE_TWINLEAF_TOWN_PLAYER_HOUSE_1F_RIVAL_MOM AddObject LOCALID_RIVAL_MOM WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomNoticeRivalsMom + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomNoticeRivalsMom ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerFaceRivalsMom WaitMovement ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomEnter @@ -298,7 +298,7 @@ TwinleafTownPlayerHouse1F_RivalsMomEnters: CallIfEq VAR_0x8007, DIR_NORTH, TwinleafTownPlayerHouse1F_PlayerTurnWestToRivalsMom BufferRivalName 1 Message TwinleafTownPlayerHouse1F_Text_AskIsRivalHere - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkOnSpotSouth + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkOnSpotSouth WaitMovement Message TwinleafTownPlayerHouse1F_Text_NoHesNot BufferRivalName 1 @@ -317,28 +317,28 @@ TwinleafTownPlayerHouse1F_PlayerTurnWestToRivalsMom: Return TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOtherNorth: - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnSouthToPlayer + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnSouthToPlayer ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnNorthToMom WaitMovement GoTo TwinleafTownPlayerHouse1F_WontYouPlayer End TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOtherSouth: - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnNorthToPlayer + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnNorthToPlayer ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnSouthToMom WaitMovement GoTo TwinleafTownPlayerHouse1F_WontYouPlayer End TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOtherWest: - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnEastToPlayer + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnEastToPlayer ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnWestToMom WaitMovement GoTo TwinleafTownPlayerHouse1F_WontYouPlayer End TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOtherEast: - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnWestToPlayer + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnWestToPlayer ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnEastToMom WaitMovement GoTo TwinleafTownPlayerHouse1F_WontYouPlayer @@ -424,14 +424,14 @@ TwinleafTownPlayerHouse1F_RivalsMomLeaveNorth: TwinleafTownPlayerHouse1F_RivalsMomLeaveSouth: ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomLeaveSouth ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerWatchRivalsMomLeaveSouth - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWatchRivalsMomLeaveSouth + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWatchRivalsMomLeaveSouth WaitMovement GoTo TwinleafTownPlayerHouse1F_RemoveRivalsMom End TwinleafTownPlayerHouse1F_RivalsMomLeaveWest: ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomLeaveWest - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWatchRivalsMomLeaveWest + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWatchRivalsMomLeaveWest WaitMovement GoTo TwinleafTownPlayerHouse1F_RemoveRivalsMom End @@ -740,7 +740,7 @@ TwinleafTownPlayerHouse1F_DontGoIntoTheTallGrassTrigger: TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOther: ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerAtDoorFaceMom - ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomFacePlayerAtDoor + ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomFacePlayerAtDoor WaitMovement GoTo TwinleafTownPlayerHouse1F_DontGoIntoTheTallGrass End diff --git a/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s b/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s index 080fc3f718..5a6a264603 100644 --- a/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s @@ -9,7 +9,7 @@ ScriptEntryEnd VeilstoneCityPokecenter1F_Nurse: - Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE + Common_CallPokecenterNurse LOCALID_VEILSTONE_NURSE End VeilstoneCityPokecenter1F_Socialite: diff --git a/res/text/common_strings.json b/res/text/common_strings.json index fced19befd..4baaa895d9 100644 --- a/res/text/common_strings.json +++ b/res/text/common_strings.json @@ -89,7 +89,7 @@ ] }, { - "id": "pl_msg_00000213_00011", + "id": "CommonStrings_Text_OutOfPokemonVisionDimmed", "en_US": [ "{STRVAR_1 3, 0, 0} is out of battle-ready\n", "Pokémon!\r", @@ -97,15 +97,15 @@ ] }, { - "id": "pl_msg_00000213_00012", + "id": "CommonStrings_Text_Dummy12", "garbage": 13 }, { - "id": "pl_msg_00000213_00013", + "id": "CommonStrings_Text_WouldYouLikeToSave", "en_US": "Would you like to save the game?" }, { - "id": "pl_msg_00000213_00014", + "id": "CommonStrings_Text_OKToOverwriteSavedFile", "en_US": [ "There is already a saved file.\n", "Is it OK to overwrite it?" @@ -123,7 +123,7 @@ "en_US": "{STRVAR_1 3, 0, 0} saved the game." }, { - "id": "pl_msg_00000213_00017", + "id": "CommonStrings_Text_00017", "en_US": [ "Warning!\n", "There is already a saved game file.\r", @@ -139,14 +139,14 @@ "en_US": "Save error." }, { - "id": "pl_msg_00000213_00019", + "id": "CommonStrings_Text_00019", "en_US": [ "Saving...\n", "Don’t turn off the power." ] }, { - "id": "pl_msg_00000213_00020", + "id": "CommonStrings_Text_ImpossibleToSave", "en_US": [ "There is already a saved game file.\n", "It is impossible to save.\r", @@ -158,21 +158,21 @@ ] }, { - "id": "pl_msg_00000213_00021", + "id": "CommonStrings_Text_SavingALotOfData", "en_US": [ "Saving a lot of data...\n", "Don’t turn off the power." ] }, { - "id": "pl_msg_00000213_00022", + "id": "CommonStrings_Text_00022", "en_US": [ "Want to give a nickname to the\n", "{STRVAR_1 0, 0, 0}?" ] }, { - "id": "pl_msg_00000213_00023", + "id": "CommonStrings_Text_Dummy23", "garbage": 19 }, { @@ -208,7 +208,7 @@ ] }, { - "id": "pl_msg_00000213_00029", + "id": "CommonStrings_Text_00029", "en_US": [ "{STRVAR_1 3, 0, 0} obtained\n", "the {COLOR 1}{STRVAR_1 8, 1, 0}{COLOR 0}!" @@ -229,22 +229,22 @@ ] }, { - "id": "pl_msg_00000213_00032", + "id": "CommonStrings_Text_BootedUpThePC", "en_US": "{STRVAR_1 3, 0, 0} booted up the PC.\r" }, { - "id": "pl_msg_00000213_00033", + "id": "CommonStrings_Text_AccessWhichPC", "en_US": "Which PC should be accessed?" }, { - "id": "pl_msg_00000213_00034", + "id": "CommonStrings_Text_AccessedPokemonStorage", "en_US": [ "The Pokémon Storage System\n", "was accessed.\r" ] }, { - "id": "pl_msg_00000213_00035", + "id": "CommonStrings_Text_AccessedPlayersPC", "en_US": "Accessed {STRVAR_1 3, 0, 0}’s PC.\r" }, { @@ -263,7 +263,7 @@ ] }, { - "id": "pl_msg_00000213_00038", + "id": "CommonStrings_Text_Dummy38", "garbage": 21 }, { @@ -287,7 +287,7 @@ ] }, { - "id": "CommonStrings_Text_YourPokemonAreLookingGreat_BeforePokedex", + "id": "CommonStrings_Text_PokemonLookingGreatBeforePokedex", "en_US": [ "Mom: Oh, good! You and your\n", "Pokémon are looking great.\r", @@ -306,7 +306,7 @@ ] }, { - "id": "CommonStrings_Text_YourPokemonAreLookingGreat_AfterPokedex", + "id": "CommonStrings_Text_PokemonLookingGreatAfterPokedex", "en_US": [ "Mom: Oh, good! You and your\n", "Pokémon are looking great.\r", @@ -346,35 +346,35 @@ ] }, { - "id": "pl_msg_00000213_00046", + "id": "CommonStrings_Text_HoneyTreeSweetScentNoHoney", "en_US": "There is a sweet scent in the air..." }, { - "id": "pl_msg_00000213_00047", + "id": "CommonStrings_Text_HoneyTreeSweetScent", "en_US": "There is a sweet scent in the air...\r" }, { - "id": "pl_msg_00000213_00048", + "id": "CommonStrings_Text_HoneyTreeSlatheredNoHoney", "en_US": "The bark is slathered with Honey..." }, { - "id": "pl_msg_00000213_00049", + "id": "CommonStrings_Text_HoneyTreeSlathered", "en_US": "The bark is slathered with Honey...\r" }, { - "id": "pl_msg_00000213_00050", + "id": "CommonStrings_Text_SlatherBarkWithHoney", "en_US": "Slather the bark with Honey?" }, { - "id": "pl_msg_00000213_00051", + "id": "CommonStrings_Text_BarkWasSlathered", "en_US": "The bark was slathered with Honey." }, { - "id": "pl_msg_00000213_00052", + "id": "CommonStrings_Text_NoMailInMailbox", "en_US": "There’s no Mail in the Mailbox.\r" }, { - "id": "pl_msg_00000213_00053", + "id": "CommonStrings_Text_00053", "en_US": [ "The Mail’s content will be lost.\n", "Take it back anyway?" @@ -397,84 +397,84 @@ "en_US": "Landed a Pokémon!" }, { - "id": "pl_msg_00000213_00058", + "id": "CommonStrings_Text_Dummy58", "garbage": 39 }, { - "id": "pl_msg_00000213_00059", + "id": "CommonStrings_Text_Dummy59", "garbage": 18 }, { - "id": "pl_msg_00000213_00060", + "id": "CommonStrings_Text_Dummy60", "garbage": 17 }, { - "id": "pl_msg_00000213_00061", + "id": "CommonStrings_Text_Dummy61", "garbage": 11 }, { - "id": "pl_msg_00000213_00062", + "id": "CommonStrings_Text_Dummy62", "garbage": 76 }, { - "id": "pl_msg_00000213_00063", + "id": "CommonStrings_Text_Dummy63", "garbage": 76 }, { - "id": "pl_msg_00000213_00064", + "id": "CommonStrings_Text_Dummy64", "garbage": 92 }, { - "id": "pl_msg_00000213_00065", + "id": "CommonStrings_Text_Dummy65", "garbage": 85 }, { - "id": "pl_msg_00000213_00066", + "id": "CommonStrings_Text_PokemonSurvivedThePoisoning", "en_US": [ "{STRVAR_1 1, 0, 0} survived the poisoning.\n", "The poison faded away!\r" ] }, { - "id": "CommonStrings_Text_ItsAnAirVentThatExchangesTheUndergroundTunnelsAir", + "id": "CommonStrings_Text_VentThatExchangesAir", "en_US": [ "It’s an air vent that exchanges\n", "the underground tunnels’ air." ] }, { - "id": "pl_msg_00000213_00068", + "id": "CommonStrings_Text_GenderSymbolMale", "en_US": "♂" }, { - "id": "pl_msg_00000213_00069", + "id": "CommonStrings_Text_GenderSymbolFemale", "en_US": "♀" }, { - "id": "pl_msg_00000213_00070", + "id": "CommonStrings_Text_SweetScentNothingHere", "en_US": "There appears to be nothing here..." }, { - "id": "pl_msg_00000213_00071", + "id": "CommonStrings_Text_SweetScentFaded", "en_US": [ "The sweet scent faded for some\n", "reason..." ] }, { - "id": "pl_msg_00000213_00072", + "id": "CommonStrings_Text_Dummy72", "garbage": 34 }, { - "id": "pl_msg_00000213_00073", + "id": "CommonStrings_Text_RideYourBike", "en_US": "Ride your Bike?" }, { - "id": "pl_msg_00000213_00074", + "id": "CommonStrings_Text_GetOffYourBike", "en_US": "Get off your Bike?" }, { - "id": "pl_msg_00000213_00075", + "id": "CommonStrings_Text_Dummy75", "garbage": 20 }, { @@ -482,30 +482,30 @@ "en_US": "Oh?" }, { - "id": "pl_msg_00000213_00077", + "id": "CommonStrings_Text_00077", "en_US": "{STRVAR_1 0, 0, 0} hatched from the Egg!" }, { - "id": "pl_msg_00000213_00078", + "id": "CommonStrings_Text_00078", "en_US": [ "Would you like to nickname the newly\n", "hatched {STRVAR_1 0, 0, 0}?" ] }, { - "id": "pl_msg_00000213_00079", + "id": "CommonStrings_Text_RepelsEffectWoreOff", "en_US": "Repel’s effect wore off..." }, { - "id": "pl_msg_00000213_00080", + "id": "CommonStrings_Text_ObtainedTheUndergroundTrap", "en_US": "Obtained the {STRVAR_1 8, 0, 0}!" }, { - "id": "pl_msg_00000213_00081", + "id": "CommonStrings_Text_ObtainedTheUndergroundSphere", "en_US": "Obtained the {STRVAR_1 8, 0, 0} {STRVAR_1 51, 1, 0}!" }, { - "id": "pl_msg_00000213_00082", + "id": "CommonStrings_Text_UndergroundOffLimits", "en_US": [ "I’m very sorry.\r", "We are working underground right now.\n", @@ -514,70 +514,70 @@ ] }, { - "id": "pl_msg_00000213_00083", + "id": "CommonStrings_Text_ObtainedPoketchDigitalWatch", "en_US": [ "The {COLOR 2}Digital Watch{COLOR 0} app displays\n", "the current time.\r" ] }, { - "id": "pl_msg_00000213_00084", + "id": "CommonStrings_Text_ObtainedPoketchCalculator", "en_US": [ "The {COLOR 2}Calculator{COLOR 0} app can handle\n", "calculations up to ten digits.\r" ] }, { - "id": "pl_msg_00000213_00085", + "id": "CommonStrings_Text_ObtainedPoketchMemoPad", "en_US": [ "The {COLOR 2}Memo Pad{COLOR 0} app can be used for\n", "jotting down quick notes.\r" ] }, { - "id": "pl_msg_00000213_00086", + "id": "CommonStrings_Text_ObtainedPoketchPedometer", "en_US": [ "The {COLOR 2}Pedometer{COLOR 0} app counts the number\n", "of steps you’ve walked.\r" ] }, { - "id": "pl_msg_00000213_00087", + "id": "CommonStrings_Text_ObtainedPoketchPokemonList", "en_US": [ "The {COLOR 2}Pokémon List{COLOR 0} app lets you\n", "check on the status of your team.\r" ] }, { - "id": "pl_msg_00000213_00088", + "id": "CommonStrings_Text_ObtainedPoketchFriendshipChecker", "en_US": [ "The {COLOR 2}Friendship Checker{COLOR 0} app identifies\n", "the Pokémon that like you." ] }, { - "id": "pl_msg_00000213_00089", + "id": "CommonStrings_Text_ObtainedPoketchDowsingMachine", "en_US": [ "The {COLOR 2}Dowsing Machine{COLOR 0} app locates\n", "unseeable items.\r" ] }, { - "id": "pl_msg_00000213_00090", + "id": "CommonStrings_Text_ObtainedPoketchBerrySearcher", "en_US": [ "The {COLOR 2}Berry Searcher{COLOR 0} app indicates\n", "the locations of ripe Berries." ] }, { - "id": "pl_msg_00000213_00091", + "id": "CommonStrings_Text_ObtainedPoketchDayCareChecker", "en_US": [ "The {COLOR 2}Day-Care Checker{COLOR 0} app shows\n", "the Pokémon left with the Day Care." ] }, { - "id": "pl_msg_00000213_00092", + "id": "CommonStrings_Text_ObtainedPoketchPokemonHistory", "en_US": [ "The {COLOR 2}Pokémon History{COLOR 0} app shows\n", "the most recently obtained Pokémon." @@ -591,116 +591,116 @@ ] }, { - "id": "pl_msg_00000213_00094", + "id": "CommonStrings_Text_ObtainedPoketchAnalogWatch", "en_US": [ "The {COLOR 2}Analog Watch{COLOR 0} app displays\n", "the current time." ] }, { - "id": "pl_msg_00000213_00095", + "id": "CommonStrings_Text_ObtainedPoketchMarkingMap", "en_US": [ "The {COLOR 2}Marking Map{COLOR 0} app allows the\n", "placement of markers.\r" ] }, { - "id": "pl_msg_00000213_00096", + "id": "CommonStrings_Text_ObtainedPoketchLinkSearcher", "en_US": [ "The {COLOR 2}Link Searcher{COLOR 0} app determines\n", "the availability of wireless hot spots.\r" ] }, { - "id": "pl_msg_00000213_00097", + "id": "CommonStrings_Text_ObtainedPoketchCoinToss", "en_US": [ "The {COLOR 2}Coin Toss{COLOR 0} app can be used\n", "to make fair decisions." ] }, { - "id": "pl_msg_00000213_00098", + "id": "CommonStrings_Text_ObtainedPoketchMoveTester", "en_US": [ "The {COLOR 2}Move Tester{COLOR 0} app is used to check\n", "how moves match up.\r" ] }, { - "id": "pl_msg_00000213_00099", + "id": "CommonStrings_Text_ObtainedPoketchCalendar", "en_US": [ "The {COLOR 2}Calendar{COLOR 0} app is a monthly\n", "calendar with date reminders." ] }, { - "id": "pl_msg_00000213_00100", + "id": "CommonStrings_Text_ObtainedPoketchDotArtist", "en_US": [ "The {COLOR 2}Dot Artist{COLOR 0} app gives players\n", "free reign to their creativity." ] }, { - "id": "pl_msg_00000213_00101", + "id": "CommonStrings_Text_ObtainedPoketchRoulette", "en_US": [ "The {COLOR 2}Roulette{COLOR 0} app can be customized\n", "to make an original roulette." ] }, { - "id": "pl_msg_00000213_00102", + "id": "CommonStrings_Text_ObtainedPoketchTrainerCounter", "en_US": [ "The {COLOR 2}Trainer Counter{COLOR 0} app tracks\n", "the Pokémon Radar’s rankings.\r" ] }, { - "id": "pl_msg_00000213_00103", + "id": "CommonStrings_Text_ObtainedPoketchKitchenTimer", "en_US": [ "The {COLOR 2}Kitchen Timer{COLOR 0} app is a 99-minute\n", "timer." ] }, { - "id": "pl_msg_00000213_00104", + "id": "CommonStrings_Text_ObtainedPoketchColorChanger", "en_US": [ "The {COLOR 2}Color Changer{COLOR 0} app can change\n", "the Pokétch display color." ] }, { - "id": "pl_msg_00000213_00105", + "id": "CommonStrings_Text_ObtainedPoketchMatchupChecker", "en_US": [ "The {COLOR 2}Matchup Checker{COLOR 0} app shows the\n", "affinity of Pokémon to each other.\r" ] }, { - "id": "pl_msg_00000213_00106", + "id": "CommonStrings_Text_ObtainedPoketchStopwatch", "en_US": [ "The {COLOR 2}Stopwatch{COLOR 0} app keeps precise\n", "time.\r" ] }, { - "id": "pl_msg_00000213_00107", + "id": "CommonStrings_Text_ObtainedPoketchAlarmClock", "en_US": [ "The {COLOR 2}Alarm Clock{COLOR 0} app operates\n", "on a 24-hour system.\r" ] }, { - "id": "pl_msg_00000213_00108", + "id": "CommonStrings_Text_ObtainedUndergroundItem", "en_US": "Obtained {STRVAR_1 25, 0, 0}." }, { - "id": "pl_msg_00000213_00109", + "id": "CommonStrings_Text_ItemWasSentToUndergroundPC", "en_US": [ "The {STRVAR_1 25, 0, 0} was sent to\n", "the underground PC." ] }, { - "id": "pl_msg_00000213_00110", + "id": "CommonStrings_Text_Engraving1PlateObtained", "en_US": [ "There is text engraved in the back\n", "of the obtained Plate...\r", @@ -709,7 +709,7 @@ ] }, { - "id": "pl_msg_00000213_00111", + "id": "CommonStrings_Text_Engraving2PlatesObtained", "en_US": [ "There is text engraved in the back\n", "of the obtained Plate...\r", @@ -718,7 +718,7 @@ ] }, { - "id": "pl_msg_00000213_00112", + "id": "CommonStrings_Text_Engraving3PlatesObtained", "en_US": [ "There is text engraved in the back\n", "of the obtained Plate...\r", @@ -727,7 +727,7 @@ ] }, { - "id": "pl_msg_00000213_00113", + "id": "CommonStrings_Text_Engraving4PlatesObtained", "en_US": [ "There is text engraved in the back\n", "of the obtained Plate...\r", @@ -736,7 +736,7 @@ ] }, { - "id": "pl_msg_00000213_00114", + "id": "CommonStrings_Text_Engraving5PlatesObtained", "en_US": [ "There is text engraved in the back\n", "of the obtained Plate...\r", @@ -745,7 +745,7 @@ ] }, { - "id": "pl_msg_00000213_00115", + "id": "CommonStrings_Text_Engraving6PlatesObtained", "en_US": [ "There is text engraved in the back\n", "of the obtained Plate...\r", @@ -754,7 +754,7 @@ ] }, { - "id": "pl_msg_00000213_00116", + "id": "CommonStrings_Text_Engraving7PlatesObtained", "en_US": [ "There is text engraved in the back\n", "of the obtained Plate...\r", @@ -763,7 +763,7 @@ ] }, { - "id": "pl_msg_00000213_00117", + "id": "CommonStrings_Text_Engraving8PlatesObtained", "en_US": [ "There is text engraved in the back\n", "of the obtained Plate...\r", @@ -772,14 +772,14 @@ ] }, { - "id": "pl_msg_00000213_00118", + "id": "CommonStrings_Text_NoSeals", "en_US": [ "Ball Capsules can’t be used because\n", "you don’t have any Seals.\r" ] }, { - "id": "pl_msg_00000213_00119", + "id": "CommonStrings_Text_00119", "en_US": [ "Saving the game again...\n", "Don’t turn off the power." @@ -806,7 +806,7 @@ ] }, { - "id": "pl_msg_00000213_00122", + "id": "CommonStrings_Text_AskBlowIntoAzureFlute", "en_US": [ "{STRVAR_1 3, 0, 0}’s Azure Flute is making\n", "a sound!\r", @@ -815,15 +815,15 @@ ] }, { - "id": "pl_msg_00000213_00123", + "id": "CommonStrings_Text_PlayerBlewAzureFlute", "en_US": "{STRVAR_1 3, 0, 0} blew the Azure Flute.\r" }, { - "id": "pl_msg_00000213_00124", + "id": "CommonStrings_Text_GlowingStairwayAppeared", "en_US": "A glowing stairway appeared!" }, { - "id": "pl_msg_00000213_00125", + "id": "CommonStrings_Text_MeaninglessUsingAzureFlute", "en_US": [ "The Azure Flute echoed hollowly...\r", "It appears to be meaningless using\n", @@ -845,14 +845,14 @@ ] }, { - "id": "pl_msg_00000213_00128", + "id": "CommonStrings_Text_ItemWasSentToUndergroundPC_ArrowPrompt", "en_US": [ "The {STRVAR_1 25, 0, 0} was sent to\n", "the underground PC.\r" ] }, { - "id": "pl_msg_00000213_00129", + "id": "CommonStrings_Text_CheckShardsNeededForMove", "en_US": [ "Check the move you want taught to\n", "see what Shards are needed." @@ -867,7 +867,7 @@ ] }, { - "id": "pl_msg_00000213_00131", + "id": "CommonStrings_Text_HallOfFameDataCorrupted", "en_US": [ "Your Hall of Fame data is corrupted.\r", "It will be fixed if you enter the\n", diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index 751f749bd4..311a2943ff 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -234,127 +234,127 @@ "garbage": 1 }, { - "id": "pl_msg_00000361_00058", + "id": "MenuEntries_Text_PC_SomeonesPC", "en_US": "SOMEONE’S PC" }, { - "id": "pl_msg_00000361_00059", + "id": "MenuEntries_Text_PC_BebesPC", "en_US": "BEBE’S PC" }, { - "id": "pl_msg_00000361_00060", + "id": "MenuEntries_Text_PC_PlayersPC", "en_US": "{STRVAR_1 3, 0, 0}’s PC" }, { - "id": "pl_msg_00000361_00061", + "id": "MenuEntries_Text_PC_HallOfFame", "en_US": "HALL OF FAME" }, { - "id": "pl_msg_00000361_00062", + "id": "MenuEntries_Text_PC_OaksPC", "en_US": "OAK’S PC" }, { - "id": "pl_msg_00000361_00063", + "id": "MenuEntries_Text_PC_RowansPC", "en_US": "ROWAN’S PC" }, { - "id": "pl_msg_00000361_00064", + "id": "MenuEntries_Text_PC_SwitchOff", "en_US": "SWITCH OFF" }, { - "id": "MenuEntries_Text_PokemonStorageDepositPokemon", + "id": "MenuEntries_Text_PC_DepositPokemon", "en_US": "DEPOSIT POKéMON" }, { - "id": "MenuEntries_Text_PokemonStorageWithdrawPokemon", + "id": "MenuEntries_Text_PC_WithdrawPokemon", "en_US": "WITHDRAW POKéMON" }, { - "id": "MenuEntries_Text_PokemonStorageMovePokemon", + "id": "MenuEntries_Text_PC_MovePokemon", "en_US": "MOVE POKéMON" }, { - "id": "MenuEntries_Text_PokemonStorageMoveItems", + "id": "MenuEntries_Text_PC_MoveItems", "en_US": "MOVE ITEMS" }, { - "id": "MenuEntries_Text_PokemonStorageComparePokemon", + "id": "MenuEntries_Text_PC_ComparePokemon", "en_US": "COMPARE POKéMON" }, { - "id": "MenuEntries_Text_PokemonStorageSeeYa", + "id": "MenuEntries_Text_PC_SeeYa", "en_US": "SEE YA!" }, { - "id": "pl_msg_00000361_00071", + "id": "MenuEntries_Text_PC_Mailbox", "en_US": "MAILBOX" }, { - "id": "pl_msg_00000361_00072", + "id": "MenuEntries_Text_PC_BallCapsules", "en_US": "BALL CAPSULES" }, { - "id": "pl_msg_00000361_00073", + "id": "MenuEntries_Text_PC_LogOut", "en_US": "LOG OUT" }, { - "id": "MenuEntries_Text_PokemonStorageDepositPokemonDescription", + "id": "MenuEntries_Text_PC_DescriptionDepositPokemon", "en_US": [ "Pokémon in your party may be stored\n", "in the storage system’s Boxes." ] }, { - "id": "MenuEntries_Text_PokemonStorageWithdrawPokemonDescription", + "id": "MenuEntries_Text_PC_DescriptionWithdrawPokemon", "en_US": [ "Pokémon stored in Boxes may be added\n", "to your party." ] }, { - "id": "MenuEntries_Text_PokemonStorageMovePokemonDescription", + "id": "MenuEntries_Text_PC_DescriptionMovePokemon", "en_US": [ "You may sort the Pokémon in Boxes\n", "and in your party." ] }, { - "id": "MenuEntries_Text_PokemonStorageMoveItemsDescription", + "id": "MenuEntries_Text_PC_DescriptionMoveItems", "en_US": [ "You may sort the items held by your\n", "Pokémon in Boxes and in your party." ] }, { - "id": "MenuEntries_Text_PokemonStorageComparePokemonDescription", + "id": "MenuEntries_Text_PC_DescriptionComparePokemon", "en_US": [ "You may compare two Pokémon in Boxes\n", "or your party side by side." ] }, { - "id": "MenuEntries_Text_PokemonStorageSeeYaDescription", + "id": "MenuEntries_Text_PC_DescriptionSeeYa", "en_US": [ "Log out of the Pokémon Storage\n", "System." ] }, { - "id": "pl_msg_00000361_00080", + "id": "MenuEntries_Text_PC_DescriptionMailBox", "en_US": [ "Up to 20 pieces of Mail can be\n", "stored." ] }, { - "id": "pl_msg_00000361_00081", + "id": "MenuEntries_Text_PC_DescriptionBallCapsules", "en_US": [ "You may set or edit capsules for\n", "decorating Poké Balls." ] }, { - "id": "pl_msg_00000361_00082", + "id": "MenuEntries_Text_PC_DescriptionLogOut", "en_US": "Log out of your PC." }, { diff --git a/src/game_records.c b/src/game_records.c index 8034a1336f..2794b3281b 100644 --- a/src/game_records.c +++ b/src/game_records.c @@ -204,7 +204,7 @@ static u8 sUsesHighLimit[MAX_RECORDS] = { [RECORD_TIMES_SIGNED_TRAINER_CARD] = FALSE, [RECORD_POKEMON_RECEIVED_FROM_FOSSIL_REVIVAL] = FALSE, [RECORD_CHECKED_FOOTPRINTS] = FALSE, - [RECORD_UNK_117] = FALSE, + [RECORD_HONEY_TREE_POKEMON_ENCOUNTERED] = FALSE, [RECORD_UNK_118] = FALSE, [RECORD_UNK_119] = FALSE, [RECORD_UNK_120] = FALSE, diff --git a/src/overlay005/scrcmd_move_tutor.c b/src/overlay005/scrcmd_move_tutor.c index 936d8c89e5..07f48dddca 100644 --- a/src/overlay005/scrcmd_move_tutor.c +++ b/src/overlay005/scrcmd_move_tutor.c @@ -313,7 +313,7 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext) scriptContext->data[0] = selectedOptionVar; - if (partySlot != 0xff) { + if (partySlot != PARTY_SLOT_NONE) { mon = Party_GetPokemonBySlotIndex(SaveData_GetParty(scriptContext->fieldSystem->saveData), partySlot); } @@ -326,7 +326,7 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext) int learnableMovesCount = 0; - if (partySlot != 0xff) { + if (partySlot != PARTY_SLOT_NONE) { for (knownMoveIndex = 0; knownMoveIndex < LEARNED_MOVES_MAX; knownMoveIndex++) { knownMoves[knownMoveIndex] = Pokemon_GetValue(mon, (MON_DATA_MOVE1 + knownMoveIndex), NULL); } @@ -337,7 +337,7 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext) for (int j = 0; j < 8; j++) { canLearn = ((movesetMaskByte >> j) & 0x1); - if ((canLearn == TRUE) && (location == sTeachableMoves[i * 8 + j].location)) { + if (canLearn == TRUE && location == sTeachableMoves[i * 8 + j].location) { for (knownMoveIndex = 0; knownMoveIndex < LEARNED_MOVES_MAX; knownMoveIndex++) { if (knownMoves[knownMoveIndex] == sTeachableMoves[i * 8 + j].moveID) { break; @@ -361,13 +361,13 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext) } for (int i = 0; i < learnableMovesCount; i++) { - MoveTutorManager_AddMenuEntry(moveTutorManager, learnableMoves[i], 0xff, learnableMoves[i]); + MoveTutorManager_AddMenuEntry(moveTutorManager, learnableMoves[i], 0xFF, learnableMoves[i]); } miscMessageLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD3); MoveTutorManager_SetMessageLoader(moveTutorManager, miscMessageLoader); - MoveTutorManager_AddMenuEntry(moveTutorManager, MenuEntries_Text_Exit, 0xff, (u16)MENU_CANCEL); // cast required to match + MoveTutorManager_AddMenuEntry(moveTutorManager, MenuEntries_Text_Exit, 0xFF, (u16)MENU_CANCEL); // cast required to match MessageLoader_Free(miscMessageLoader); MoveTutorManager_SetMessageLoader(moveTutorManager, moveNamesLoader); diff --git a/src/scrcmd.c b/src/scrcmd.c index bcb8250e27..13bd467916 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -389,8 +389,8 @@ static BOOL ScrCmd_OpenUnionRoomTrainerCase(ScriptContext *ctx); static BOOL ScrCmd_0AE(ScriptContext *ctx); static BOOL ScrCmd_0AF(ScriptContext *ctx); static BOOL ScrCmd_ClearGame(ScriptContext *ctx); -static BOOL ScrCmd_0B1(ScriptContext *ctx); -static BOOL ScrCmd_336(ScriptContext *ctx); +static BOOL ScrCmd_OpenPCHallOfFameScreen(ScriptContext *ctx); +static BOOL ScrCmd_CheckIsHallOfFameCorrupted(ScriptContext *ctx); static BOOL ScrCmd_TryStartGTSApp(ScriptContext *ctx); static BOOL ScrCmd_0B3(ScriptContext *ctx); static BOOL ScrCmd_StartChooseStarterScene(ScriptContext *ctx); @@ -445,7 +445,7 @@ static BOOL ScrCmd_StartCatchingTutorial(ScriptContext *ctx); static BOOL ScrCmd_SlatherHoneyTree(ScriptContext *ctx); static BOOL ScrCmd_GetHoneyTreeStatus(ScriptContext *ctx); static BOOL ScrCmd_StartHoneyTreeBattle(ScriptContext *ctx); -static BOOL ScrCmd_12A(ScriptContext *ctx); +static BOOL ScrCmd_StopHoneyTreeShaking(ScriptContext *ctx); static BOOL ScrCmd_StartSignatureApp(ScriptContext *ctx); static BOOL ScrCmd_CheckSaveType(ScriptContext *ctx); static BOOL ScrCmd_TrySaveGame(ScriptContext *ctx); @@ -683,7 +683,7 @@ static BOOL ScrCmd_2A3(ScriptContext *ctx); static BOOL ScrCmd_2A4(ScriptContext *ctx); static BOOL ScrCmd_CheckItemIsPlate(ScriptContext *ctx); static BOOL ScrCmd_CheckIsMysteryGiftPhrase(ScriptContext *ctx); -static BOOL ScrCmd_2AB(ScriptContext *ctx); +static BOOL ScrCmd_CountUniqueSealsInSealCase(ScriptContext *ctx); static BOOL ScrCmd_UnlockMysteryGift(ScriptContext *ctx); static BOOL ScrCmd_GetTrainerCasePlayerMessage(ScriptContext *ctx); static BOOL ScrCmd_2B0(ScriptContext *ctx); @@ -2539,7 +2539,7 @@ static BOOL ScrCmd_Unused_06E(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_2AB(ScriptContext *ctx) +static BOOL ScrCmd_CountUniqueSealsInSealCase(ScriptContext *ctx) { u16 *destVar = ScriptContext_GetVarPointer(ctx); @@ -3340,28 +3340,28 @@ static BOOL ScrCmd_ClearGame(ScriptContext *ctx) return TRUE; } -static BOOL ScrCmd_0B1(ScriptContext *ctx) +static BOOL ScrCmd_OpenPCHallOfFameScreen(ScriptContext *ctx) { - void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA); + void **data = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA); - *v0 = FieldTask_OpenPCHallOfFameScreen(ctx->fieldSystem); + *data = FieldTask_OpenPCHallOfFameScreen(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041CC8); return TRUE; } -static BOOL ScrCmd_336(ScriptContext *ctx) +static BOOL ScrCmd_CheckIsHallOfFameCorrupted(ScriptContext *ctx) { - int v1; - HallOfFame *v2 = SaveData_HallOfFame(ctx->fieldSystem->saveData, HEAP_ID_FIELD1, &v1); - u16 *v0 = ScriptContext_GetVarPointer(ctx); - *v0 = 0; + int resultCode; + HallOfFame *hallOfFame = SaveData_HallOfFame(ctx->fieldSystem->saveData, HEAP_ID_FIELD1, &resultCode); + u16 *destVar = ScriptContext_GetVarPointer(ctx); + *destVar = FALSE; - if (v1 == 2) { - *v0 = 1; + if (resultCode == LOAD_RESULT_CORRUPT) { + *destVar = TRUE; } - Heap_Free(v2); + Heap_Free(hallOfFame); return FALSE; } @@ -4078,7 +4078,7 @@ static BOOL ScrCmd_StartHoneyTreeBattle(ScriptContext *ctx) return TRUE; } -static BOOL ScrCmd_12A(ScriptContext *ctx) +static BOOL ScrCmd_StopHoneyTreeShaking(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; diff --git a/src/scrcmd_tv_broadcast.c b/src/scrcmd_tv_broadcast.c index 1c32b6848a..78f3667adb 100644 --- a/src/scrcmd_tv_broadcast.c +++ b/src/scrcmd_tv_broadcast.c @@ -120,7 +120,7 @@ BOOL ScrCmd_2B8(ScriptContext *param0) return FALSE; } -BOOL ScrCmd_30B(ScriptContext *param0) +BOOL ScrCmd_SaveTVSegmentPokemonStorageBulletin(ScriptContext *param0) { FieldSystem_SaveTVSegment_PokemonStorageSpecialNewsBulletin(param0->fieldSystem); return FALSE; diff --git a/src/string_template.c b/src/string_template.c index e862cc89dc..baf2c12600 100644 --- a/src/string_template.c +++ b/src/string_template.c @@ -407,11 +407,11 @@ void StringTemplate_SetGenderMarker(StringTemplate *template, u32 idx, enum Gend switch (gender) { case GENDER_MALE: - MessageLoader_GetString(loader, pl_msg_00000213_00068, template->templateBuf); + MessageLoader_GetString(loader, CommonStrings_Text_GenderSymbolMale, template->templateBuf); break; case GENDER_FEMALE: - MessageLoader_GetString(loader, pl_msg_00000213_00069, template->templateBuf); + MessageLoader_GetString(loader, CommonStrings_Text_GenderSymbolFemale, template->templateBuf); break; default: