diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index f020cc217e..14eb0c565d 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -4576,15 +4576,15 @@ .short \destVar .endm - .macro ScrCmd_300 - .short SCRCMD_300 + .macro SetFavoriteMon + .short SCRCMD_SETFAVORITEMON .endm - .macro ScrCmd_301 arg0, arg1, arg2 - .short SCRCMD_301 - .short \arg0 - .short \arg1 - .short \arg2 + .macro GetFavoriteMon destVarSpecies, destVarForm, destVarIsEgg + .short SCRCMD_GETFAVORITEMON + .short \destVarSpecies + .short \destVarForm + .short \destVarIsEgg .endm .macro GetRotomFormsInSave destVarHeat, destVarWash, destVarFrost, destVarFan, destVarMow diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 407add951f..8aeab36df5 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -193,7 +193,7 @@ FLAG_OBTAINED_QUICK_CLAW FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_2F_DUSK_BALL FLAG_RECEIVED_OREBURGH_CITY_NORTH_HOUSE_2F_HEAL_BALL FLAG_RECEIVED_ETERNA_CITY_CONDOMINIUMS_2F_TM67 -FLAG_GTS_INTRO_COMPLETED +FLAG_TALKED_TO_GLOBAL_TERMINAL_1F_RECEPTIONIST_GTS FLAG_TALKED_TO_VEILSTONE_CITY_PRIZE_EXCHANGE_GUITARIST FLAG_RECEIVED_ROUTE_204_NORTH_TM78 FLAG_RECEIVED_ROUTE_211_EAST_TM77 @@ -205,7 +205,7 @@ FLAG_RECEIVED_SURVIVAL_AREA_SOUTH_HOUSE_TM42 FLAG_RECEIVED_VEILSTONE_CITY_TM63 FLAG_RECEIVED_ROUTE_215_TM66 FLAG_RECEIVED_ROUTE_222_TM56 -FLAG_UNK_0x00CF +FLAG_RECEIVED_ALL_GLOBAL_TERMINAL_1F_BACKDROPS FLAG_CAUGHT_DIALGA FLAG_CAUGHT_PALKIA FLAG_RECEIVED_SOLACEON_RUINS_ROOM_2_GREEN_SHARD @@ -2755,7 +2755,7 @@ FLAG_DEFEATED_CLOWN_LEE FLAG_DEFEATED_INTERVIEWERS_ROXY_AND_OLI FLAG_DEFEATED_POKE_KID_ARIEL FLAG_DEFEATED_GUITARIST_ARTURO -FLAG_UNK_0x0AC3 +FLAG_RECEIVED_DAILY_GLOBAL_TERMINAL_1F_BACKDROP FLAG_SET_BATTLE_HALL_MAJOR_NPC FLAG_DEFEATED_BATTLEGROUND_FANTINA FLAG_DEFEATED_BATTLEGROUND_CANDICE diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h index 988aef33d1..e4803e4dec 100644 --- a/include/data/scripts/scrcmd.h +++ b/include/data/scripts/scrcmd.h @@ -773,8 +773,8 @@ ScriptCommand(SCRCMD_CHECKABPRESS, ScrCm ScriptCommand(SCRCMD_BUFFERTYPENAME, ScrCmd_BufferTypeName) ScriptCommand(SCRCMD_GETITEMQUANTITY, ScrCmd_GetItemQuantity) ScriptCommand(SCRCMD_CALCHIDDENPOWERTYPE, ScrCmd_CalcHiddenPowerType) -ScriptCommand(SCRCMD_300, ScrCmd_300) -ScriptCommand(SCRCMD_301, ScrCmd_301) +ScriptCommand(SCRCMD_SETFAVORITEMON, ScrCmd_SetFavoriteMon) +ScriptCommand(SCRCMD_GETFAVORITEMON, ScrCmd_GetFavoriteMon) ScriptCommand(SCRCMD_GETROTOMFORMSINSAVE, ScrCmd_GetRotomFormsInSave) ScriptCommand(SCRCMD_GETPARTYROTOMCOUNTANDFIRST, ScrCmd_GetPartyRotomCountAndFirst) ScriptCommand(SCRCMD_SETROTOMFORM, ScrCmd_SetRotomForm) diff --git a/include/overlay005/ov5_021F6454.h b/include/overlay005/ov5_021F6454.h index c371e7388d..59d67c9341 100644 --- a/include/overlay005/ov5_021F6454.h +++ b/include/overlay005/ov5_021F6454.h @@ -11,8 +11,8 @@ BOOL ScrCmd_2F1(ScriptContext *param0); BOOL ScrCmd_GetPartyRotomCountAndFirst(ScriptContext *ctx); BOOL ScrCmd_SetRotomForm(ScriptContext *ctx); BOOL ScrCmd_CalcHiddenPowerType(ScriptContext *ctx); -BOOL ScrCmd_300(ScriptContext *param0); -BOOL ScrCmd_301(ScriptContext *param0); +BOOL ScrCmd_SetFavoriteMon(ScriptContext *ctx); +BOOL ScrCmd_GetFavoriteMon(ScriptContext *ctx); BOOL ScrCmd_GetPartyMonForm2(ScriptContext *ctx); BOOL ScrCmd_CheckMetFurnitureRequirements(ScriptContext *ctx); BOOL ScrCmd_Dummy316(ScriptContext *ctx); diff --git a/include/savedata_misc.h b/include/savedata_misc.h index 751ab06f5d..6ac280c551 100644 --- a/include/savedata_misc.h +++ b/include/savedata_misc.h @@ -47,7 +47,7 @@ void MiscSaveBlock_SetTabletName(MiscSaveBlock *miscSave, String *name); void MiscSaveBlock_SetInitFlag(MiscSaveBlock *miscSave); u32 MiscSaveBlock_InitFlag(const MiscSaveBlock *miscSave); void MiscSaveBlock_SetFavoriteMon(MiscSaveBlock *miscSave, int species, int form, int isEgg); -void MiscSaveBlock_FavoriteMon(const MiscSaveBlock *miscSave, int *species, int *form, int *isEgg); +void MiscSaveBlock_GetFavoriteMon(const MiscSaveBlock *miscSave, int *species, int *form, int *isEgg); void MiscSaveBlock_IntroMsg(const MiscSaveBlock *miscSave, Sentence *message); void MiscSaveBlock_SetIntroMsg(MiscSaveBlock *miscSave, const Sentence *message); void MiscSaveBlock_VsRecorderColor(const MiscSaveBlock *miscSave, u8 *color); diff --git a/res/field/events/events_global_terminal_1f.json b/res/field/events/events_global_terminal_1f.json index 7ff8f3e21e..efeb7df9d4 100644 --- a/res/field/events/events_global_terminal_1f.json +++ b/res/field/events/events_global_terminal_1f.json @@ -91,7 +91,7 @@ ], "object_events": [ { - "id": "GLOBAL_TERMINAL_1F_RECEPTIONIST_0", + "id": "LOCALID_RECEPTIONIST_GTS", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -106,7 +106,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_COLLECTOR_1", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -121,7 +121,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_BUG_CATCHER_2", + "id": "LOCALID_BUG_CATCHER", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -136,7 +136,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_GUITARIST_3", + "id": "LOCALID_GUITARIST", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -151,7 +151,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_EXPERT_M_4", + "id": "LOCALID_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -166,7 +166,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_ACE_TRAINER_M_5", + "id": "LOCALID_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -181,7 +181,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_BEAUTY_6", + "id": "LOCALID_BEAUTY_1", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -196,7 +196,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_RECEPTIONIST_7", + "id": "LOCALID_RECEPTIONIST_ENTRY_NORTH", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -211,7 +211,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_RECEPTIONIST_8", + "id": "LOCALID_RECEPTIONIST_ENTRY_SOUTH", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -226,7 +226,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_PICNICKER_9", + "id": "LOCALID_PICNICKER", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -241,7 +241,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_YOUNGSTER_10", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -256,7 +256,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_POKEMON_BREEDER_F_11", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -271,7 +271,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_POKEMON_BREEDER_M_12", + "id": "LOCALID_POKEMON_BREEDER_M", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -286,7 +286,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_1F_BEAUTY_13", + "id": "LOCALID_BEAUTY_2", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_global_terminal_2f.json b/res/field/events/events_global_terminal_2f.json index f2f402fa88..a86373fabf 100644 --- a/res/field/events/events_global_terminal_2f.json +++ b/res/field/events/events_global_terminal_2f.json @@ -83,7 +83,7 @@ ], "object_events": [ { - "id": "GLOBAL_TERMINAL_2F_BATTLE_GIRL_0", + "id": "LOCALID_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -98,7 +98,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_2F_TWIN_1", + "id": "LOCALID_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -113,7 +113,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_2F_POKEFAN_F_2", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -128,7 +128,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_2F_BEAUTY_3", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -143,7 +143,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_2F_LASS_4", + "id": "LOCALID_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -158,7 +158,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_2F_EXPERT_F_5", + "id": "LOCALID_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -173,7 +173,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_2F_HIKER_6", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -188,7 +188,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_2F_IDOL_7", + "id": "LOCALID_IDOL", "graphics_id": "OBJ_EVENT_GFX_IDOL", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -203,7 +203,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_2F_ARTIST_8", + "id": "LOCALID_ARTIST", "graphics_id": "OBJ_EVENT_GFX_ARTIST", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_global_terminal_3f.json b/res/field/events/events_global_terminal_3f.json index 36aaed1a18..225a537db1 100644 --- a/res/field/events/events_global_terminal_3f.json +++ b/res/field/events/events_global_terminal_3f.json @@ -51,7 +51,7 @@ ], "object_events": [ { - "id": "GLOBAL_TERMINAL_3F_GENTLEMAN_0", + "id": "LOCALID_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -66,7 +66,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_3F_HIKER_1", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -81,7 +81,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_3F_GUITARIST_2", + "id": "LOCALID_GUITARIST", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -96,7 +96,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_3F_SCHOOL_KID_F_3", + "id": "LOCALID_SCHOOL_KID_F", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -111,7 +111,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_3F_CAMPER_4", + "id": "LOCALID_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -126,7 +126,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_3F_YOUNGSTER_5", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -141,7 +141,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_3F_POKEFAN_M_6", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -156,7 +156,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_3F_CLOWN_7", + "id": "LOCALID_CLOWN", "graphics_id": "OBJ_EVENT_GFX_CLOWN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -171,7 +171,7 @@ "y": 0 }, { - "id": "GLOBAL_TERMINAL_3F_ACE_TRAINER_M_8", + "id": "LOCALID_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/scripts/scripts_global_terminal_1f.s b/res/field/scripts/scripts_global_terminal_1f.s index 7d3ed0d56c..aaa3ecb080 100644 --- a/res/field/scripts/scripts_global_terminal_1f.s +++ b/res/field/scripts/scripts_global_terminal_1f.s @@ -4,71 +4,71 @@ #include "constants/map_object.h" - ScriptEntry _00F0 - ScriptEntry _00F2 - ScriptEntry GlobalTerminal1f_GTS_Clerk_Talk - ScriptEntry _0374 - ScriptEntry _0387 - ScriptEntry _039A - ScriptEntry _03AD - ScriptEntry _03C0 - ScriptEntry _03D3 - ScriptEntry _03E6 - ScriptEntry _03F9 - ScriptEntry _006B - ScriptEntry _0056 - ScriptEntry _040C - ScriptEntry _0496 - ScriptEntry _0520 - ScriptEntry _0533 - ScriptEntry _0546 - ScriptEntry _0601 - ScriptEntry _0652 - ScriptEntry _074C + ScriptEntry GlobalTerminal1F_Unused1 + ScriptEntry GlobalTerminal1F_Unused2 + ScriptEntry GlobalTerminal1F_ReceptionistGTS + ScriptEntry GlobalTerminal1F_Collector + ScriptEntry GlobalTerminal1F_BugCatcher + ScriptEntry GlobalTerminal1F_Guitarist + ScriptEntry GlobalTerminal1F_ExpertM + ScriptEntry GlobalTerminal1F_AceTrainerM + ScriptEntry GlobalTerminal1F_Beauty1 + ScriptEntry GlobalTerminal1F_Picnicker + ScriptEntry GlobalTerminal1F_Youngster + ScriptEntry GlobalTerminal1F_OnFrameExitGTSRoom + ScriptEntry GlobalTerminal1F_OnResume + ScriptEntry GlobalTerminal1F_BattleVideoRankingsMachine + ScriptEntry GlobalTerminal1F_TrainerRankingsMachine + ScriptEntry GlobalTerminal1F_RepectionistEntryNorth + ScriptEntry GlobalTerminal1F_RepectionistEntrySouth + ScriptEntry GlobalTerminal1F_PokemonBreederF + ScriptEntry GlobalTerminal1F_PokemonBreederM + ScriptEntry GlobalTerminal1F_Beauty2 + ScriptEntry GlobalTerminal1F_Sign ScriptEntryEnd -_0056: - CallIfEq VAR_UNK_0x40D5, 6, _0065 +GlobalTerminal1F_OnResume: + CallIfEq VAR_UNK_0x40D5, 6, GlobalTerminal1F_HidePlayer End -_0065: +GlobalTerminal1F_HidePlayer: HideObject LOCALID_PLAYER Return -_006B: +GlobalTerminal1F_OnFrameExitGTSRoom: LockAll - Call GlobalTerminal1f_GTS_WalkOut + Call GlobalTerminal1F_ExitGTSRoom ReleaseAll End -GlobalTerminal1f_GTS_WalkOut: +GlobalTerminal1F_ExitGTSRoom: LoadDoorAnimation 0, 0, 8, 2, ANIMATION_TAG_DOOR_1 - Call _00C5 + Call GlobalTerminal1F_PlayDoorOpenAnimation ShowObject LOCALID_PLAYER - ApplyMovement LOCALID_PLAYER, _00D8 + ApplyMovement LOCALID_PLAYER, GlobalTerminal1F_Movement_PlayerExitGTSRoom WaitMovement - Call _00CD + Call GlobalTerminal1F_PlayDoorCloseAnimation LoadDoorAnimation 0, 0, 8, 4, ANIMATION_TAG_DOOR_1 - Call _00C5 - ApplyMovement LOCALID_PLAYER, _00E8 + Call GlobalTerminal1F_PlayDoorOpenAnimation + ApplyMovement LOCALID_PLAYER, GlobalTerminal1F_Movement_PlayerWalkSouth WaitMovement - Call _00CD + Call GlobalTerminal1F_PlayDoorCloseAnimation SetVar VAR_UNK_0x40D5, 0 Return -_00C5: +GlobalTerminal1F_PlayDoorOpenAnimation: PlayDoorOpenAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 Return -_00CD: +GlobalTerminal1F_PlayDoorCloseAnimation: PlayDoorCloseAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 UnloadAnimation ANIMATION_TAG_DOOR_1 Return .balign 4, 0 -_00D8: +GlobalTerminal1F_Movement_PlayerExitGTSRoom: WalkNormalSouth EndMovement @@ -77,460 +77,460 @@ GlobalTerminal1F_UnusedMovement: EndMovement .balign 4, 0 -_00E8: +GlobalTerminal1F_Movement_PlayerWalkSouth: WalkNormalSouth 2 EndMovement -_00F0: +GlobalTerminal1F_Unused1: End -_00F2: +GlobalTerminal1F_Unused2: End -GlobalTerminal1f_GTS_Clerk_Talk: +GlobalTerminal1F_ReceptionistGTS: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer CheckPartyHasBadEgg VAR_RESULT - GoToIfEq VAR_RESULT, 1, GlobalTerminal1f_GTS_Exit_BadEgg - GoToIfSet FLAG_GTS_INTRO_COMPLETED, GlobalTerminal1f_GTS_Clerk_ShortIntro - SetFlag FLAG_GTS_INTRO_COMPLETED - Message pl_msg_00000046_00000 - GoTo GlobalTerminal1f_GTS_Clerk_Menu + GoToIfEq VAR_RESULT, TRUE, GlobalTerminal1F_HasBadEgg + GoToIfSet FLAG_TALKED_TO_GLOBAL_TERMINAL_1F_RECEPTIONIST_GTS, GlobalTerminal1F_AskDoGlobalTrade + SetFlag FLAG_TALKED_TO_GLOBAL_TERMINAL_1F_RECEPTIONIST_GTS + Message GlobalTerminal1F_Text_ThisIsGTSDoGlobalTrade + GoTo GlobalTerminal1F_GTSMenu End -GlobalTerminal1f_GTS_Clerk_Menu: +GlobalTerminal1F_GTSMenu: InitGlobalTextMenu 1, 1, 0, VAR_RESULT - AddMenuEntryImm pl_msg_00000361_00129, 0 - AddMenuEntryImm pl_msg_00000361_00128, 1 - AddMenuEntryImm pl_msg_00000361_00130, 2 + AddMenuEntryImm MenuEntries_Text_GTS_Trade, 0 + AddMenuEntryImm MenuEntries_Text_GTS_Info, 1 + AddMenuEntryImm MenuEntries_Text_GTS_Exit, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, GlobalTerminal1f_CheckPartyCount - GoToIfEq VAR_0x8008, 1, _0172 - GoToIfEq VAR_0x8008, 2, GlobalTerminal1f_GTS_Clerk_EndTalk - GoTo GlobalTerminal1f_GTS_Clerk_EndTalk + GoToIfEq VAR_0x8008, 0, GlobalTerminal1F_CheckCanTrade + GoToIfEq VAR_0x8008, 1, GlobalTerminal1F_ExplainGTS + GoToIfEq VAR_0x8008, 2, GlobalTerminal1F_ReceptionistGTSEnd + GoTo GlobalTerminal1F_ReceptionistGTSEnd End -_0172: - Message pl_msg_00000046_00002 - GoTo _017D +GlobalTerminal1F_ExplainGTS: + Message GlobalTerminal1F_Text_ExplainGTS + GoTo GlobalTerminal1F_MoreInfoMenu End -_017D: +GlobalTerminal1F_MoreInfoMenu: InitGlobalTextMenu 1, 1, 0, VAR_RESULT - AddMenuEntryImm pl_msg_00000361_00131, 0 - AddMenuEntryImm pl_msg_00000361_00132, 1 - AddMenuEntryImm pl_msg_00000361_00133, 2 + AddMenuEntryImm MenuEntries_Text_GTS_OfferPokemon, 0 + AddMenuEntryImm MenuEntries_Text_GTS_SeekPokemon, 1 + AddMenuEntryImm MenuEntries_Text_GTS_Understood, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _01C8 - GoToIfEq VAR_0x8008, 1, _01D3 - GoToIfEq VAR_0x8008, 2, _01DE - GoTo _01DE + GoToIfEq VAR_0x8008, 0, GlobalTerminal1F_ExplainOfferPokemon + GoToIfEq VAR_0x8008, 1, GlobalTerminal1F_ExplainSeekPokemon + GoToIfEq VAR_0x8008, 2, GlobalTerminal1F_AskMakeGlobalTrade + GoTo GlobalTerminal1F_AskMakeGlobalTrade End -_01C8: - Message pl_msg_00000046_00003 - GoTo _017D +GlobalTerminal1F_ExplainOfferPokemon: + Message GlobalTerminal1F_Text_ExplainOfferPokemon + GoTo GlobalTerminal1F_MoreInfoMenu End -_01D3: - Message pl_msg_00000046_00004 - GoTo _017D +GlobalTerminal1F_ExplainSeekPokemon: + Message GlobalTerminal1F_Text_ExplainSeekPokemon + GoTo GlobalTerminal1F_MoreInfoMenu End -_01DE: - Message pl_msg_00000046_00005 - GoTo GlobalTerminal1f_GTS_Clerk_Menu +GlobalTerminal1F_AskMakeGlobalTrade: + Message GlobalTerminal1F_Text_MakeGlobalTrade + GoTo GlobalTerminal1F_GTSMenu End -GlobalTerminal1f_CheckPartyCount: +GlobalTerminal1F_CheckCanTrade: CountPartyNonEggs VAR_RESULT - GoToIfLt VAR_RESULT, 2, GlobalTerminal1f_GTS_Exit_NotEnoughPokemon - GoTo GlobalTerminal1f_CheckFreePartySlot + GoToIfLt VAR_RESULT, 2, GlobalTerminal1F_MustHaveTwoPokemon + GoTo GlobalTerminal1F_CheckFreePartySlot End -GlobalTerminal1f_GTS_Exit_NotEnoughPokemon: - Message pl_msg_00000046_00009 +GlobalTerminal1F_MustHaveTwoPokemon: + Message GlobalTerminal1F_Text_MustHaveTwoPokemon WaitButton CloseMessage ReleaseAll End -GlobalTerminal1f_BeginTrade: +GlobalTerminal1F_BeginTrade: Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 - GoToIfEq VAR_RESULT, 0, GlobalTerminal1f_GTS_Clerk_EndTalk + GoToIfEq VAR_RESULT, 0, GlobalTerminal1F_ReceptionistGTSEnd HealParty SetVar VAR_UNK_0x40D5, 6 - Message pl_msg_00000046_00007 + Message GlobalTerminal1F_Text_EnjoyVisitToGTS CloseMessage - ApplyMovement LOCALID_PLAYER, _0344 + ApplyMovement LOCALID_PLAYER, GlobalTerminal1F_Movement_PlayerWalkToGate WaitMovement LoadDoorAnimation 0, 0, 8, 4, ANIMATION_TAG_DOOR_1 - Call _00C5 - ApplyMovement LOCALID_PLAYER, _0358 + Call GlobalTerminal1F_PlayDoorOpenAnimation + ApplyMovement LOCALID_PLAYER, GlobalTerminal1F_Movement_PlayerWalkToDoor WaitMovement - Call _00CD + Call GlobalTerminal1F_PlayDoorCloseAnimation LoadDoorAnimation 0, 0, 8, 2, ANIMATION_TAG_DOOR_1 - Call _00C5 - ApplyMovement LOCALID_PLAYER, _0350 + Call GlobalTerminal1F_PlayDoorOpenAnimation + ApplyMovement LOCALID_PLAYER, GlobalTerminal1F_Movement_PlayerEnterGTSRoom WaitMovement HideObject LOCALID_PLAYER - ApplyMovement LOCALID_PLAYER, _0360 + ApplyMovement LOCALID_PLAYER, GlobalTerminal1F_Movement_PlayerFaceSouth WaitMovement - Call _00CD + Call GlobalTerminal1F_PlayDoorCloseAnimation FadeScreenOut WaitFadeScreen ScrCmd_2B2 ScrCmd_0B3 VAR_RESULT SetVar VAR_0x8004, VAR_RESULT TryStartGTSApp VAR_0x8004, VAR_RESULT - GoToIfEq VAR_RESULT, 0, GlobalTerminal1f_GTS_Exit + GoToIfEq VAR_RESULT, 0, GlobalTerminal1F_ExitAndEnd ReturnToField FadeScreenIn WaitFadeScreen - Call GlobalTerminal1f_GTS_WalkOut + Call GlobalTerminal1F_ExitGTSRoom ReleaseAll End -GlobalTerminal1f_GTS_Exit: +GlobalTerminal1F_ExitAndEnd: ReturnToField FadeScreenIn WaitFadeScreen - Call GlobalTerminal1f_GTS_WalkOut - GoTo GlobalTerminal1f_GTS_Clerk_EndTalk + Call GlobalTerminal1F_ExitGTSRoom + GoTo GlobalTerminal1F_ReceptionistGTSEnd End -GlobalTerminal1f_GTS_Clerk_EndTalk: +GlobalTerminal1F_ReceptionistGTSEnd: SetVar VAR_UNK_0x40D5, 0 - Message pl_msg_00000046_00006 + Message GlobalTerminal1F_Text_PleaseVisitAgain WaitButton CloseMessage ReleaseAll End -GlobalTerminal1f_GTS_Clerk_ShortIntro: - Message pl_msg_00000046_00001 - GoTo GlobalTerminal1f_GTS_Clerk_Menu +GlobalTerminal1F_AskDoGlobalTrade: + Message GlobalTerminal1F_Text_DoGlobalTrade + GoTo GlobalTerminal1F_GTSMenu End -GlobalTerminal1f_CheckFreePartySlot: +GlobalTerminal1F_CheckFreePartySlot: GetPartyCount VAR_RESULT - GoToIfEq VAR_RESULT, 6, GlobalTerminal1f_CheckFreeBoxSlot - GoTo GlobalTerminal1f_BeginTrade + GoToIfEq VAR_RESULT, MAX_PARTY_SIZE, GlobalTerminal1F_CheckFreeBoxSlot + GoTo GlobalTerminal1F_BeginTrade End -GlobalTerminal1f_CheckFreeBoxSlot: +GlobalTerminal1F_CheckFreeBoxSlot: GetPCBoxesFreeSlotCount VAR_RESULT - GoToIfEq VAR_RESULT, 0, GlobalTerminal1f_GTS_Exit_NoSpace - GoTo GlobalTerminal1f_BeginTrade + GoToIfEq VAR_RESULT, 0, GlobalTerminal1F_BoxesAreFull + GoTo GlobalTerminal1F_BeginTrade End -GlobalTerminal1f_GTS_Exit_NoSpace: - Message pl_msg_00000046_00008 +GlobalTerminal1F_BoxesAreFull: + Message GlobalTerminal1F_Text_BoxesAreFull WaitButton CloseMessage ReleaseAll End .balign 4, 0 -_0344: +GlobalTerminal1F_Movement_PlayerWalkToGate: WalkNormalEast WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0350: +GlobalTerminal1F_Movement_PlayerEnterGTSRoom: WalkNormalNorth EndMovement .balign 4, 0 -_0358: +GlobalTerminal1F_Movement_PlayerWalkToDoor: WalkNormalNorth 2 EndMovement .balign 4, 0 -_0360: +GlobalTerminal1F_Movement_PlayerFaceSouth: FaceSouth EndMovement -GlobalTerminal1f_GTS_Exit_BadEgg: +GlobalTerminal1F_HasBadEgg: CallCommonScript 0x2338 @ CommonScript_HasBadEgg; outputs pl_msg_00000221_00127 WaitButton CloseMessage ReleaseAll End -_0374: - NPCMessage pl_msg_00000046_00010 +GlobalTerminal1F_Collector: + NPCMessage GlobalTerminal1F_Text_BigGlobeEh End -_0387: - NPCMessage pl_msg_00000046_00011 +GlobalTerminal1F_BugCatcher: + NPCMessage GlobalTerminal1F_Text_LocationIsRecorded End -_039A: - NPCMessage pl_msg_00000046_00012 +GlobalTerminal1F_Guitarist: + NPCMessage GlobalTerminal1F_Text_LeavePokemonToTrade End -_03AD: - NPCMessage pl_msg_00000046_00013 +GlobalTerminal1F_ExpertM: + NPCMessage GlobalTerminal1F_Text_TradeAroundTheWorld End -_03C0: - NPCMessage pl_msg_00000046_00014 +GlobalTerminal1F_AceTrainerM: + NPCMessage GlobalTerminal1F_Text_RegisterWhereYouLive End -_03D3: - NPCMessage pl_msg_00000046_00015 +GlobalTerminal1F_Beauty1: + NPCMessage GlobalTerminal1F_Text_IsWFCEasyToUse End -_03E6: - NPCMessage pl_msg_00000046_00016 +GlobalTerminal1F_Picnicker: + NPCMessage GlobalTerminal1F_Text_IllDoIt End -_03F9: - NPCMessage pl_msg_00000046_00017 +GlobalTerminal1F_Youngster: + NPCMessage GlobalTerminal1F_Text_GTSHasThreeFloors End -_040C: +GlobalTerminal1F_BattleVideoRankingsMachine: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8005, 3 - GoTo _0420 + GoTo GlobalTerminal1F_BattleVideoRankingsMenu End -_0420: - Message pl_msg_00000046_00036 +GlobalTerminal1F_BattleVideoRankingsMenu: + Message GlobalTerminal1F_Text_ConnectForBattleVideoRankings InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm pl_msg_00000361_00038, 0 - AddMenuEntryImm pl_msg_00000361_00039, 1 - AddMenuEntryImm pl_msg_00000361_00040, 2 + AddMenuEntryImm GlobalTerminal1F_Text_Use, 0 + AddMenuEntryImm GlobalTerminal1F_Text_Info, 1 + AddMenuEntryImm GlobalTerminal1F_Text_Cancel, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _046A - GoToIfEq VAR_0x8008, 1, _048B - GoTo _0464 + GoToIfEq VAR_0x8008, 0, GlobalTerminal1F_UseBattleVideoRankingsMachine + GoToIfEq VAR_0x8008, 1, GlobalTerminal1F_ExplainBattleVideoRankings + GoTo GlobalTerminal1F_BattleVideoRankingsMachineEnd End -_0464: +GlobalTerminal1F_BattleVideoRankingsMachineEnd: CloseMessage ReleaseAll End -_046A: +GlobalTerminal1F_UseBattleVideoRankingsMachine: Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 - GoToIfEq VAR_RESULT, 0, _0464 + GoToIfEq VAR_RESULT, 0, GlobalTerminal1F_BattleVideoRankingsMachineEnd CloseMessage CallCommonScript 0x802 ReleaseAll End -_048B: - Message pl_msg_00000046_00037 - GoTo _0420 +GlobalTerminal1F_ExplainBattleVideoRankings: + Message GlobalTerminal1F_Text_ExplainBattleVideoRankings + GoTo GlobalTerminal1F_BattleVideoRankingsMenu End -_0496: +GlobalTerminal1F_TrainerRankingsMachine: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8005, 4 - GoTo _04AA + GoTo GlobalTerminal1F_TrainerRankingsMenu End -_04AA: - Message pl_msg_00000046_00034 +GlobalTerminal1F_TrainerRankingsMenu: + Message GlobalTerminal1F_Text_ConnectForTrainerRankings InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm pl_msg_00000361_00038, 0 - AddMenuEntryImm pl_msg_00000361_00039, 1 - AddMenuEntryImm pl_msg_00000361_00040, 2 + AddMenuEntryImm GlobalTerminal1F_Text_Use, 0 + AddMenuEntryImm GlobalTerminal1F_Text_Info, 1 + AddMenuEntryImm GlobalTerminal1F_Text_Cancel, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _04F4 - GoToIfEq VAR_0x8008, 1, _0515 - GoTo _04EE + GoToIfEq VAR_0x8008, 0, GlobalTerminal1F_UseTrainerRankingsMachine + GoToIfEq VAR_0x8008, 1, GlobalTerminal1F_ExplainTrainerRankings + GoTo GlobalTerminal1F_TrainerRankingsMachineEnd End -_04EE: +GlobalTerminal1F_TrainerRankingsMachineEnd: CloseMessage ReleaseAll End -_04F4: +GlobalTerminal1F_UseTrainerRankingsMachine: Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 - GoToIfEq VAR_RESULT, 0, _04EE + GoToIfEq VAR_RESULT, 0, GlobalTerminal1F_TrainerRankingsMachineEnd CloseMessage CallCommonScript 0x802 ReleaseAll End -_0515: - Message pl_msg_00000046_00035 - GoTo _04AA +GlobalTerminal1F_ExplainTrainerRankings: + Message GlobalTerminal1F_Text_ExplainTrainerRankings + GoTo GlobalTerminal1F_TrainerRankingsMenu End -_0520: - NPCMessage pl_msg_00000046_00032 +GlobalTerminal1F_RepectionistEntryNorth: + NPCMessage GlobalTerminal1F_Text_GiveMachinesATry End -_0533: - NPCMessage pl_msg_00000046_00033 +GlobalTerminal1F_RepectionistEntrySouth: + NPCMessage GlobalTerminal1F_Text_WelcomeToGlobalTerminal End -_0546: +GlobalTerminal1F_PokemonBreederF: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer CheckPartyHasBadEgg VAR_RESULT - GoToIfEq VAR_RESULT, 1, _05A0 + GoToIfEq VAR_RESULT, TRUE, GlobalTerminal1F_WantToKnowFavorites SetVar VAR_0x8000, 0 GetPartyMonSpecies VAR_0x8000, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _05CB + GoToIfEq VAR_RESULT, SPECIES_NONE, GlobalTerminal1F_AskFavoriteIsEgg BufferPartyMonSpecies 0, 0 - Message pl_msg_00000046_00018 + Message GlobalTerminal1F_Text_FavoriteIsPokemon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _05AB - GoToIfEq VAR_RESULT, MENU_NO, _05B8 + GoToIfEq VAR_RESULT, MENU_YES, GlobalTerminal1F_SetFavoriteMon + GoToIfEq VAR_RESULT, MENU_NO, GlobalTerminal1F_FavoriteReallyIsPokemon End -_05A0: - Message pl_msg_00000046_00023 - GoTo _05F9 +GlobalTerminal1F_WantToKnowFavorites: + Message GlobalTerminal1F_Text_WantToKnowFavorites + GoTo GlobalTerminal1F_PokemonBreederFEnd End -_05AB: - ScrCmd_300 - Message pl_msg_00000046_00020 - GoTo _05F9 +GlobalTerminal1F_SetFavoriteMon: + SetFavoriteMon + Message GlobalTerminal1F_Text_IWasRight + GoTo GlobalTerminal1F_PokemonBreederFEnd End -_05B8: +GlobalTerminal1F_FavoriteReallyIsPokemon: BufferPartyMonSpecies 0, 0 - Message pl_msg_00000046_00021 - GoTo _05F9 + Message GlobalTerminal1F_Text_FavoriteReallyIsPokemon + GoTo GlobalTerminal1F_PokemonBreederFEnd End GlobalTerminal1F_Unused: - Message 18 -_05CB: - Message pl_msg_00000046_00019 + Message GlobalTerminal1F_Text_FavoriteIsPokemon +GlobalTerminal1F_AskFavoriteIsEgg: + Message GlobalTerminal1F_Text_FavoriteIsEgg ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _05AB - GoToIfEq VAR_RESULT, MENU_NO, _05EE + GoToIfEq VAR_RESULT, MENU_YES, GlobalTerminal1F_SetFavoriteMon + GoToIfEq VAR_RESULT, MENU_NO, GlobalTerminal1F_FavoriteReallyIsEgg End -_05EE: - Message pl_msg_00000046_00022 - GoTo _05F9 +GlobalTerminal1F_FavoriteReallyIsEgg: + Message GlobalTerminal1F_Text_FavoriteReallyIsEgg + GoTo GlobalTerminal1F_PokemonBreederFEnd End -_05F9: +GlobalTerminal1F_PokemonBreederFEnd: WaitButton CloseMessage ReleaseAll End -_0601: +GlobalTerminal1F_PokemonBreederM: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message pl_msg_00000046_00029 + Message GlobalTerminal1F_Text_TellMeYo ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _0647 + GoToIfEq VAR_RESULT, MENU_NO, GlobalTerminal1F_NothingToSay FadeScreenOut WaitFadeScreen CloseMessage ScrCmd_30E VAR_0x8004 - GoToIfEq VAR_0x8004, 0, _0647 - Message pl_msg_00000046_00030 + GoToIfEq VAR_0x8004, 0, GlobalTerminal1F_NothingToSay + Message GlobalTerminal1F_Text_IKnowAll WaitButton CloseMessage ReleaseAll End -_0647: - Message pl_msg_00000046_00031 +GlobalTerminal1F_NothingToSay: + Message GlobalTerminal1F_Text_NothingToSay WaitButton CloseMessage ReleaseAll End -_0652: +GlobalTerminal1F_Beauty2: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer CheckItem ITEM_FASHION_CASE, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0696 - GoToIfSet FLAG_UNK_0x0AC3, _06FD - GoToIfSet FLAG_UNK_0x00CF, _06F2 - Message pl_msg_00000046_00024 - SetVar VAR_0x8004, 1 - GoTo _06A1 + GoToIfEq VAR_RESULT, FALSE, GlobalTerminal1F_GiveSomethingIfFashionCase + GoToIfSet FLAG_RECEIVED_DAILY_GLOBAL_TERMINAL_1F_BACKDROP, GlobalTerminal1F_GoToFittingRoom + GoToIfSet FLAG_RECEIVED_ALL_GLOBAL_TERMINAL_1F_BACKDROPS, GlobalTerminal1F_ShareDressUpData + Message GlobalTerminal1F_Text_IHaveBackdropForYou + SetVar VAR_0x8004, BACKDROP_RANCH + GoTo GlobalTerminal1F_TryGiveBackDrop End -_0696: - Message pl_msg_00000046_00042 - GoTo _0708 +GlobalTerminal1F_GiveSomethingIfFashionCase: + Message GlobalTerminal1F_Text_GiveSomethingIfFashionCase + GoTo GlobalTerminal1F_Beauty2End End -_06A1: +GlobalTerminal1F_TryGiveBackDrop: CheckBackdrop VAR_0x8004, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _06D3 + GoToIfEq VAR_RESULT, FALSE, GlobalTerminal1F_GiveBackdrop AddVar VAR_0x8004, 1 - GoToIfLe VAR_0x8004, 13, _06A1 - SetFlag FLAG_UNK_0x00CF - GoTo _06F2 + GoToIfLe VAR_0x8004, BACKDROP_GINGERBREAD_ROOM, GlobalTerminal1F_TryGiveBackDrop + SetFlag FLAG_RECEIVED_ALL_GLOBAL_TERMINAL_1F_BACKDROPS + GoTo GlobalTerminal1F_ShareDressUpData End -_06D3: - SetVar VAR_0x8005, 1 +GlobalTerminal1F_GiveBackdrop: + SetVar VAR_0x8005, BACKDROP_RANCH Common_ObtainContestBackdrop - Message pl_msg_00000046_00028 - Call _0710 - SetFlag FLAG_UNK_0x0AC3 - GoTo _0708 + Message GlobalTerminal1F_Text_ObtainedBackdrop + Call GlobalTerminal1F_CheckReceivedAllBackdrops + SetFlag FLAG_RECEIVED_DAILY_GLOBAL_TERMINAL_1F_BACKDROP + GoTo GlobalTerminal1F_Beauty2End End -_06F2: - Message pl_msg_00000046_00027 - GoTo _0708 +GlobalTerminal1F_ShareDressUpData: + Message GlobalTerminal1F_Text_ShareDressUpData + GoTo GlobalTerminal1F_Beauty2End End -_06FD: - Message pl_msg_00000046_00026 - GoTo _0708 +GlobalTerminal1F_GoToFittingRoom: + Message GlobalTerminal1F_Text_GoToFittingRoom + GoTo GlobalTerminal1F_Beauty2End End -_0708: +GlobalTerminal1F_Beauty2End: WaitButton CloseMessage ReleaseAll End -_0710: - SetVar VAR_0x8004, 1 - GoTo _071E +GlobalTerminal1F_CheckReceivedAllBackdrops: + SetVar VAR_0x8004, BACKDROP_RANCH + GoTo GlobalTerminal1F_CheckReceivedBackdrop End -_071E: +GlobalTerminal1F_CheckReceivedBackdrop: CheckBackdrop VAR_0x8004, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _074A + GoToIfEq VAR_RESULT, FALSE, GlobalTerminal1F_DidntReceivAllBackdrops AddVar VAR_0x8004, 1 - GoToIfLe VAR_0x8004, 13, _071E - SetFlag FLAG_UNK_0x00CF + GoToIfLe VAR_0x8004, BACKDROP_GINGERBREAD_ROOM, GlobalTerminal1F_CheckReceivedBackdrop + SetFlag FLAG_RECEIVED_ALL_GLOBAL_TERMINAL_1F_BACKDROPS Return -_074A: +GlobalTerminal1F_DidntReceivAllBackdrops: Return -_074C: - EventMessage pl_msg_00000046_00041 +GlobalTerminal1F_Sign: + EventMessage GlobalTerminal1F_Text_PanelsLeadTo2F3F End .balign 4, 0 diff --git a/res/field/scripts/scripts_global_terminal_2f.s b/res/field/scripts/scripts_global_terminal_2f.s index 69d206b9b6..f3231597b9 100644 --- a/res/field/scripts/scripts_global_terminal_2f.s +++ b/res/field/scripts/scripts_global_terminal_2f.s @@ -2,147 +2,147 @@ #include "res/text/bank/global_terminal_2f.h" - ScriptEntry _0107 - ScriptEntry _003A - ScriptEntry _004D - ScriptEntry _0060 - ScriptEntry _0073 - ScriptEntry _0086 - ScriptEntry _0099 - ScriptEntry _00AC - ScriptEntry _00BF - ScriptEntry _00D2 - ScriptEntry _00E5 - ScriptEntry _00F6 - ScriptEntry _0109 - ScriptEntry _0193 + ScriptEntry GlobalTerminal2F_Unused1 + ScriptEntry GlobalTerminal2F_Artist + ScriptEntry GlobalTerminal2F_Hiker + ScriptEntry GlobalTerminal2F_BattleGirl + ScriptEntry GlobalTerminal2F_Idol + ScriptEntry GlobalTerminal2F_ExpertF + ScriptEntry GlobalTerminal2F_PokefanF + ScriptEntry GlobalTerminal2F_Beauty + ScriptEntry GlobalTerminal2F_Lass + ScriptEntry GlobalTerminal2F_Twin + ScriptEntry GlobalTerminal2F_SignWarp1F + ScriptEntry GlobalTerminal2F_SignWarp3F + ScriptEntry GlobalTerminal2F_BoxDataMachine + ScriptEntry GlobalTerminal2F_DressUpDataMachine ScriptEntryEnd -_003A: - NPCMessage 0 +GlobalTerminal2F_Artist: + NPCMessage GlobalTerminal2F_Text_ThisIsDiscriminatory End -_004D: - NPCMessage 1 +GlobalTerminal2F_Hiker: + NPCMessage GlobalTerminal2F_Text_SneakingAPeek End -_0060: - NPCMessage 2 +GlobalTerminal2F_BattleGirl: + NPCMessage GlobalTerminal2F_Text_DidYouKnow End -_0073: - NPCMessage 3 +GlobalTerminal2F_Idol: + NPCMessage GlobalTerminal2F_Text_IVisitEveryDay End -_0086: - NPCMessage 4 +GlobalTerminal2F_ExpertF: + NPCMessage GlobalTerminal2F_Text_ThisIsAlmostScandalous End -_0099: - NPCMessage 5 +GlobalTerminal2F_PokefanF: + NPCMessage GlobalTerminal2F_Text_CombinationWasWonderful End -_00AC: - NPCMessage 6 +GlobalTerminal2F_Beauty: + NPCMessage GlobalTerminal2F_Text_DifferentImpressions End -_00BF: - NPCMessage 7 +GlobalTerminal2F_Lass: + NPCMessage GlobalTerminal2F_Text_BackdropFromNiceLady End -_00D2: - NPCMessage 8 +GlobalTerminal2F_Twin: + NPCMessage GlobalTerminal2F_Text_ILikeSneakingGlances End -_00E5: - EventMessage 9 +GlobalTerminal2F_SignWarp1F: + EventMessage GlobalTerminal2F_Text_WarpsTo1F End -_00F6: - EventMessage 10 +GlobalTerminal2F_SignWarp3F: + EventMessage GlobalTerminal2F_Text_WarpsTo3F End -_0107: +GlobalTerminal2F_Unused1: End -_0109: +GlobalTerminal2F_BoxDataMachine: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8005, 6 - GoTo _011D + GoTo GlobalTerminal2F_BoxDataMenu End -_011D: - Message 13 +GlobalTerminal2F_BoxDataMenu: + Message GlobalTerminal2F_Text_ConnectForBoxData InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 15, 0 - AddMenuEntryImm 16, 1 - AddMenuEntryImm 17, 2 + AddMenuEntryImm GlobalTerminal2F_Text_Use, 0 + AddMenuEntryImm GlobalTerminal2F_Text_Info, 1 + AddMenuEntryImm GlobalTerminal2F_Text_Cancel, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0167 - GoToIfEq VAR_0x8008, 1, _0188 - GoTo _0161 + GoToIfEq VAR_0x8008, 0, GlobalTerminal2F_UseBoxDataMachine + GoToIfEq VAR_0x8008, 1, GlobalTerminal2F_ExplainBoxData + GoTo GlobalTerminal2F_BoxDataMachineEnd End -_0161: +GlobalTerminal2F_BoxDataMachineEnd: CloseMessage ReleaseAll End -_0167: +GlobalTerminal2F_UseBoxDataMachine: Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 - GoToIfEq VAR_RESULT, 0, _0161 + GoToIfEq VAR_RESULT, 0, GlobalTerminal2F_BoxDataMachineEnd CloseMessage CallCommonScript 0x802 ReleaseAll End -_0188: - Message 14 - GoTo _011D +GlobalTerminal2F_ExplainBoxData: + Message GlobalTerminal2F_Text_ExplainBoxData + GoTo GlobalTerminal2F_BoxDataMenu End -_0193: +GlobalTerminal2F_DressUpDataMachine: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8005, 5 - GoTo _01A7 + GoTo GlobalTerminal2F_DressUpDataMenu End -_01A7: - Message 11 +GlobalTerminal2F_DressUpDataMenu: + Message GlobalTerminal2F_Text_ConnectForDressUpData InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 15, 0 - AddMenuEntryImm 16, 1 - AddMenuEntryImm 17, 2 + AddMenuEntryImm GlobalTerminal2F_Text_Use, 0 + AddMenuEntryImm GlobalTerminal2F_Text_Info, 1 + AddMenuEntryImm GlobalTerminal2F_Text_Cancel, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _01F1 - GoToIfEq VAR_0x8008, 1, _0212 - GoTo _01EB + GoToIfEq VAR_0x8008, 0, GlobalTerminal2F_UseDressUpDataMachine + GoToIfEq VAR_0x8008, 1, GlobalTerminal2F_ExplainDressUpData + GoTo GlobalTerminal2F_DressUpDataMachineEnd End -_01EB: +GlobalTerminal2F_DressUpDataMachineEnd: CloseMessage ReleaseAll End -_01F1: +GlobalTerminal2F_UseDressUpDataMachine: Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 - GoToIfEq VAR_RESULT, 0, _01EB + GoToIfEq VAR_RESULT, 0, GlobalTerminal2F_DressUpDataMachineEnd CloseMessage CallCommonScript 0x802 ReleaseAll End -_0212: - Message 12 - GoTo _01A7 +GlobalTerminal2F_ExplainDressUpData: + Message GlobalTerminal2F_Text_ExplainDressUpData + GoTo GlobalTerminal2F_DressUpDataMenu End .balign 4, 0 diff --git a/res/field/scripts/scripts_global_terminal_3f.s b/res/field/scripts/scripts_global_terminal_3f.s index 4870328239..7f4031cf66 100644 --- a/res/field/scripts/scripts_global_terminal_3f.s +++ b/res/field/scripts/scripts_global_terminal_3f.s @@ -2,106 +2,106 @@ #include "res/text/bank/global_terminal_3f.h" - ScriptEntry _0103 - ScriptEntry _0036 - ScriptEntry _0049 - ScriptEntry _005C - ScriptEntry _006F - ScriptEntry _0082 - ScriptEntry _0095 - ScriptEntry _00A8 - ScriptEntry _00BB - ScriptEntry _00CE - ScriptEntry _00E1 - ScriptEntry _00F2 - ScriptEntry _0105 + ScriptEntry GlobalTerminal3F_Unused1 + ScriptEntry GlobalTerminal3F_Youngster + ScriptEntry GlobalTerminal3F_SchoolKidF + ScriptEntry GlobalTerminal3F_AceTrainerM + ScriptEntry GlobalTerminal3F_PokefanM + ScriptEntry GlobalTerminal3F_Camper + ScriptEntry GlobalTerminal3F_Gentleman + ScriptEntry GlobalTerminal3F_Clown + ScriptEntry GlobalTerminal3F_Guitarist + ScriptEntry GlobalTerminal3F_Hiker + ScriptEntry GlobalTerminal3F_SignWarp1F + ScriptEntry GlobalTerminal3F_SignWarp2F + ScriptEntry GlobalTerminal3F_BattleVideosMachine ScriptEntryEnd -_0036: - NPCMessage 0 +GlobalTerminal3F_Youngster: + NPCMessage GlobalTerminal3F_Text_SeePeopleLovePokemon End -_0049: - NPCMessage 1 +GlobalTerminal3F_SchoolKidF: + NPCMessage GlobalTerminal3F_Text_ThisIsAGreatIdea End -_005C: - NPCMessage 2 +GlobalTerminal3F_AceTrainerM: + NPCMessage GlobalTerminal3F_Text_ThisBattleVideoRocks End -_006F: - NPCMessage 3 +GlobalTerminal3F_PokefanM: + NPCMessage GlobalTerminal3F_Text_BattleVideosOfClefairy End -_0082: - NPCMessage 4 +GlobalTerminal3F_Camper: + NPCMessage GlobalTerminal3F_Text_WhatAnAmazingCollection End -_0095: - NPCMessage 5 +GlobalTerminal3F_Gentleman: + NPCMessage GlobalTerminal3F_Text_TreatToBattleVideos End -_00A8: - NPCMessage 6 +GlobalTerminal3F_Clown: + NPCMessage GlobalTerminal3F_Text_MyFavoriteBattleVideo End -_00BB: - NPCMessage 7 +GlobalTerminal3F_Guitarist: + NPCMessage GlobalTerminal3F_Text_AlphabetRapJubilife End -_00CE: - NPCMessage 8 +GlobalTerminal3F_Hiker: + NPCMessage GlobalTerminal3F_Text_Hiker2FIsBrother End -_00E1: - EventMessage 9 +GlobalTerminal3F_SignWarp1F: + EventMessage GlobalTerminal3F_Text_WarpsTo1F End -_00F2: - EventMessage 10 +GlobalTerminal3F_SignWarp2F: + EventMessage GlobalTerminal3F_Text_WarpsTo2F End -_0103: +GlobalTerminal3F_Unused1: End -_0105: +GlobalTerminal3F_BattleVideosMachine: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8005, 2 - GoTo _0119 + GoTo GlobalTerminal3F_BattleVideosMenu End -_0119: - Message 11 +GlobalTerminal3F_BattleVideosMenu: + Message GlobalTerminal3F_Text_ConnectForBattleVideos InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 13, 0 - AddMenuEntryImm 14, 1 - AddMenuEntryImm 15, 2 + AddMenuEntryImm GlobalTerminal3F_Text_Use, 0 + AddMenuEntryImm GlobalTerminal3F_Text_Info, 1 + AddMenuEntryImm GlobalTerminal3F_Text_Cancel, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0163 - GoToIfEq VAR_0x8008, 1, _0184 - GoTo _015D + GoToIfEq VAR_0x8008, 0, GlobalTerminal3F_UseBattleVideosMachine + GoToIfEq VAR_0x8008, 1, GlobalTerminal3F_ExplainBattleVideos + GoTo GlobalTerminal3F_BattleVideosMachineEnd End -_015D: +GlobalTerminal3F_BattleVideosMachineEnd: CloseMessage ReleaseAll End -_0163: +GlobalTerminal3F_UseBattleVideosMachine: Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 - GoToIfEq VAR_RESULT, 0, _015D + GoToIfEq VAR_RESULT, 0, GlobalTerminal3F_BattleVideosMachineEnd CloseMessage CallCommonScript 0x802 ReleaseAll End -_0184: - Message 12 - GoTo _0119 +GlobalTerminal3F_ExplainBattleVideos: + Message GlobalTerminal3F_Text_ExplainBattleVideos + GoTo GlobalTerminal3F_BattleVideosMenu End .balign 4, 0 diff --git a/res/text/global_terminal_1f.json b/res/text/global_terminal_1f.json index 700fcd7088..ec87e12901 100644 --- a/res/text/global_terminal_1f.json +++ b/res/text/global_terminal_1f.json @@ -2,7 +2,7 @@ "key": 50234, "messages": [ { - "id": "pl_msg_00000046_00000", + "id": "GlobalTerminal1F_Text_ThisIsGTSDoGlobalTrade", "en_US": [ "Welcome! This is the Global Trade\n", "Station, or GTS for short.\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000046_00001", + "id": "GlobalTerminal1F_Text_DoGlobalTrade", "en_US": [ "Hello!\n", "Welcome to the GTS!\r", @@ -22,7 +22,7 @@ ] }, { - "id": "pl_msg_00000046_00002", + "id": "GlobalTerminal1F_Text_ExplainGTS", "en_US": [ "You may trade Pokémon one of two\n", "ways at the GTS.\r", @@ -33,7 +33,7 @@ ] }, { - "id": "pl_msg_00000046_00003", + "id": "GlobalTerminal1F_Text_ExplainOfferPokemon", "en_US": [ "You will be asked to put up the\n", "Pokémon you are offering to trade.\r", @@ -46,7 +46,7 @@ ] }, { - "id": "pl_msg_00000046_00004", + "id": "GlobalTerminal1F_Text_ExplainSeekPokemon", "en_US": [ "You may search among the Pokémon\n", "that are offered by other Trainers.\r", @@ -59,25 +59,25 @@ ] }, { - "id": "pl_msg_00000046_00005", + "id": "GlobalTerminal1F_Text_MakeGlobalTrade", "en_US": [ "Would you like to make a global\n", "Pokémon trade?" ] }, { - "id": "pl_msg_00000046_00006", + "id": "GlobalTerminal1F_Text_PleaseVisitAgain", "en_US": "Please do visit again." }, { - "id": "pl_msg_00000046_00007", + "id": "GlobalTerminal1F_Text_EnjoyVisitToGTS", "en_US": [ "I hope you enjoy your visit\n", "to the GTS!\r" ] }, { - "id": "pl_msg_00000046_00008", + "id": "GlobalTerminal1F_Text_BoxesAreFull", "en_US": [ "...Uh-oh!\r", "I’m sorry, but your team and all\n", @@ -87,7 +87,7 @@ ] }, { - "id": "pl_msg_00000046_00009", + "id": "GlobalTerminal1F_Text_MustHaveTwoPokemon", "en_US": [ "...Uh-oh!\n", "You only have one Pokémon with you.\r", @@ -98,7 +98,7 @@ ] }, { - "id": "pl_msg_00000046_00010", + "id": "GlobalTerminal1F_Text_BigGlobeEh", "en_US": [ "That’s a big globe, eh?\r", "Where do I live on it now?\n", @@ -106,7 +106,7 @@ ] }, { - "id": "pl_msg_00000046_00011", + "id": "GlobalTerminal1F_Text_LocationIsRecorded", "en_US": [ "They say if you communicate with\n", "someone, their location is\f", @@ -114,7 +114,7 @@ ] }, { - "id": "pl_msg_00000046_00012", + "id": "GlobalTerminal1F_Text_LeavePokemonToTrade", "en_US": [ "All I need to do is leave a Pokémon\n", "here to trade.\r", @@ -123,7 +123,7 @@ ] }, { - "id": "pl_msg_00000046_00013", + "id": "GlobalTerminal1F_Text_TradeAroundTheWorld", "en_US": [ "You can easily trade Pokémon with\n", "Pokémon fans around the world.\r", @@ -131,7 +131,7 @@ ] }, { - "id": "pl_msg_00000046_00014", + "id": "GlobalTerminal1F_Text_RegisterWhereYouLive", "en_US": [ "You can register where you live on\n", "this giant globe.\r", @@ -140,7 +140,7 @@ ] }, { - "id": "pl_msg_00000046_00015", + "id": "GlobalTerminal1F_Text_IsWFCEasyToUse", "en_US": [ "Is Nintendo WFC something even I\n", "can use easily?\r", @@ -149,7 +149,7 @@ ] }, { - "id": "pl_msg_00000046_00016", + "id": "GlobalTerminal1F_Text_IllDoIt", "en_US": [ "This week, I’ll do it!\r", "I really want to make the Top 8 of the\n", @@ -157,7 +157,7 @@ ] }, { - "id": "pl_msg_00000046_00017", + "id": "GlobalTerminal1F_Text_GTSHasThreeFloors", "en_US": [ "The Global Terminal has three floors.\r", "You use warp panels for getting from\n", @@ -171,46 +171,46 @@ ] }, { - "id": "pl_msg_00000046_00018", + "id": "GlobalTerminal1F_Text_FavoriteIsPokemon", "en_US": [ "Your favorite is {STRVAR_1 0, 0, 0},\n", "isn’t it?" ] }, { - "id": "pl_msg_00000046_00019", + "id": "GlobalTerminal1F_Text_FavoriteIsEgg", "en_US": "Your favorite is that Egg, isn’t it?" }, { - "id": "pl_msg_00000046_00020", + "id": "GlobalTerminal1F_Text_IWasRight", "en_US": [ "Yes, I was right!\n", "I thought so!" ] }, { - "id": "pl_msg_00000046_00021", + "id": "GlobalTerminal1F_Text_FavoriteReallyIsPokemon", "en_US": [ "...Oh? Your favorite really is\n", "{STRVAR_1 0, 0, 0}, isn’t it?" ] }, { - "id": "pl_msg_00000046_00022", + "id": "GlobalTerminal1F_Text_FavoriteReallyIsEgg", "en_US": [ "...Oh? Your favorite really is that Egg,\n", "isn’t it?" ] }, { - "id": "pl_msg_00000046_00023", + "id": "GlobalTerminal1F_Text_WantToKnowFavorites", "en_US": [ "I want to know everyone’s favorite\n", "kinds of Pokémon." ] }, { - "id": "pl_msg_00000046_00024", + "id": "GlobalTerminal1F_Text_IHaveBackdropForYou", "en_US": [ "Hi, have you visited the Dress-Up\n", "Data Studio?\r", @@ -221,11 +221,11 @@ ] }, { - "id": "pl_msg_00000046_00025", + "id": "GlobalTerminal1F_Text_Dummy25", "garbage": 28 }, { - "id": "pl_msg_00000046_00026", + "id": "GlobalTerminal1F_Text_GoToFittingRoom", "en_US": [ "If you want to use that Backdrop,\n", "please go to the fitting room on the\f", @@ -233,21 +233,21 @@ ] }, { - "id": "pl_msg_00000046_00027", + "id": "GlobalTerminal1F_Text_ShareDressUpData", "en_US": [ "Please share your dreamy Dress-Up\n", "Data with everyone!" ] }, { - "id": "pl_msg_00000046_00028", + "id": "GlobalTerminal1F_Text_ObtainedBackdrop", "en_US": [ "Obtained a Backdrop for use in\n", "Jubilife TV’s fitting room." ] }, { - "id": "pl_msg_00000046_00029", + "id": "GlobalTerminal1F_Text_TellMeYo", "en_US": [ "Yo, yo, yo!\r", "Wanna let the world know about you?\n", @@ -255,7 +255,7 @@ ] }, { - "id": "pl_msg_00000046_00030", + "id": "GlobalTerminal1F_Text_IKnowAll", "en_US": [ "Yo, I know all I need to know about\n", "you now.\r", @@ -264,7 +264,7 @@ ] }, { - "id": "pl_msg_00000046_00031", + "id": "GlobalTerminal1F_Text_NothingToSay", "en_US": [ "Yo! You don’t have anything you want\n", "to say?\r", @@ -273,7 +273,7 @@ ] }, { - "id": "pl_msg_00000046_00032", + "id": "GlobalTerminal1F_Text_GiveMachinesATry", "en_US": [ "There are several portal machines here\n", "at the Global Terminal.\r", @@ -284,7 +284,7 @@ ] }, { - "id": "pl_msg_00000046_00033", + "id": "GlobalTerminal1F_Text_WelcomeToGlobalTerminal", "en_US": [ "Welcome to the Global Terminal!\r", "Here, you may join the huge community\n", @@ -296,14 +296,14 @@ ] }, { - "id": "pl_msg_00000046_00034", + "id": "GlobalTerminal1F_Text_ConnectForTrainerRankings", "en_US": [ "Connect to Nintendo Wi-Fi Connection\n", "and examine the Trainer Rankings?" ] }, { - "id": "pl_msg_00000046_00035", + "id": "GlobalTerminal1F_Text_ExplainTrainerRankings", "en_US": [ "Trainer Rankings is a team-based\n", "ranking system for Trainers around\f", @@ -321,14 +321,14 @@ ] }, { - "id": "pl_msg_00000046_00036", + "id": "GlobalTerminal1F_Text_ConnectForBattleVideoRankings", "en_US": [ "Connect to Nintendo Wi-Fi Connection\n", "and examine the Battle Video Rankings?" ] }, { - "id": "pl_msg_00000046_00037", + "id": "GlobalTerminal1F_Text_ExplainBattleVideoRankings", "en_US": [ "Battle Video Rankings is a gallery of\n", "popular Battle Videos.\r", @@ -337,19 +337,19 @@ ] }, { - "id": "pl_msg_00000046_00038", + "id": "GlobalTerminal1F_Text_Use", "en_US": "USE" }, { - "id": "pl_msg_00000046_00039", + "id": "GlobalTerminal1F_Text_Info", "en_US": "INFO" }, { - "id": "pl_msg_00000046_00040", + "id": "GlobalTerminal1F_Text_Cancel", "en_US": "CANCEL" }, { - "id": "pl_msg_00000046_00041", + "id": "GlobalTerminal1F_Text_PanelsLeadTo2F3F", "en_US": [ "The green panel leads to the studios\n", "for Box Data and Dress-Up Data on 2F.\r", @@ -358,7 +358,7 @@ ] }, { - "id": "pl_msg_00000046_00042", + "id": "GlobalTerminal1F_Text_GiveSomethingIfFashionCase", "en_US": [ "Hi, have you visited the Dress-Up\n", "Data Studio?\r", diff --git a/res/text/global_terminal_2f.json b/res/text/global_terminal_2f.json index fa1f32f9e0..75de140360 100644 --- a/res/text/global_terminal_2f.json +++ b/res/text/global_terminal_2f.json @@ -2,7 +2,7 @@ "key": 50230, "messages": [ { - "id": "pl_msg_00000047_00000", + "id": "GlobalTerminal2F_Text_ThisIsDiscriminatory", "en_US": [ "This is discriminatory!\n", "Why are there only shots of Pokémon?\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000047_00001", + "id": "GlobalTerminal2F_Text_SneakingAPeek", "en_US": [ "Sneaking a peek at other people’s PC\n", "Boxes fills me with guilty glee.\r", @@ -22,7 +22,7 @@ ] }, { - "id": "pl_msg_00000047_00002", + "id": "GlobalTerminal2F_Text_DidYouKnow", "en_US": [ "Did you know?\n", "About my PC Box, I mean.\r", @@ -35,7 +35,7 @@ ] }, { - "id": "pl_msg_00000047_00003", + "id": "GlobalTerminal2F_Text_IVisitEveryDay", "en_US": [ "I visit every day to check on other\n", "people’s Dress-Up Data.\r", @@ -44,14 +44,14 @@ ] }, { - "id": "pl_msg_00000047_00004", + "id": "GlobalTerminal2F_Text_ThisIsAlmostScandalous", "en_US": [ "Oh, dear me! Gracious!\n", "This is almost scandalous!" ] }, { - "id": "pl_msg_00000047_00005", + "id": "GlobalTerminal2F_Text_CombinationWasWonderful", "en_US": [ "The combination of that Pokémon with\n", "those Accessories...\r", @@ -60,7 +60,7 @@ ] }, { - "id": "pl_msg_00000047_00006", + "id": "GlobalTerminal2F_Text_DifferentImpressions", "en_US": [ "The same kind of Accessory can create\n", "entirely different impressions.\r", @@ -69,14 +69,14 @@ ] }, { - "id": "pl_msg_00000047_00007", + "id": "GlobalTerminal2F_Text_BackdropFromNiceLady", "en_US": [ "I got a Backdrop from a nice lady\n", "downstairs. For free!" ] }, { - "id": "pl_msg_00000047_00008", + "id": "GlobalTerminal2F_Text_ILikeSneakingGlances", "en_US": [ "What I like to do...\r", "I like sneaking glances at the people\n", @@ -84,25 +84,25 @@ ] }, { - "id": "pl_msg_00000047_00009", + "id": "GlobalTerminal2F_Text_WarpsTo1F", "en_US": [ "Warps to the GTS and the Trainer\n", "Rankings on 1F." ] }, { - "id": "pl_msg_00000047_00010", + "id": "GlobalTerminal2F_Text_WarpsTo3F", "en_US": "Warps to the Battle Video Gallery on 3F." }, { - "id": "pl_msg_00000047_00011", + "id": "GlobalTerminal2F_Text_ConnectForDressUpData", "en_US": [ "Connect to Nintendo Wi-Fi Connection\n", "to view and post Dress-Up Data?" ] }, { - "id": "pl_msg_00000047_00012", + "id": "GlobalTerminal2F_Text_ExplainDressUpData", "en_US": [ "Here, you may post the Dress-Up Data\n", "of your Pokémon.\r", @@ -115,14 +115,14 @@ ] }, { - "id": "pl_msg_00000047_00013", + "id": "GlobalTerminal2F_Text_ConnectForBoxData", "en_US": [ "Connect to Nintendo Wi-Fi Connection\n", "to view and post Box Data?" ] }, { - "id": "pl_msg_00000047_00014", + "id": "GlobalTerminal2F_Text_ExplainBoxData", "en_US": [ "Here, you may post the Box Data\n", "containing your Pokémon.\r", @@ -135,15 +135,15 @@ ] }, { - "id": "pl_msg_00000047_00015", + "id": "GlobalTerminal2F_Text_Use", "en_US": "USE" }, { - "id": "pl_msg_00000047_00016", + "id": "GlobalTerminal2F_Text_Info", "en_US": "INFO" }, { - "id": "pl_msg_00000047_00017", + "id": "GlobalTerminal2F_Text_Cancel", "en_US": "CANCEL" } ] diff --git a/res/text/global_terminal_3f.json b/res/text/global_terminal_3f.json index d49a16249b..d6bcf56386 100644 --- a/res/text/global_terminal_3f.json +++ b/res/text/global_terminal_3f.json @@ -2,7 +2,7 @@ "key": 50226, "messages": [ { - "id": "pl_msg_00000048_00000", + "id": "GlobalTerminal3F_Text_SeePeopleLovePokemon", "en_US": [ "What you see here is how much people\n", "around the world love Pokémon.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000048_00001", + "id": "GlobalTerminal3F_Text_ThisIsAGreatIdea", "en_US": [ "This is a great idea.\n", "Everyone and anyone can participate.\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000048_00002", + "id": "GlobalTerminal3F_Text_ThisBattleVideoRocks", "en_US": [ "This Battle Video rocks hard!\r", "It’s an incredible turnaround from the\n", @@ -28,14 +28,14 @@ ] }, { - "id": "pl_msg_00000048_00003", + "id": "GlobalTerminal3F_Text_BattleVideosOfClefairy", "en_US": [ "I have Battle Videos of only cute little\n", "CLEFAIRY as my favorites." ] }, { - "id": "pl_msg_00000048_00004", + "id": "GlobalTerminal3F_Text_WhatAnAmazingCollection", "en_US": [ "What an amazing collection!\n", "I can see why this is so popular.\r", @@ -44,7 +44,7 @@ ] }, { - "id": "pl_msg_00000048_00005", + "id": "GlobalTerminal3F_Text_TreatToBattleVideos", "en_US": [ "To treat one’s self to Battle Videos\n", "every day...\r", @@ -53,7 +53,7 @@ ] }, { - "id": "pl_msg_00000048_00006", + "id": "GlobalTerminal3F_Text_MyFavoriteBattleVideo", "en_US": [ "My favorite Battle Video.\n", "My favorite Battle Video.\r", @@ -64,7 +64,7 @@ ] }, { - "id": "pl_msg_00000048_00007", + "id": "GlobalTerminal3F_Text_AlphabetRapJubilife", "en_US": [ "Let me attempt the alphabet rap using\n", "Jubilife, dig?\r", @@ -81,35 +81,35 @@ ] }, { - "id": "pl_msg_00000048_00008", + "id": "GlobalTerminal3F_Text_Hiker2FIsBrother", "en_US": [ "The Hiker enjoying the Box Data down\n", "on 2F is my little brother." ] }, { - "id": "pl_msg_00000048_00009", + "id": "GlobalTerminal3F_Text_WarpsTo1F", "en_US": [ "Warps to the GTS and the Trainer\n", "Rankings on 1F." ] }, { - "id": "pl_msg_00000048_00010", + "id": "GlobalTerminal3F_Text_WarpsTo2F", "en_US": [ "Warps to the studios for Box Data and\n", "Dress-Up Data on 2F." ] }, { - "id": "pl_msg_00000048_00011", + "id": "GlobalTerminal3F_Text_ConnectForBattleVideos", "en_US": [ "Connect to Nintendo Wi-Fi Connection\n", "to view and post Battle Videos?" ] }, { - "id": "pl_msg_00000048_00012", + "id": "GlobalTerminal3F_Text_ExplainBattleVideos", "en_US": [ "Here, you may post a Battle Video of\n", "your Pokémon.\r", @@ -124,15 +124,15 @@ ] }, { - "id": "pl_msg_00000048_00013", + "id": "GlobalTerminal3F_Text_Use", "en_US": "USE" }, { - "id": "pl_msg_00000048_00014", + "id": "GlobalTerminal3F_Text_Info", "en_US": "INFO" }, { - "id": "pl_msg_00000048_00015", + "id": "GlobalTerminal3F_Text_Cancel", "en_US": "CANCEL" } ] diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index 4bc188ef10..b8f938f212 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -538,27 +538,27 @@ "en_US": "NO THANKS" }, { - "id": "pl_msg_00000361_00128", + "id": "MenuEntries_Text_GTS_Info", "en_US": "INFO" }, { - "id": "pl_msg_00000361_00129", + "id": "MenuEntries_Text_GTS_Trade", "en_US": "TRADE" }, { - "id": "pl_msg_00000361_00130", + "id": "MenuEntries_Text_GTS_Exit", "en_US": "EXIT" }, { - "id": "pl_msg_00000361_00131", + "id": "MenuEntries_Text_GTS_OfferPokemon", "en_US": "OFFER POKéMON?" }, { - "id": "pl_msg_00000361_00132", + "id": "MenuEntries_Text_GTS_SeekPokemon", "en_US": "SEEK POKéMON?" }, { - "id": "pl_msg_00000361_00133", + "id": "MenuEntries_Text_GTS_Understood", "en_US": "UNDERSTOOD!" }, { diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 26b4639171..ce9e840e22 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -695,37 +695,36 @@ static void CalcHiddenPowerTypeAndPower(Pokemon *mon, int *outPower, int *outTyp } } -BOOL ScrCmd_300(ScriptContext *param0) +BOOL ScrCmd_SetFavoriteMon(ScriptContext *ctx) { - MiscSaveBlock *v0; - Pokemon *v1; - FieldSystem *fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; - v1 = Party_GetPokemonBySlotIndex(SaveData_GetParty(fieldSystem->saveData), 0); - v0 = SaveData_MiscSaveBlock(fieldSystem->saveData); + Pokemon *mon = Party_GetPokemonBySlotIndex(SaveData_GetParty(fieldSystem->saveData), 0); + MiscSaveBlock *miscSave = SaveData_MiscSaveBlock(fieldSystem->saveData); - MiscSaveBlock_SetFavoriteMon(v0, Pokemon_GetValue(v1, MON_DATA_SPECIES, NULL), Pokemon_GetValue(v1, MON_DATA_FORM, NULL), Pokemon_GetValue(v1, MON_DATA_IS_EGG, NULL)); - return 0; + MiscSaveBlock_SetFavoriteMon(miscSave, + Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL), + Pokemon_GetValue(mon, MON_DATA_FORM, NULL), + Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL)); + return FALSE; } -BOOL ScrCmd_301(ScriptContext *param0) +BOOL ScrCmd_GetFavoriteMon(ScriptContext *ctx) { - int v0, v1, v2; - MiscSaveBlock *v3; - Pokemon *v4; - FieldSystem *fieldSystem = param0->fieldSystem; - u16 *v6 = ScriptContext_GetVarPointer(param0); - u16 *v7 = ScriptContext_GetVarPointer(param0); - u16 *v8 = ScriptContext_GetVarPointer(param0); + int species, form, isEgg; + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *destVarSpecies = ScriptContext_GetVarPointer(ctx); + u16 *destVarForm = ScriptContext_GetVarPointer(ctx); + u16 *destVarIsEgg = ScriptContext_GetVarPointer(ctx); - v3 = SaveData_MiscSaveBlock(fieldSystem->saveData); - MiscSaveBlock_FavoriteMon(v3, &v0, &v1, &v2); + MiscSaveBlock *miscSave = SaveData_MiscSaveBlock(fieldSystem->saveData); + MiscSaveBlock_GetFavoriteMon(miscSave, &species, &form, &isEgg); - *v6 = v0; - *v7 = v1; - *v8 = v2; + *destVarSpecies = species; + *destVarForm = form; + *destVarIsEgg = isEgg; - return 0; + return FALSE; } BOOL ScrCmd_GetPartyMonForm2(ScriptContext *ctx) diff --git a/src/savedata_misc.c b/src/savedata_misc.c index 36e0e4d307..66b98dc195 100644 --- a/src/savedata_misc.c +++ b/src/savedata_misc.c @@ -98,7 +98,7 @@ void MiscSaveBlock_SetFavoriteMon(MiscSaveBlock *miscSave, int species, int form miscSave->favoriteMonIsEgg = isEgg; } -void MiscSaveBlock_FavoriteMon(const MiscSaveBlock *miscSave, int *species, int *form, int *isEgg) +void MiscSaveBlock_GetFavoriteMon(const MiscSaveBlock *miscSave, int *species, int *form, int *isEgg) { *species = miscSave->favoriteMon; *form = miscSave->favoriteMonForm; diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c index fdd3c537ad..ad24832a9c 100644 --- a/src/unk_02030A80.c +++ b/src/unk_02030A80.c @@ -51,7 +51,7 @@ void sub_02030AA0(UnkStruct_02030A80 *param0, SaveData *saveData) OS_GetOwnerInfo(&ownerInfo); - MiscSaveBlock_FavoriteMon(miscSaveBlock, &species, &form, &isEgg); + MiscSaveBlock_GetFavoriteMon(miscSaveBlock, &species, &form, &isEgg); MI_CpuClear8(param0, sizeof(UnkStruct_02030A80)); CharCode_Copy(param0->unk_00, TrainerInfo_Name(v0));