diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 1c6f5478cf..ed2d907dcf 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -33,9 +33,11 @@ #include "generated/time_of_day.h" #include "generated/trainer_score_events.h" #include "generated/trainers.h" -#include "constants/battle/battle_script.h" +#include "generated/villa_furniture_type.h" #include "constants/animation_tags.h" +#include "constants/battle.h" #include "constants/battle_tower.h" +#include "constants/battle/battle_script.h" #include "constants/boat_cutscene.h" #include "constants/colors.h" #include "constants/elevator_dirs.h" @@ -45,8 +47,8 @@ #include "constants/init_script_types.h" #include "constants/items.h" #include "constants/map_object.h" -#include "constants/overworld_weather.h" #include "constants/moves.h" +#include "constants/overworld_weather.h" #include "constants/pokemon.h" #include "constants/regi_ruins.h" #include "constants/roamer_states.h" @@ -54,7 +56,7 @@ #include "constants/scrcmd.h" #include "constants/sound_volume.h" #include "constants/tv_broadcast.h" -#include "constants/battle.h" +#include "constants/villa_visitors.h" #include "data/scripts/scrcmd.h" #include "macros/movement.inc" @@ -4533,8 +4535,8 @@ .short \arg0 .endm - .macro SetScene22 - .short SCRCMD_SETSCENE22 + .macro SetScenePlayBGMMusicBox + .short SCRCMD_SETSCENEPLAYBGMMUSICBOX .endm .macro SetFieldScene bgmID @@ -4551,9 +4553,9 @@ .short SCRCMD_2FB .endm - .macro ScrCmd_2FC arg0 - .short SCRCMD_2FC - .short \arg0 + .macro CheckABPress destVar + .short SCRCMD_CHECKABPRESS + .short \destVar .endm .macro BufferTypeName templateArg, type @@ -4644,13 +4646,13 @@ .short SCRCMD_30B .endm - .macro ScrCmd_30C - .short SCRCMD_30C + .macro SaveTVSegmentHomeAndManorNoFurniture + .short SCRCMD_SAVETVSEGMENTHOMEANDMANORNOFURNITURE .endm - .macro ScrCmd_30D arg0 - .short SCRCMD_30D - .short \arg0 + .macro SaveTVSegmentHomeAndManor furniture + .short SCRCMD_SAVETVSEGMENTHOMEANDMANOR + .short \furniture .endm .macro ScrCmd_30E arg0 @@ -4658,10 +4660,10 @@ .short \arg0 .endm - .macro ScrCmd_30F arg0, arg1 - .short SCRCMD_30F - .short \arg0 - .short \arg1 + .macro CheckMetFurnitureRequirements furniture, destVar + .short SCRCMD_CHECKMETFURNITUREREQUIREMENTS + .short \furniture + .short \destVar .endm .macro StartLibraryTV diff --git a/generated/game_records.txt b/generated/game_records.txt index 1646df81c5..a5283779f7 100644 --- a/generated/game_records.txt +++ b/generated/game_records.txt @@ -1,4 +1,4 @@ -RECORD_UNK_000 +RECORD_STEPS RECORD_TRAINER_SCORE RECORD_UNK_002 RECORD_UNK_003 @@ -58,10 +58,10 @@ RECORD_TIMES_STUCK_IN_DEEP_MUD RECORD_TIMES_BATTLED_AT_BATTLEGROUND RECORD_UNK_058 RECORD_UNK_059 -RECORD_UNK_060 -RECORD_UNK_061 +RECORD_BATTLE_FACTORY_VICTORIES +RECORD_BATTLE_CASTLE_VICTORIES RECORD_BATTLE_HALL_VICTORIES -RECORD_UNK_063 +RECORD_BATTLE_ARCADE_VICTORIES RECORD_UNK_064 RECORD_UNK_065 RECORD_UNK_066 diff --git a/generated/map_headers.txt b/generated/map_headers.txt index be7f8b6d34..8b77c9cd4b 100644 --- a/generated/map_headers.txt +++ b/generated/map_headers.txt @@ -456,7 +456,7 @@ MAP_HEADER_BATTLEGROUND MAP_HEADER_SURVIVAL_AREA_SOUTH_HOUSE MAP_HEADER_SURVIVAL_AREA_NORTH_HOUSE MAP_HEADER_RESORT_AREA -MAP_HEADER_RESORT_AREA_MART +MAP_HEADER_UNUSED_RESORT_AREA_MART MAP_HEADER_RESORT_AREA_POKECENTER_1F MAP_HEADER_RESORT_AREA_POKECENTER_2F MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_1F diff --git a/generated/text_banks.txt b/generated/text_banks.txt index ac5d9bc74f..f5412df16b 100644 --- a/generated/text_banks.txt +++ b/generated/text_banks.txt @@ -595,7 +595,7 @@ TEXT_BANK_BATTLEGROUND TEXT_BANK_SURVIVAL_AREA_SOUTH_HOUSE TEXT_BANK_SURVIVAL_AREA_NORTH_HOUSE TEXT_BANK_RESORT_AREA -TEXT_BANK_RESORT_AREA_MART +TEXT_BANK_UNUSED_RESORT_AREA_MART TEXT_BANK_RESORT_AREA_POKECENTER_1F TEXT_BANK_RESORT_AREA_RIBBON_SYNDICATE_1F TEXT_BANK_RESORT_AREA_RIBBON_SYNDICATE_2F diff --git a/generated/trainer_score_events.txt b/generated/trainer_score_events.txt index 54db8ce038..c7537aa5a6 100644 --- a/generated/trainer_score_events.txt +++ b/generated/trainer_score_events.txt @@ -47,6 +47,6 @@ TRAINER_SCORE_EVENT_UNK_45 TRAINER_SCORE_EVENT_UNK_46 TRAINER_SCORE_EVENT_UNK_47 TRAINER_SCORE_EVENT_UNK_48 -TRAINER_SCORE_EVENT_UNK_49 +TRAINER_SCORE_EVENT_BOUGHT_ALL_VILLA_FURNITURE TRAINER_SCORE_EVENT_UNK_50 MAX_TRAINER_SCORE_EVENTS diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 05ecf4ac74..09d0f6c0e8 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -248,7 +248,7 @@ FLAG_ENABLED_POKEDEX_LANGUAGE_DETECTION FLAG_TALKED_TO_JULIA_SUNYSHORE_CITY_NORTHEAST_HOUSE FLAG_UNK_0x00F8 FLAG_TALKED_TO_DR_FOOTSTEP -FLAG_UNK_0x00FA +FLAG_JOINED_RIBBON_SYNDICATE FLAG_SKIP_POKEMON_MANSION_OFFICE_BOOK_SEEN_MANAPHY_CHECK FLAG_UNDERGROUND_MAN_COULDNT_GIVE_REWARD FLAG_TALKED_TO_GRAND_LAKE_ROUTE_213_LOBBY_LOOKER @@ -600,7 +600,7 @@ FLAG_HIDE_SNOWPOINT_CITY_CYNTHIA FLAG_HIDE_POKEMON_MANSION_FIVE_MAID_KNOCKOUT_MAID FLAG_HIDE_POKEMON_MANSION_FIVE_MAID_KNOCKOUT_BOSS FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS -FLAG_UNK_0x025A +FLAG_HIDE_VILLA_SCHOOL_KID_M FLAG_HIDE_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE_SAILOR_ELDRITCH FLAG_HIDE_ROUTE_224_SHAYMIN FLAG_HIDE_VALOR_LAKEFRONT_BEAUTY @@ -676,26 +676,26 @@ FLAG_HIDE_BATTLEGROUND_TRAINER_1 FLAG_HIDE_BATTLEGROUND_TRAINER_2 FLAG_HIDE_BATTLEGROUND_TRAINER_3 FLAG_HIDE_BATTLEGROUND_TRAINER_4 -FLAG_UNK_0x02A6 -FLAG_UNK_0x02A7 -FLAG_UNK_0x02A8 -FLAG_UNK_0x02A9 -FLAG_UNK_0x02AA -FLAG_UNK_0x02AB -FLAG_UNK_0x02AC -FLAG_UNK_0x02AD -FLAG_UNK_0x02AE -FLAG_UNK_0x02AF -FLAG_UNK_0x02B0 -FLAG_UNK_0x02B1 -FLAG_UNK_0x02B2 -FLAG_UNK_0x02B3 -FLAG_UNK_0x02B4 -FLAG_UNK_0x02B5 -FLAG_UNK_0x02B6 -FLAG_UNK_0x02B7 -FLAG_UNK_0x02B8 -FLAG_UNK_0x02B9 +FLAG_HIDE_RESORT_AREA_SCHOOL_KID_M +FLAG_HIDE_VILLA_RIVAL +FLAG_HIDE_VILLA_COUNTERPART +FLAG_HIDE_VILLA_PROF_ROWAN +FLAG_HIDE_RESORT_AREA_PROF_ROWAN +FLAG_HIDE_VILLA_MOM +FLAG_HIDE_VILLA_ROARK +FLAG_HIDE_RESORT_AREA_ROARK +FLAG_HIDE_VILLA_GARDENIA +FLAG_HIDE_RESORT_AREA_GARDENIA +FLAG_HIDE_VILLA_FANTINA +FLAG_HIDE_VILLA_MAYLENE +FLAG_HIDE_RESORT_AREA_MAYLENE +FLAG_HIDE_VILLA_CRASHER_WAKE +FLAG_HIDE_VILLA_BYRON +FLAG_HIDE_RESORT_AREA_BYRON +FLAG_HIDE_VILLA_CANDICE +FLAG_HIDE_VILLA_VOLKNER +FLAG_HIDE_VILLA_CYNTHIA +FLAG_HIDE_VILLA_FLINT FLAG_HIDE_SPEAR_PILLAR_DISTORTED_MESPRIT FLAG_ROTOM_ROOM_HIDE_MICROWAVE_OVEN FLAG_ROTOM_ROOM_HIDE_WASHING_MACHINE @@ -707,9 +707,9 @@ FLAG_BATTLE_HALL_HIDE_REPORTER FLAG_HIDE_ROUTE_214_GATE_TO_VEILSTONE_CITY_REPORTER FLAG_UNK_0x02C3 FLAG_HIDE_SANDGEM_TOWN_PROF_ROWAN -FLAG_UNK_0x02C5 +FLAG_HIDE_VILLA_DELIVERY_GUY FLAG_HIDE_TEAM_GALACTIC_ETERNA_BUILDING_1F_WALL_BLOCKING_ROTOMS_ROOM -FLAG_UNK_0x02C7 +FLAG_HIDE_VILLA_BOOK FLAG_HIDE_OREBURGH_MINE_B1F_HIKER FLAG_HIDE_CANALAVE_LIBRARY_2F_HIKER FLAG_HIDE_ROUTE_224_MARLEY @@ -2725,7 +2725,7 @@ FLAG_RECEIVED_CELESTIC_TOWN_POKECENTER_1F_GREAT_BALL FLAG_ADDED_TROPHY_GARDEN_MON FLAG_RECEIVED_PASTORIA_CITY_SOUTHWEST_HOUSE_RANDOM_BERRY FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE -FLAG_UNK_0x0AA5 +FLAG_GOT_SPA_TREATMENT_RESORT_AREA_RIBBON_SYNDICATE_2F FLAG_UNK_0x0AA6 FLAG_VISIT_TOMORROW_SUNYSHORE_CITY_NORTHEAST_HOUSE FLAG_WON_AGAINST_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON @@ -4260,13 +4260,13 @@ VAR_FOLLOWER_MON_PARTY_ID VAR_STARK_MOUNTAIN_ROOM_3_STATE VAR_FOLLOWER_MON_PICKUP_ITEM_ID VAR_STARK_MOUNTAIN_OUTSIDE_STATE -VAR_UNK_0x40A1 +VAR_VILLA_STATE VAR_UNK_0x40A2 VAR_RIVAL_HOUSE_STATE VAR_PLAYER_HOUSE_STATE VAR_PLAYER_HOUSE_RIVAL_TRIGGER_STATE VAR_SANDGEM_TOWN_LAB_STATE -VAR_UNK_0x40A7 +VAR_RESORT_AREA_RIBBON_SYNDICATE_1F_STATE VAR_ROUTE_217_STATE VAR_MT_CORONET_2F_STATE VAR_EXITED_DISTORTION_WORLD_STATE @@ -4299,7 +4299,7 @@ VAR_SPEAR_PILLAR_DIALGA_STATE VAR_SPEAR_PILLAR_PALKIA_STATE VAR_PAL_PARK_LOBBY_STATE VAR_PASTORIA_CITY_TRY_CROAGUNK_SCENE_STATE -VAR_UNK_0x40C8 +VAR_RESORT_AREA_STATE VAR_UNK_0x40C9 VAR_FOLLOWER_RIVAL_TIMES_TALKED VAR_UNK_0x40CB diff --git a/include/constants/villa_visitors.h b/include/constants/villa_visitors.h new file mode 100644 index 0000000000..66a9aba7de --- /dev/null +++ b/include/constants/villa_visitors.h @@ -0,0 +1,22 @@ +#ifndef POKEPLATINUM_CONSTANTS_VILLA_VISITORS_H +#define POKEPLATINUM_CONSTANTS_VILLA_VISITORS_H + +#define VILLA_VISITOR_NONE 0xFF + +#define VILLA_VISITOR_RIVAL 0 +#define VILLA_VISITOR_COUNTERPART 1 +#define VILLA_VISITOR_PROF_ROWAN 2 +#define VILLA_VISITOR_MOM 3 +#define VILLA_VISITOR_ROARK 4 +#define VILLA_VISITOR_GARDENIA 5 +#define VILLA_VISITOR_FANTINA 6 +#define VILLA_VISITOR_MAYLENE 7 +#define VILLA_VISITOR_CRASHER_WAKE 8 +#define VILLA_VISITOR_BYRON 9 +#define VILLA_VISITOR_CANDICE 10 +#define VILLA_VISITOR_VOLKNER 11 +#define VILLA_VISITOR_CYNTHIA 12 +#define VILLA_VISITOR_FLINT_VOLKNER 13 +#define VILLA_VISITOR_MAYLENE_CANDICE 14 + +#endif // POKEPLATINUM_CONSTANTS_VILLA_VISITORS_H diff --git a/include/data/map_headers.h b/include/data/map_headers.h index 6eebe97c60..f9981d822d 100644 --- a/include/data/map_headers.h +++ b/include/data/map_headers.h @@ -10107,17 +10107,17 @@ static const MapHeader sMapHeaders[] = { .isEscapeRopeAllowed = FALSE, .isFlyAllowed = TRUE, }, - [MAP_HEADER_RESORT_AREA_MART] = { + [MAP_HEADER_UNUSED_RESORT_AREA_MART] = { .areaDataArchiveID = area_data_022, .unk_01 = 0xF, .mapMatrixID = map_matrix_122, - .scriptsArchiveID = scripts_resort_area_mart, - .initScriptsArchiveID = scripts_init_resort_area_mart, - .msgArchiveID = TEXT_BANK_RESORT_AREA_MART, + .scriptsArchiveID = scripts_unused_resort_area_mart, + .initScriptsArchiveID = scripts_init_unused_resort_area_mart, + .msgArchiveID = TEXT_BANK_UNUSED_RESORT_AREA_MART, .dayMusicID = SEQ_FS, .nightMusicID = SEQ_FS, .wildEncountersArchiveID = ENCOUNTERS_NONE, - .eventsArchiveID = events_resort_area_mart, + .eventsArchiveID = events_unused_resort_area_mart, .mapLabelTextID = LocationNames_Text_ResortArea, .mapLabelWindowID = MAP_LABEL_WINDOW_TOWN, .weather = OVERWORLD_WEATHER_CLEAR, diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h index eff9770c56..7009b4bbcb 100644 --- a/include/data/scripts/scrcmd.h +++ b/include/data/scripts/scrcmd.h @@ -765,11 +765,11 @@ ScriptCommand(ScrCmd_GETRANDOMBATTLEGROUNDTRAINERS, ScrCm ScriptCommand(SCRCMD_BUFFERVALUEPADDINGDIGITS, ScrCmd_BufferValuePaddingDigits) ScriptCommand(SCRCMD_2F6, ScrCmd_2F6) ScriptCommand(SCRCMD_2F7, ScrCmd_2F7) -ScriptCommand(SCRCMD_SETSCENE22, ScrCmd_SetScene22) +ScriptCommand(SCRCMD_SETSCENEPLAYBGMMUSICBOX, ScrCmd_SetScenePlayBGMMusicBox) ScriptCommand(SCRCMD_SETFIELDSCENE, ScrCmd_SetFieldScene) ScriptCommand(SCRCMD_GETCURRENTBGM, ScrCmd_GetCurrentBGM) ScriptCommand(SCRCMD_2FB, ScrCmd_2FB) -ScriptCommand(SCRCMD_2FC, ScrCmd_2FC) +ScriptCommand(SCRCMD_CHECKABPRESS, ScrCmd_CheckABPress) ScriptCommand(SCRCMD_BUFFERTYPENAME, ScrCmd_BufferTypeName) ScriptCommand(SCRCMD_GETITEMQUANTITY, ScrCmd_GetItemQuantity) ScriptCommand(SCRCMD_CALCHIDDENPOWERTYPE, ScrCmd_CalcHiddenPowerType) @@ -785,10 +785,10 @@ ScriptCommand(SCRCMD_ADDCAMERAOVERRIDEOBJECT, ScrCm ScriptCommand(SCRCMD_REMOVECAMERAOVERRIDEOBJECT, ScrCmd_RemoveCameraOverrideObject) ScriptCommand(SCRCMD_INCREMENTTRAINERSCORE, ScrCmd_IncrementTrainerScore) ScriptCommand(SCRCMD_30B, ScrCmd_30B) -ScriptCommand(SCRCMD_30C, ScrCmd_30C) -ScriptCommand(SCRCMD_30D, ScrCmd_30D) +ScriptCommand(SCRCMD_SAVETVSEGMENTHOMEANDMANORNOFURNITURE, ScrCmd_SaveTVSegmentHomeAndManorNoFurniture) +ScriptCommand(SCRCMD_SAVETVSEGMENTHOMEANDMANOR, ScrCmd_SaveTVSegmentHomeAndManor) ScriptCommand(SCRCMD_30E, ScrCmd_30E) -ScriptCommand(SCRCMD_30F, ScrCmd_30F) +ScriptCommand(SCRCMD_CHECKMETFURNITUREREQUIREMENTS, ScrCmd_CheckMetFurnitureRequirements) ScriptCommand(SCRCMD_STARTLIBRARYTV, ScrCmd_StartLibraryTV) ScriptCommand(SCRCMD_ADDDISTORTIONWORLDMAPOBJECT, ScrCmd_AddDistortionWorldMapObject) ScriptCommand(SCRCMD_DELETEDISTORTIONWORLDMAPOBJECT, ScrCmd_DeleteDistortionWorldMapObject) diff --git a/include/overlay005/ov5_021F6454.h b/include/overlay005/ov5_021F6454.h index 39c47d9211..c371e7388d 100644 --- a/include/overlay005/ov5_021F6454.h +++ b/include/overlay005/ov5_021F6454.h @@ -14,7 +14,7 @@ BOOL ScrCmd_CalcHiddenPowerType(ScriptContext *ctx); BOOL ScrCmd_300(ScriptContext *param0); BOOL ScrCmd_301(ScriptContext *param0); BOOL ScrCmd_GetPartyMonForm2(ScriptContext *ctx); -BOOL ScrCmd_30F(ScriptContext *param0); +BOOL ScrCmd_CheckMetFurnitureRequirements(ScriptContext *ctx); BOOL ScrCmd_Dummy316(ScriptContext *ctx); BOOL ScrCmd_ActivateRegiRuinsDot(ScriptContext *param0); BOOL ScrCmd_32D(ScriptContext *ctx); diff --git a/include/scrcmd_sound.h b/include/scrcmd_sound.h index 553b48c959..4c6f74ae6c 100644 --- a/include/scrcmd_sound.h +++ b/include/scrcmd_sound.h @@ -26,7 +26,7 @@ BOOL ScrCmd_StopRecordingChatotCry(ScriptContext *ctx); BOOL ScrCmd_StoreRecordedChatotCry(ScriptContext *ctx); BOOL ScrCmd_SetSubScene63(ScriptContext *ctx); BOOL ScrCmd_SetInitialVolumeForSequence(ScriptContext *ctx); -BOOL ScrCmd_SetScene22(ScriptContext *ctx); +BOOL ScrCmd_SetScenePlayBGMMusicBox(ScriptContext *ctx); BOOL ScrCmd_SetFieldScene(ScriptContext *ctx); BOOL ScrCmd_GetCurrentBGM(ScriptContext *ctx); diff --git a/include/scrcmd_tv_broadcast.h b/include/scrcmd_tv_broadcast.h index 32f2e8acf3..2f38e69171 100644 --- a/include/scrcmd_tv_broadcast.h +++ b/include/scrcmd_tv_broadcast.h @@ -7,8 +7,8 @@ BOOL ScrCmd_CallTVBroadcast(ScriptContext *param0); BOOL ScrCmd_236(ScriptContext *param0); BOOL ScrCmd_2B8(ScriptContext *param0); BOOL ScrCmd_30B(ScriptContext *param0); -BOOL ScrCmd_30C(ScriptContext *param0); -BOOL ScrCmd_30D(ScriptContext *param0); +BOOL ScrCmd_SaveTVSegmentHomeAndManorNoFurniture(ScriptContext *ctx); +BOOL ScrCmd_SaveTVSegmentHomeAndManor(ScriptContext *ctx); BOOL ScrCmd_CallTVInterview(ScriptContext *ctx); BOOL ScrCmd_CheckTVInterviewEligible(ScriptContext *ctx); BOOL ScrCmd_27C(ScriptContext *param0); diff --git a/include/sound.h b/include/sound.h index 609bab6a4c..5d1434553e 100644 --- a/include/sound.h +++ b/include/sound.h @@ -55,7 +55,7 @@ enum SoundScene { SOUND_SCENE_19, SOUND_SCENE_20, SOUND_SCENE_21, - SOUND_SCENE_22, + SOUND_SCENE_VILLA_MUSIC_BOX, SOUND_SCENE_23, SOUND_SCENE_24, SOUND_SCENE_25, diff --git a/res/field/events/events_resort_area.json b/res/field/events/events_resort_area.json index b43f0340c4..ad4d9b20af 100644 --- a/res/field/events/events_resort_area.json +++ b/res/field/events/events_resort_area.json @@ -19,7 +19,7 @@ ], "object_events": [ { - "id": "RESORT_AREA_MAP_SIGNPOST_0", + "id": "LOCALID_MAP_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -36,7 +36,7 @@ "y": 0 }, { - "id": "RESORT_AREA_SIGNBOARD_1", + "id": "LOCALID_SIGNBOARD_RIBBON_SYNDICATE", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -66,7 +66,7 @@ "y": 0 }, { - "id": "RESORT_AREA_BEAUTY_3", + "id": "LOCALID_BEAUTY_1", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -81,7 +81,7 @@ "y": 0 }, { - "id": "RESORT_AREA_BEAUTY_4", + "id": "LOCALID_BEAUTY_2", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -96,7 +96,7 @@ "y": 0 }, { - "id": "RESORT_AREA_BLACK_BELT_5", + "id": "LOCALID_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -111,7 +111,7 @@ "y": 0 }, { - "id": "RESORT_AREA_ACE_TRAINER_F_6", + "id": "LOCALID_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -126,7 +126,7 @@ "y": 0 }, { - "id": "RESORT_AREA_BERRY_SOIL_7", + "id": "LOCALID_BERRY_SOIL_1", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -143,7 +143,7 @@ "y": 0 }, { - "id": "RESORT_AREA_BERRY_SOIL_8", + "id": "LOCALID_BERRY_SOIL_2", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -160,7 +160,7 @@ "y": 0 }, { - "id": "RESORT_AREA_BERRY_SOIL_9", + "id": "LOCALID_BERRY_SOIL_3", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -177,7 +177,7 @@ "y": 0 }, { - "id": "RESORT_AREA_BERRY_SOIL_10", + "id": "LOCALID_BERRY_SOIL_4", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -194,7 +194,7 @@ "y": 0 }, { - "id": "RESORT_AREA_SWIMMER_M_11", + "id": "LOCALID_SWIMMER_M", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -209,7 +209,7 @@ "y": 0 }, { - "id": "RESORT_AREA_SIGNBOARD_12", + "id": "LOCALID_SIGNBOARD_VILLA", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -224,11 +224,11 @@ "y": 0 }, { - "id": "RESORT_AREA_SCHOOL_KID_M_13", + "id": "LOCALID_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02A6", + "hidden_flag": "FLAG_HIDE_RESORT_AREA_SCHOOL_KID_M", "script": 0, "initial_dir": 2, "data": [], @@ -239,11 +239,11 @@ "y": 0 }, { - "id": "RESORT_AREA_PROF_ROWAN_14", + "id": "LOCALID_PROF_ROWAN", "graphics_id": "OBJ_EVENT_GFX_PROF_ROWAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02AA", + "hidden_flag": "FLAG_HIDE_RESORT_AREA_PROF_ROWAN", "script": 9, "initial_dir": 2, "data": [], @@ -254,11 +254,11 @@ "y": 0 }, { - "id": "RESORT_AREA_GARDENIA_15", + "id": "LOCALID_GARDENIA", "graphics_id": "OBJ_EVENT_GFX_GARDENIA", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02AF", + "hidden_flag": "FLAG_HIDE_RESORT_AREA_GARDENIA", "script": 11, "initial_dir": 2, "data": [], @@ -269,11 +269,11 @@ "y": 0 }, { - "id": "RESORT_AREA_BYRON_16", + "id": "LOCALID_BYRON", "graphics_id": "OBJ_EVENT_GFX_BYRON", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B5", + "hidden_flag": "FLAG_HIDE_RESORT_AREA_BYRON", "script": 13, "initial_dir": 2, "data": [], @@ -284,11 +284,11 @@ "y": 0 }, { - "id": "RESORT_AREA_ROARK_17", + "id": "LOCALID_ROARK", "graphics_id": "OBJ_EVENT_GFX_ROARK", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02AD", + "hidden_flag": "FLAG_HIDE_RESORT_AREA_ROARK", "script": 10, "initial_dir": 2, "data": [], @@ -299,11 +299,11 @@ "y": 0 }, { - "id": "RESORT_AREA_MAYLENE_18", + "id": "LOCALID_MAYLENE", "graphics_id": "OBJ_EVENT_GFX_MAYLENE", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B2", + "hidden_flag": "FLAG_HIDE_RESORT_AREA_MAYLENE", "script": 12, "initial_dir": 2, "data": [], @@ -348,7 +348,7 @@ "y": 0, "width": 1, "length": 3, - "var": "VAR_UNK_0x40C8", + "var": "VAR_RESORT_AREA_STATE", "value": 0 } ] diff --git a/res/field/events/events_resort_area_house.json b/res/field/events/events_resort_area_house.json index 421a45ced6..5433a0fe4c 100644 --- a/res/field/events/events_resort_area_house.json +++ b/res/field/events/events_resort_area_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "RESORT_AREA_HOUSE_COLLECTOR_0", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "RESORT_AREA_HOUSE_OLD_MAN_1", + "id": "LOCALID_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "RESORT_AREA_HOUSE_NINJA_BOY_2", + "id": "LOCALID_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_NONE", "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 765a19ab53..e6727feedf 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": "RESORT_AREA_POKECENTER_1F_POKECENTER_NURSE_0", + "id": "LOCALID_POKECENTER_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": "RESORT_AREA_POKECENTER_1F_RICH_BOY_1", + "id": "LOCALID_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": "RESORT_AREA_POKECENTER_1F_IDOL_2", + "id": "LOCALID_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": "RESORT_AREA_POKECENTER_1F_UNK_111_3", + "id": "LOCALID_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "RESORT_AREA_POKECENTER_1F_UNK_112_4", + "id": "LOCALID_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_resort_area_pokecenter_2f.json b/res/field/events/events_resort_area_pokecenter_2f.json index 37297ba086..2f3d0b6aed 100644 --- a/res/field/events/events_resort_area_pokecenter_2f.json +++ b/res/field/events/events_resort_area_pokecenter_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "RESORT_AREA_POKECENTER_2F_TEALA_0", + "id": "LOCALID_TEALA_MIDDLE", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "RESORT_AREA_POKECENTER_2F_TEALA_1", + "id": "LOCALID_TEALA_EAST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "RESORT_AREA_POKECENTER_2F_TEALA_2", + "id": "LOCALID_TEALA_WEST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_resort_area_pokecenter_b1f.json b/res/field/events/events_resort_area_pokecenter_b1f.json index c2285e3048..f9a9834a7d 100644 --- a/res/field/events/events_resort_area_pokecenter_b1f.json +++ b/res/field/events/events_resort_area_pokecenter_b1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "RESORT_AREA_POKECENTER_B1F_TEALA_0", + "id": "LOCALID_TEALA_MIDDLE", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "RESORT_AREA_POKECENTER_B1FWIFI_PLAZA_ATTENDANT_F_1", + "id": "LOCALID_WIFI_PLAZA_ATTENDANT_F", "graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "RESORT_AREA_POKECENTER_B1F_TEALA_2", + "id": "LOCALID_TEALA_EAST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_resort_area_ribbon_syndicate_1f.json b/res/field/events/events_resort_area_ribbon_syndicate_1f.json index 2d4cc87182..4a5b544a46 100644 --- a/res/field/events/events_resort_area_ribbon_syndicate_1f.json +++ b/res/field/events/events_resort_area_ribbon_syndicate_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "RESORT_AREA_RIBBON_SYNDICATE_1F_BEAUTY_0", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "RESORT_AREA_RIBBON_SYNDICATE_1F_CASHIER_F_1", + "id": "LOCALID_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": "RESORT_AREA_RIBBON_SYNDICATE_1F_MIDDLE_AGED_WOMAN_2", + "id": "LOCALID_MIDDLE_AGED_WOMAN", "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_WOMAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "RESORT_AREA_RIBBON_SYNDICATE_1F_LADY_3", + "id": "LOCALID_LADY", "graphics_id": "OBJ_EVENT_GFX_LADY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "RESORT_AREA_RIBBON_SYNDICATE_1F_SKITTY_4", + "id": "LOCALID_SKITTY", "graphics_id": "OBJ_EVENT_GFX_SKITTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "RESORT_AREA_RIBBON_SYNDICATE_1F_PSYDUCK_5", + "id": "LOCALID_PSYDUCK", "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_resort_area_ribbon_syndicate_2f.json b/res/field/events/events_resort_area_ribbon_syndicate_2f.json index d911e4b8ee..a321ec3677 100644 --- a/res/field/events/events_resort_area_ribbon_syndicate_2f.json +++ b/res/field/events/events_resort_area_ribbon_syndicate_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "RESORT_AREA_RIBBON_SYNDICATE_2F_RECEPTIONIST_0", + "id": "LOCALID_RECEPTIONIST_1", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "RESORT_AREA_RIBBON_SYNDICATE_2F_RECEPTIONIST_1", + "id": "LOCALID_RECEPTIONIST_2", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "RESORT_AREA_RIBBON_SYNDICATE_2F_RECEPTIONIST_2", + "id": "LOCALID_RECEPTIONIST_3", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "RESORT_AREA_RIBBON_SYNDICATE_2F_RECEPTIONIST_3", + "id": "LOCALID_RECEPTIONIST_4", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_resort_area_ribbon_syndicate_elevator.json b/res/field/events/events_resort_area_ribbon_syndicate_elevator.json index 65d1c1b869..7d78c8aa63 100644 --- a/res/field/events/events_resort_area_ribbon_syndicate_elevator.json +++ b/res/field/events/events_resort_area_ribbon_syndicate_elevator.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "RESORT_AREA_RIBBON_SYNDICATE_ELEVATOR_RECEPTIONIST_0", + "id": "LOCALID_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_resort_area_mart.json b/res/field/events/events_unused_resort_area_mart.json similarity index 93% rename from res/field/events/events_resort_area_mart.json rename to res/field/events/events_unused_resort_area_mart.json index db63f70a03..8ec452c7aa 100644 --- a/res/field/events/events_resort_area_mart.json +++ b/res/field/events/events_unused_resort_area_mart.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "RESORT_AREA_MART_CASHIER_F_0", + "id": "LOCALID_CASHIER_F", "graphics_id": "OBJ_EVENT_GFX_CASHIER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_villa.json b/res/field/events/events_villa.json index ce744aca35..67d82895b1 100644 --- a/res/field/events/events_villa.json +++ b/res/field/events/events_villa.json @@ -27,11 +27,11 @@ ], "object_events": [ { - "id": "VILLA_UNK_102_0", + "id": "LOCALID_COUNTERPART", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02A8", + "hidden_flag": "FLAG_HIDE_VILLA_COUNTERPART", "script": 3, "initial_dir": 1, "data": [], @@ -42,11 +42,11 @@ "y": 0 }, { - "id": "VILLA_RIVAL_1", + "id": "LOCALID_RIVAL", "graphics_id": "OBJ_EVENT_GFX_BARRY", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02A7", + "hidden_flag": "FLAG_HIDE_VILLA_RIVAL", "script": 2, "initial_dir": 2, "data": [], @@ -57,11 +57,11 @@ "y": 0 }, { - "id": "VILLA_PROF_ROWAN_2", + "id": "LOCALID_PROF_ROWAN", "graphics_id": "OBJ_EVENT_GFX_PROF_ROWAN", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02A9", + "hidden_flag": "FLAG_HIDE_VILLA_PROF_ROWAN", "script": 4, "initial_dir": 0, "data": [], @@ -72,11 +72,11 @@ "y": 0 }, { - "id": "VILLA_MOM_3", + "id": "LOCALID_MOM", "graphics_id": "OBJ_EVENT_GFX_MOM", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02AB", + "hidden_flag": "FLAG_HIDE_VILLA_MOM", "script": 5, "initial_dir": 3, "data": [], @@ -87,11 +87,11 @@ "y": 0 }, { - "id": "VILLA_ROARK_4", + "id": "LOCALID_ROARK", "graphics_id": "OBJ_EVENT_GFX_ROARK", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02AC", + "hidden_flag": "FLAG_HIDE_VILLA_ROARK", "script": 6, "initial_dir": 1, "data": [], @@ -102,11 +102,11 @@ "y": 0 }, { - "id": "VILLA_GARDENIA_5", + "id": "LOCALID_GARDENIA", "graphics_id": "OBJ_EVENT_GFX_GARDENIA", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02AE", + "hidden_flag": "FLAG_HIDE_VILLA_GARDENIA", "script": 7, "initial_dir": 1, "data": [], @@ -117,11 +117,11 @@ "y": 0 }, { - "id": "VILLA_FANTINA_6", + "id": "LOCALID_FANTINA", "graphics_id": "OBJ_EVENT_GFX_FANTINA", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B0", + "hidden_flag": "FLAG_HIDE_VILLA_FANTINA", "script": 8, "initial_dir": 0, "data": [], @@ -132,11 +132,11 @@ "y": 0 }, { - "id": "VILLA_MAYLENE_7", + "id": "LOCALID_MAYLENE", "graphics_id": "OBJ_EVENT_GFX_MAYLENE", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B1", + "hidden_flag": "FLAG_HIDE_VILLA_MAYLENE", "script": 9, "initial_dir": 3, "data": [], @@ -147,11 +147,11 @@ "y": 0 }, { - "id": "VILLA_BYRON_8", + "id": "LOCALID_BYRON", "graphics_id": "OBJ_EVENT_GFX_BYRON", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B4", + "hidden_flag": "FLAG_HIDE_VILLA_BYRON", "script": 11, "initial_dir": 1, "data": [], @@ -162,11 +162,11 @@ "y": 0 }, { - "id": "VILLA_CRASHER_WAKE_9", + "id": "LOCALID_CRASHER_WAKE", "graphics_id": "OBJ_EVENT_GFX_CRASHER_WAKE", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B3", + "hidden_flag": "FLAG_HIDE_VILLA_CRASHER_WAKE", "script": 10, "initial_dir": 0, "data": [], @@ -177,11 +177,11 @@ "y": 0 }, { - "id": "VILLA_CANDICE_10", + "id": "LOCALID_CANDICE", "graphics_id": "OBJ_EVENT_GFX_CANDICE", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B6", + "hidden_flag": "FLAG_HIDE_VILLA_CANDICE", "script": 12, "initial_dir": 1, "data": [], @@ -192,11 +192,11 @@ "y": 0 }, { - "id": "VILLA_VOLKNER_11", + "id": "LOCALID_VOLKNER", "graphics_id": "OBJ_EVENT_GFX_VOLKNER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B7", + "hidden_flag": "FLAG_HIDE_VILLA_VOLKNER", "script": 13, "initial_dir": 2, "data": [], @@ -207,11 +207,11 @@ "y": 0 }, { - "id": "VILLA_CYNTHIA_12", + "id": "LOCALID_CYNTHIA", "graphics_id": "OBJ_EVENT_GFX_CYNTHIA", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B8", + "hidden_flag": "FLAG_HIDE_VILLA_CYNTHIA", "script": 14, "initial_dir": 2, "data": [], @@ -222,11 +222,11 @@ "y": 0 }, { - "id": "VILLA_FLINT_13", + "id": "LOCALID_FLINT", "graphics_id": "OBJ_EVENT_GFX_FLINT", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02B9", + "hidden_flag": "FLAG_HIDE_VILLA_FLINT", "script": 15, "initial_dir": 2, "data": [], @@ -237,11 +237,11 @@ "y": 0 }, { - "id": "VILLA_SCHOOL_KID_M_14", + "id": "LOCALID_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x025A", + "hidden_flag": "FLAG_HIDE_VILLA_SCHOOL_KID_M", "script": 42, "initial_dir": 3, "data": [], @@ -252,11 +252,11 @@ "y": 0 }, { - "id": "VILLA_POKEMON_BREEDER_M_15", + "id": "LOCALID_DELIVERY_GUY", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02C5", + "hidden_flag": "FLAG_HIDE_VILLA_DELIVERY_GUY", "script": 0, "initial_dir": 0, "data": [], @@ -267,11 +267,11 @@ "y": 0 }, { - "id": "VILLA_BOOK_16", + "id": "LOCALID_BOOK", "graphics_id": "OBJ_EVENT_GFX_BOOK", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02C7", + "hidden_flag": "FLAG_HIDE_VILLA_BOOK", "script": 0, "initial_dir": 0, "data": [], @@ -338,7 +338,7 @@ "y": 0, "width": 1, "length": 1, - "var": "VAR_UNK_0x40A1", + "var": "VAR_VILLA_STATE", "value": 1 } ] diff --git a/res/field/events/meson.build b/res/field/events/meson.build index 3221f2dada..ad2ec41b53 100644 --- a/res/field/events/meson.build +++ b/res/field/events/meson.build @@ -443,7 +443,7 @@ events_files = files( 'events_survival_area_south_house.json', 'events_survival_area_north_house.json', 'events_resort_area.json', - 'events_resort_area_mart.json', + 'events_unused_resort_area_mart.json', 'events_resort_area_pokecenter_1f.json', 'events_resort_area_pokecenter_2f.json', 'events_resort_area_ribbon_syndicate_1f.json', diff --git a/res/field/events/zone_event.order b/res/field/events/zone_event.order index d709b13c8a..7337a958f7 100644 --- a/res/field/events/zone_event.order +++ b/res/field/events/zone_event.order @@ -435,7 +435,7 @@ events_battleground events_survival_area_south_house events_survival_area_north_house events_resort_area -events_resort_area_mart +events_unused_resort_area_mart events_resort_area_pokecenter_1f events_resort_area_pokecenter_2f events_resort_area_ribbon_syndicate_1f diff --git a/res/field/frontier_scripts/frontier_scripts_battle_arcade.s b/res/field/frontier_scripts/frontier_scripts_battle_arcade.s index 1b7761f596..c32d778ee6 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_arcade.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_arcade.s @@ -2582,7 +2582,7 @@ _2562: FadeScreenIn FrontierScrCmd_C0 VAR_0x8008 GoToIfEq VAR_0x8008, 0, _2D52 - IncrementRecordValue RECORD_UNK_063 + IncrementRecordValue RECORD_BATTLE_ARCADE_VICTORIES FrontierScrCmd_BF 48, 0, 0, VAR_0x8008 GoToIfEq VAR_0x8008, 1, _31DE GoToIfEq VAR_0x8008, 2, _3212 diff --git a/res/field/frontier_scripts/frontier_scripts_battle_castle.s b/res/field/frontier_scripts/frontier_scripts_battle_castle.s index 7f2f29f81a..6150096f80 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_castle.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_castle.s @@ -1253,7 +1253,7 @@ _0F99: FadeScreenIn FrontierScrCmd_A1 VAR_0x8008 GoToIfEq VAR_0x8008, 0, _180E - IncrementRecordValue RECORD_UNK_061 + IncrementRecordValue RECORD_BATTLE_CASTLE_VICTORIES FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 GoToIfEq VAR_0x8008, 1, _1040 FrontierScrCmd_A0 40, 0, 0, VAR_0x8008 diff --git a/res/field/frontier_scripts/frontier_scripts_battle_factory.s b/res/field/frontier_scripts/frontier_scripts_battle_factory.s index 4e5e0dcbf0..a031275be8 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_factory.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_factory.s @@ -872,7 +872,7 @@ _0AD0: FadeScreenIn FrontierScrCmd_68 VAR_0x8008 GoToIfEq VAR_0x8008, 0, _1233 - IncrementRecordValue RECORD_UNK_060 + IncrementRecordValue RECORD_BATTLE_FACTORY_VICTORIES FrontierScrCmd_67 37, 0, 0, VAR_0x8008 GoToIfEq VAR_0x8008, 1, _15AA GoToIfEq VAR_0x8008, 2, _15DE diff --git a/res/field/scripts/meson.build b/res/field/scripts/meson.build index 0bc339568e..c265777db3 100644 --- a/res/field/scripts/meson.build +++ b/res/field/scripts/meson.build @@ -1068,7 +1068,7 @@ scr_seq_files = files( 'scripts_init_survival_area_south_house.s', 'scripts_init_survival_area_north_house.s', 'scripts_init_resort_area.s', - 'scripts_init_resort_area_mart.s', + 'scripts_init_unused_resort_area_mart.s', 'scripts_init_resort_area_pokecenter_1f.s', 'scripts_init_resort_area_pokecenter_2f.s', 'scripts_init_resort_area_pokecenter_b1f.s', @@ -1138,7 +1138,7 @@ scr_seq_files = files( 'scripts_survival_area_south_house.s', 'scripts_survival_area_north_house.s', 'scripts_resort_area.s', - 'scripts_resort_area_mart.s', + 'scripts_unused_resort_area_mart.s', 'scripts_resort_area_pokecenter_1f.s', 'scripts_resort_area_pokecenter_2f.s', 'scripts_resort_area_pokecenter_b1f.s', diff --git a/res/field/scripts/scripts.order b/res/field/scripts/scripts.order index 7fb7ff07fe..6df843a996 100644 --- a/res/field/scripts/scripts.order +++ b/res/field/scripts/scripts.order @@ -1033,7 +1033,7 @@ scripts_init_battleground scripts_init_survival_area_south_house scripts_init_survival_area_north_house scripts_init_resort_area -scripts_init_resort_area_mart +scripts_init_unused_resort_area_mart scripts_init_resort_area_pokecenter_1f scripts_init_resort_area_pokecenter_2f scripts_init_resort_area_pokecenter_b1f @@ -1103,7 +1103,7 @@ scripts_battleground scripts_survival_area_south_house scripts_survival_area_north_house scripts_resort_area -scripts_resort_area_mart +scripts_unused_resort_area_mart scripts_resort_area_pokecenter_1f scripts_resort_area_pokecenter_2f scripts_resort_area_pokecenter_b1f diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index 5cf4fc42ff..68c7361a0c 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -121,6 +121,6 @@ _0006: SetFlag FLAG_HIDE_ROUTE_217_MAYLENE SetFlag FLAG_HIDE_SUNYSHORE_CITY_RIVAL SetFlag FLAG_HIDE_FIGHT_AREA_PALMER - SetFlag FLAG_UNK_0x02C5 - SetFlag FLAG_UNK_0x02C7 + SetFlag FLAG_HIDE_VILLA_DELIVERY_GUY + SetFlag FLAG_HIDE_VILLA_BOOK End diff --git a/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_1f.s b/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_1f.s index 4d3aecfcac..22159885fa 100644 --- a/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_1f.s +++ b/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_1f.s @@ -6,7 +6,7 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x40A7, 0, 7 + InitScriptGoToIfEqual VAR_RESORT_AREA_RIBBON_SYNDICATE_1F_STATE, 0, 7 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_init_resort_area_mart.s b/res/field/scripts/scripts_init_unused_resort_area_mart.s similarity index 100% rename from res/field/scripts/scripts_init_resort_area_mart.s rename to res/field/scripts/scripts_init_unused_resort_area_mart.s diff --git a/res/field/scripts/scripts_init_villa.s b/res/field/scripts/scripts_init_villa.s index 19913d6aae..9ec2fddbff 100644 --- a/res/field/scripts/scripts_init_villa.s +++ b/res/field/scripts/scripts_init_villa.s @@ -6,7 +6,7 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x40A1, 0, 41 + InitScriptGoToIfEqual VAR_VILLA_STATE, 0, 41 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_resort_area.s b/res/field/scripts/scripts_resort_area.s index b2488f6b07..5408af5b7c 100644 --- a/res/field/scripts/scripts_resort_area.s +++ b/res/field/scripts/scripts_resort_area.s @@ -1,137 +1,138 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area.h" +#include "res/field/events/events_resort_area.h" - ScriptEntry _00DA - ScriptEntry _00ED - ScriptEntry _0100 - ScriptEntry _0130 - ScriptEntry _0143 - ScriptEntry _015A - ScriptEntry _0171 - ScriptEntry _0184 - ScriptEntry _03D4 - ScriptEntry _043C - ScriptEntry _049C - ScriptEntry _04FC - ScriptEntry _055C - ScriptEntry _003E - ScriptEntry _05BC + ScriptEntry ResortArea_Beauty1 + ScriptEntry ResortArea_Beauty2 + ScriptEntry ResortArea_AceTrainerF + ScriptEntry ResortArea_BlackBelt + ScriptEntry ResortArea_MapSign + ScriptEntry ResortArea_SignRibbonSyndicate + ScriptEntry ResortArea_SwimmerM + ScriptEntry ResortArea_TriggerSchoolKidM + ScriptEntry ResortArea_ProfRowan + ScriptEntry ResortArea_Roark + ScriptEntry ResortArea_Gardenia + ScriptEntry ResortArea_Maylene + ScriptEntry ResortArea_Byron + ScriptEntry ResortArea_OnTransition + ScriptEntry ResortArea_SignVilla ScriptEntryEnd -_003E: - SetFlag FLAG_UNK_0x02AA - SetFlag FLAG_UNK_0x02AD - SetFlag FLAG_UNK_0x02AF - SetFlag FLAG_UNK_0x02B2 - SetFlag FLAG_UNK_0x02B5 - GoToIfEq VAR_RESORT_VILLA_VISITOR, 0xFF, _00BA - GoToIfEq VAR_UNK_0x40C8, 0, _00BA - GoToIfSet FLAG_VILLA_VISITOR_INSIDE, _00BA - CallIfEq VAR_RESORT_VILLA_VISITOR, 2, _00BC - CallIfEq VAR_RESORT_VILLA_VISITOR, 4, _00C2 - CallIfEq VAR_RESORT_VILLA_VISITOR, 5, _00C8 - CallIfEq VAR_RESORT_VILLA_VISITOR, 7, _00CE - CallIfEq VAR_RESORT_VILLA_VISITOR, 9, _00D4 +ResortArea_OnTransition: + SetFlag FLAG_HIDE_RESORT_AREA_PROF_ROWAN + SetFlag FLAG_HIDE_RESORT_AREA_ROARK + SetFlag FLAG_HIDE_RESORT_AREA_GARDENIA + SetFlag FLAG_HIDE_RESORT_AREA_MAYLENE + SetFlag FLAG_HIDE_RESORT_AREA_BYRON + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_NONE, ResortArea_DontShowVisitor + GoToIfEq VAR_RESORT_AREA_STATE, 0, ResortArea_DontShowVisitor + GoToIfSet FLAG_VILLA_VISITOR_INSIDE, ResortArea_DontShowVisitor + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_PROF_ROWAN, ResortArea_ShowProfRowan + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_ROARK, ResortArea_ShowRoark + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_GARDENIA, ResortArea_ShowGardenia + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MAYLENE, ResortArea_ShowMaylene + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_BYRON, ResortArea_ShowByron End -_00BA: +ResortArea_DontShowVisitor: End -_00BC: - ClearFlag FLAG_UNK_0x02AA +ResortArea_ShowProfRowan: + ClearFlag FLAG_HIDE_RESORT_AREA_PROF_ROWAN Return -_00C2: - ClearFlag FLAG_UNK_0x02AD +ResortArea_ShowRoark: + ClearFlag FLAG_HIDE_RESORT_AREA_ROARK Return -_00C8: - ClearFlag FLAG_UNK_0x02AF +ResortArea_ShowGardenia: + ClearFlag FLAG_HIDE_RESORT_AREA_GARDENIA Return -_00CE: - ClearFlag FLAG_UNK_0x02B2 +ResortArea_ShowMaylene: + ClearFlag FLAG_HIDE_RESORT_AREA_MAYLENE Return -_00D4: - ClearFlag FLAG_UNK_0x02B5 +ResortArea_ShowByron: + ClearFlag FLAG_HIDE_RESORT_AREA_BYRON Return -_00DA: - NPCMessage 0 +ResortArea_Beauty1: + NPCMessage ResortArea_Text_TraveledLongWay End -_00ED: - NPCMessage 1 +ResortArea_Beauty2: + NPCMessage ResortArea_Text_NothingTooGood End -_0100: +ResortArea_AceTrainerF: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfUnset FLAG_UNK_0x00FA, _0126 - CallIfSet FLAG_UNK_0x00FA, _012B + CallIfUnset FLAG_JOINED_RIBBON_SYNDICATE, ResortArea_LongToBecomeMember + CallIfSet FLAG_JOINED_RIBBON_SYNDICATE, ResortArea_YouAreAMember WaitButton CloseMessage ReleaseAll End -_0126: - Message 2 +ResortArea_LongToBecomeMember: + Message ResortArea_Text_LongToBecomeMember Return -_012B: - Message 3 +ResortArea_YouAreAMember: + Message ResortArea_Text_YouAreAMember Return -_0130: - NPCMessage 4 +ResortArea_BlackBelt: + NPCMessage ResortArea_Text_DigUpCoolStuff End -_0143: - ShowMapSign 25 +ResortArea_MapSign: + ShowMapSign ResortArea_Text_MapSign End -_015A: - ShowLandmarkSign 26 +ResortArea_SignRibbonSyndicate: + ShowLandmarkSign ResortArea_Text_SignRibbonSyndicate End -_0171: - NPCMessage 5 +ResortArea_SwimmerM: + NPCMessage ResortArea_Text_SomethingLurks End -_0184: +ResortArea_TriggerSchoolKidM: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8005, 0x1D8, _0266 - CallIfEq VAR_0x8005, 0x1D9, _0272 - CallIfEq VAR_0x8005, 0x1DA, _0274 - Message 6 + CallIfEq VAR_0x8005, 472, ResortArea_SchoolKidMWalkToPlayerZ472 + CallIfEq VAR_0x8005, 473, ResortArea_SchoolKidMWalkToPlayerZ473 + CallIfEq VAR_0x8005, 474, ResortArea_SchoolKidMWalkToPlayerZ474 + Message ResortArea_Text_HaveThisVilla ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _02BC - ScrCmd_30C - Message 7 + GoToIfEq VAR_RESULT, MENU_NO, ResortArea_DeclinedVilla + SaveTVSegmentHomeAndManorNoFurniture + Message ResortArea_Text_LoadOffMyMind CloseMessage - CallIfEq VAR_0x8005, 0x1D8, _0280 - CallIfEq VAR_0x8005, 0x1D9, _0294 - CallIfEq VAR_0x8005, 0x1DA, _02A8 - Message 9 + CallIfEq VAR_0x8005, 472, ResortArea_WalkToVillaZ472 + CallIfEq VAR_0x8005, 473, ResortArea_WalkToVillaZ473 + CallIfEq VAR_0x8005, 474, ResortArea_WalkToVillaZ474 + Message ResortArea_Text_StepInside CloseMessage - ApplyMovement 13, _0388 + ApplyMovement LOCALID_SCHOOL_KID_M, ResortArea_Movement_SchoolKidMWalkOnSpotNorth WaitMovement LoadDoorAnimation 25, 14, 22, 21, ANIMATION_TAG_DOOR_1 PlayDoorOpenAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 - ApplyMovement 13, _0390 - ApplyMovement LOCALID_PLAYER, _03C0 + ApplyMovement LOCALID_SCHOOL_KID_M, ResortArea_Movement_SchoolKidMEnterVilla + ApplyMovement LOCALID_PLAYER, ResortArea_Movement_PlayerEnterVilla WaitMovement PlayDoorCloseAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 UnloadAnimation ANIMATION_TAG_DOOR_1 - RemoveObject 13 - SetVar VAR_UNK_0x40C8, 1 - SetVar VAR_RESORT_VILLA_VISITOR, 0xFF + RemoveObject LOCALID_SCHOOL_KID_M + SetVar VAR_RESORT_AREA_STATE, 1 + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_NONE FadeScreenOut WaitFadeScreen Warp MAP_HEADER_VILLA, 0, 10, 6, DIR_WEST @@ -139,160 +140,160 @@ _0184: WaitFadeScreen End -_0266: - ApplyMovement 13, _0328 +ResortArea_SchoolKidMWalkToPlayerZ472: + ApplyMovement LOCALID_SCHOOL_KID_M, ResortArea_Movement_SchoolKidMWalkToPlayerZ472 WaitMovement Return -_0272: +ResortArea_SchoolKidMWalkToPlayerZ473: Return -_0274: - ApplyMovement 13, _0334 +ResortArea_SchoolKidMWalkToPlayerZ474: + ApplyMovement LOCALID_SCHOOL_KID_M, ResortArea_Movement_SchoolKidMWalkToPlayerZ474 WaitMovement Return -_0280: - ApplyMovement 13, _0358 - ApplyMovement LOCALID_PLAYER, _039C +ResortArea_WalkToVillaZ472: + ApplyMovement LOCALID_SCHOOL_KID_M, ResortArea_Movement_SchoolKidMWalkToVillaZ472 + ApplyMovement LOCALID_PLAYER, ResortArea_Movement_PlayerWalkToVillaZ472 WaitMovement Return -_0294: - ApplyMovement 13, _0368 - ApplyMovement LOCALID_PLAYER, _03A8 +ResortArea_WalkToVillaZ473: + ApplyMovement LOCALID_SCHOOL_KID_M, ResortArea_Movement_SchoolKidMWalkToVillaZ473 + ApplyMovement LOCALID_PLAYER, ResortArea_Movement_PlayerWalkToVillaZ473 WaitMovement Return -_02A8: - ApplyMovement 13, _0378 - ApplyMovement LOCALID_PLAYER, _03B4 +ResortArea_WalkToVillaZ474: + ApplyMovement LOCALID_SCHOOL_KID_M, ResortArea_Movement_SchoolKidMWalkToVillaZ474 + ApplyMovement LOCALID_PLAYER, ResortArea_Movement_PlayerWalkToVillaZ474 WaitMovement Return -_02BC: - Message 8 +ResortArea_DeclinedVilla: + Message ResortArea_Text_StillStrikeAsShady CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8005, 0x1D8, _02F2 - CallIfEq VAR_0x8005, 0x1D9, _0306 - CallIfEq VAR_0x8005, 0x1DA, _0312 + CallIfEq VAR_0x8005, 472, ResortArea_WalkBackZ472 + CallIfEq VAR_0x8005, 473, ResortArea_WalkBackZ473 + CallIfEq VAR_0x8005, 474, ResortArea_WalkBackZ474 ReleaseAll End -_02F2: - ApplyMovement 13, _0340 - ApplyMovement LOCALID_PLAYER, _03CC +ResortArea_WalkBackZ472: + ApplyMovement LOCALID_SCHOOL_KID_M, ResortArea_Movement_SchoolKidMWalkBackZ472 + ApplyMovement LOCALID_PLAYER, ResortArea_Movement_PlayerWalkWest WaitMovement Return -_0306: - ApplyMovement LOCALID_PLAYER, _03CC +ResortArea_WalkBackZ473: + ApplyMovement LOCALID_PLAYER, ResortArea_Movement_PlayerWalkWest WaitMovement Return -_0312: - ApplyMovement 13, _034C - ApplyMovement LOCALID_PLAYER, _03CC +ResortArea_WalkBackZ474: + ApplyMovement LOCALID_SCHOOL_KID_M, ResortArea_Movement_SchoolKidMWalkBackZ474 + ApplyMovement LOCALID_PLAYER, ResortArea_Movement_PlayerWalkWest WaitMovement Return .balign 4, 0 -_0328: +ResortArea_Movement_SchoolKidMWalkToPlayerZ472: WalkNormalNorth WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0334: +ResortArea_Movement_SchoolKidMWalkToPlayerZ474: WalkNormalSouth WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0340: +ResortArea_Movement_SchoolKidMWalkBackZ472: WalkNormalSouth WalkOnSpotNormalWest EndMovement .balign 4, 0 -_034C: +ResortArea_Movement_SchoolKidMWalkBackZ474: WalkNormalNorth WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0358: +ResortArea_Movement_SchoolKidMWalkToVillaZ472: WalkNormalEast 6 WalkNormalNorth 2 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0368: +ResortArea_Movement_SchoolKidMWalkToVillaZ473: WalkNormalEast 6 WalkNormalNorth 3 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0378: +ResortArea_Movement_SchoolKidMWalkToVillaZ474: WalkNormalEast 6 WalkNormalNorth 4 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0388: +ResortArea_Movement_SchoolKidMWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0390: +ResortArea_Movement_SchoolKidMEnterVilla: WalkNormalNorth SetInvisible EndMovement .balign 4, 0 -_039C: +ResortArea_Movement_PlayerWalkToVillaZ472: WalkNormalEast 7 WalkNormalNorth EndMovement .balign 4, 0 -_03A8: +ResortArea_Movement_PlayerWalkToVillaZ473: WalkNormalEast 7 WalkNormalNorth 2 EndMovement .balign 4, 0 -_03B4: +ResortArea_Movement_PlayerWalkToVillaZ474: WalkNormalEast 7 WalkNormalNorth 3 EndMovement .balign 4, 0 -_03C0: +ResortArea_Movement_PlayerEnterVilla: WalkNormalNorth 2 SetInvisible EndMovement .balign 4, 0 -_03CC: +ResortArea_Movement_PlayerWalkWest: WalkNormalWest EndMovement -_03D4: +ResortArea_ProfRowan: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 10 + Message ResortArea_Text_RowanAskVisit ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _0429 - Message 11 + GoToIfEq VAR_RESULT, MENU_NO, ResortArea_ProfRowanDeclinedVisit + Message ResortArea_Text_RowanAcceptedVisit CloseMessage - SetFlag FLAG_UNK_0x02AA - SetVar VAR_RESORT_VILLA_VISITOR, 2 + SetFlag FLAG_HIDE_RESORT_AREA_PROF_ROWAN + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_PROF_ROWAN SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen @@ -301,28 +302,28 @@ _03D4: WaitFadeScreen End -_0429: - Message 12 - GoTo _0434 +ResortArea_ProfRowanDeclinedVisit: + Message ResortArea_Text_RowanDeclinedVisit + GoTo ResortArea_VillaVisitorEnd End -_0434: +ResortArea_VillaVisitorEnd: WaitButton CloseMessage ReleaseAll End -_043C: +ResortArea_Roark: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 13 + Message ResortArea_Text_RoarkAskVisit ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _0491 - Message 14 + GoToIfEq VAR_RESULT, MENU_NO, ResortArea_RoarkDeclinedVisit + Message ResortArea_Text_RoarkAcceptedVisit CloseMessage - SetFlag FLAG_UNK_0x02AD - SetVar VAR_RESORT_VILLA_VISITOR, 4 + SetFlag FLAG_HIDE_RESORT_AREA_ROARK + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_ROARK SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen @@ -331,22 +332,22 @@ _043C: WaitFadeScreen End -_0491: - Message 15 - GoTo _0434 +ResortArea_RoarkDeclinedVisit: + Message ResortArea_Text_RoarkDeclinedVisit + GoTo ResortArea_VillaVisitorEnd End -_049C: +ResortArea_Gardenia: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 16 + Message ResortArea_Text_GardeniaAskVisit ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _04F1 - Message 17 + GoToIfEq VAR_RESULT, MENU_NO, ResortArea_GardeniaDeclinedVisit + Message ResortArea_Text_GardeniaAcceptedVisit CloseMessage - SetFlag FLAG_UNK_0x02AF - SetVar VAR_RESORT_VILLA_VISITOR, 5 + SetFlag FLAG_HIDE_RESORT_AREA_GARDENIA + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_GARDENIA SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen @@ -355,22 +356,22 @@ _049C: WaitFadeScreen End -_04F1: - Message 18 - GoTo _0434 +ResortArea_GardeniaDeclinedVisit: + Message ResortArea_Text_GardeniaDeclinedVisit + GoTo ResortArea_VillaVisitorEnd End -_04FC: +ResortArea_Maylene: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 19 + Message ResortArea_Text_MayleneAskVisit ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _0551 - Message 20 + GoToIfEq VAR_RESULT, MENU_NO, ResortArea_MayleneDeclinedVisit + Message ResortArea_Text_MayleneAcceptedVisit CloseMessage - SetFlag FLAG_UNK_0x02B2 - SetVar VAR_RESORT_VILLA_VISITOR, 7 + SetFlag FLAG_HIDE_RESORT_AREA_MAYLENE + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MAYLENE SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen @@ -379,22 +380,22 @@ _04FC: WaitFadeScreen End -_0551: - Message 21 - GoTo _0434 +ResortArea_MayleneDeclinedVisit: + Message ResortArea_Text_MayleneDeclinedVisit + GoTo ResortArea_VillaVisitorEnd End -_055C: +ResortArea_Byron: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 22 + Message ResortArea_Text_ByronAskVisit ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _05B1 - Message 23 + GoToIfEq VAR_RESULT, MENU_NO, ResortArea_ByronDeclinedVisit + Message ResortArea_Text_ByronAcceptedVisit CloseMessage - SetFlag FLAG_UNK_0x02B5 - SetVar VAR_RESORT_VILLA_VISITOR, 9 + SetFlag FLAG_HIDE_RESORT_AREA_BYRON + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_BYRON SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen @@ -403,13 +404,13 @@ _055C: WaitFadeScreen End -_05B1: - Message 24 - GoTo _0434 +ResortArea_ByronDeclinedVisit: + Message ResortArea_Text_ByronDeclinedVisit + GoTo ResortArea_VillaVisitorEnd End -_05BC: - ShowLandmarkSign 27 +ResortArea_SignVilla: + ShowLandmarkSign ResortArea_Text_SignVilla End .balign 4, 0 diff --git a/res/field/scripts/scripts_resort_area_house.s b/res/field/scripts/scripts_resort_area_house.s index 518fdc3345..ceb3ebf75f 100644 --- a/res/field/scripts/scripts_resort_area_house.s +++ b/res/field/scripts/scripts_resort_area_house.s @@ -1,53 +1,54 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area_house.h" +#include "res/field/events/events_resort_area_house.h" - ScriptEntry _000E - ScriptEntry _0034 - ScriptEntry _0047 + ScriptEntry ResortAreaHouse_Collector + ScriptEntry ResortAreaHouse_OldMan + ScriptEntry ResortAreaHouse_NinjaBoy ScriptEntryEnd -_000E: +ResortAreaHouse_Collector: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message ResortAreaHouse_Text_AllINeedIsTV WaitButton CloseMessage - ApplyMovement 0, _002C + ApplyMovement LOCALID_COLLECTOR, ResortAreaHouse_Movement_CollectorWalkOnSpotNorth WaitMovement ReleaseAll End .balign 4, 0 -_002C: +ResortAreaHouse_Movement_CollectorWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement -_0034: - NPCMessage 2 +ResortAreaHouse_OldMan: + NPCMessage ResortAreaHouse_Text_BestTrainersAtFrontier End -_0047: +ResortAreaHouse_NinjaBoy: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _006F - GoToIfEq VAR_RESULT, GENDER_FEMALE, _007A + GoToIfEq VAR_RESULT, GENDER_MALE, ResortAreaHouse_SeenEveryPokemonSinnohMale + GoToIfEq VAR_RESULT, GENDER_FEMALE, ResortAreaHouse_SeenEveryPokemonSinnohFemale End -_006F: - Message 3 - GoTo _0085 +ResortAreaHouse_SeenEveryPokemonSinnohMale: + Message ResortAreaHouse_Text_SeenEveryPokemonSinnohMale + GoTo ResortAreaHouse_NinjaBoyEnd End -_007A: - Message 4 - GoTo _0085 +ResortAreaHouse_SeenEveryPokemonSinnohFemale: + Message ResortAreaHouse_Text_SeenEveryPokemonSinnohFemale + GoTo ResortAreaHouse_NinjaBoyEnd End -_0085: +ResortAreaHouse_NinjaBoyEnd: WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_resort_area_pokecenter_1f.s b/res/field/scripts/scripts_resort_area_pokecenter_1f.s index 489ab4f534..d0d8101dbf 100644 --- a/res/field/scripts/scripts_resort_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_resort_area_pokecenter_1f.s @@ -1,20 +1,21 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area_pokecenter_1f.h" +#include "res/field/events/events_resort_area_pokecenter_1f.h" - ScriptEntry _000E - ScriptEntry _001A - ScriptEntry _002D + ScriptEntry ResortAreaPokecenter1F_Nurse + ScriptEntry ResortAreaPokecenter1F_RichBoy + ScriptEntry ResortAreaPokecenter1F_Idol ScriptEntryEnd -_000E: - Common_CallPokecenterNurse 0 +ResortAreaPokecenter1F_Nurse: + Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE End -_001A: - NPCMessage 0 +ResortAreaPokecenter1F_RichBoy: + NPCMessage ResortAreaPokecenter1F_Text_DoAHeadstand End -_002D: - NPCMessage 1 +ResortAreaPokecenter1F_Idol: + NPCMessage ResortAreaPokecenter1F_Text_EveryoneKnowsPokemon End diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s index d7b95e86a9..0cd9006d17 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s @@ -1,68 +1,69 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area_ribbon_syndicate_1f.h" +#include "res/field/events/events_resort_area_ribbon_syndicate_1f.h" #include "generated/ribbons.h" - ScriptEntry _00C0 - ScriptEntry _00D6 - ScriptEntry _0269 - ScriptEntry _027C - ScriptEntry _02BA - ScriptEntry _02D9 - ScriptEntry _003F - ScriptEntry _0022 + ScriptEntry ResortAreaRibbonSyndicate1F_Beauty + ScriptEntry ResortAreaRibbonSyndicate1F_CashierF + ScriptEntry ResortAreaRibbonSyndicate1F_MiddleAgedWoman + ScriptEntry ResortAreaRibbonSyndicate1F_Lady + ScriptEntry ResortAreaRibbonSyndicate1F_Skitty + ScriptEntry ResortAreaRibbonSyndicate1F_Psyduck + ScriptEntry ResortAreaRibbonSyndicate1F_OnFrameCheckEntry + ScriptEntry ResortAreaRibbonSyndicate1F_OnTransition ScriptEntryEnd -_0022: - GoToIfSet FLAG_UNK_0x00FA, _002F +ResortAreaRibbonSyndicate1F_OnTransition: + GoToIfSet FLAG_JOINED_RIBBON_SYNDICATE, ResortAreaRibbonSyndicate1F_SetBeautyPositionAwayFromDoor End -_002F: - SetObjectEventPos 0, 16, 14 - SetObjectEventDir 0, DIR_SOUTH +ResortAreaRibbonSyndicate1F_SetBeautyPositionAwayFromDoor: + SetObjectEventPos LOCALID_BEAUTY, 16, 14 + SetObjectEventDir LOCALID_BEAUTY, DIR_SOUTH End -_003F: +ResortAreaRibbonSyndicate1F_OnFrameCheckEntry: LockAll WaitTime 20, VAR_RESULT CountPartyRibbons VAR_0x8004 - GoToIfLt VAR_0x8004, 10, _0078 - SetVar VAR_UNK_0x40A7, 1 - SetFlag FLAG_UNK_0x00FA + GoToIfLt VAR_0x8004, 10, ResortAreaRibbonSyndicate1F_DenyEntry + SetVar VAR_RESORT_AREA_RIBBON_SYNDICATE_1F_STATE, 1 + SetFlag FLAG_JOINED_RIBBON_SYNDICATE BufferPlayerName 0 - Message 1 + Message ResortAreaRibbonSyndicate1F_Text_YouMustJoinUs CloseMessage - ApplyMovement 0, _00AC + ApplyMovement LOCALID_BEAUTY, ResortAreaRibbonSyndicate1F_Movement_BeautyMoveAside WaitMovement ReleaseAll End -_0078: - Message 0 +ResortAreaRibbonSyndicate1F_DenyEntry: + Message ResortAreaRibbonSyndicate1F_Text_CollectLotsOfRibbons CloseMessage WaitTime 20, VAR_RESULT FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_RESORT_AREA, 0, 0x338, 0x1C6, DIR_SOUTH + Warp MAP_HEADER_RESORT_AREA, 0, 824, 454, DIR_SOUTH FadeScreenIn WaitFadeScreen ReleaseAll End .balign 4, 0 -_00AC: +ResortAreaRibbonSyndicate1F_Movement_BeautyMoveAside: FaceWest LockDir WalkNormalEast UnlockDir EndMovement -_00C0: +ResortAreaRibbonSyndicate1F_Beauty: BufferPlayerName 0 - NPCMessage 2 + NPCMessage ResortAreaRibbonSyndicate1F_Text_LookedForwardSeeingYou End -_00D6: +ResortAreaRibbonSyndicate1F_CashierF: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer @@ -70,26 +71,26 @@ _00D6: BufferPlayerName 0 BufferPartyMonSpecies 2, VAR_0x8000 GetPartyMonRibbon VAR_RESULT, VAR_0x8000, RIBBON_GORGEOUS_ROYAL - GoToIfEq VAR_RESULT, 1, _0244 + GoToIfEq VAR_RESULT, TRUE, ResortAreaRibbonSyndicate1F_ThatsGorgeousRoyalRibbon GetPartyMonRibbon VAR_RESULT, VAR_0x8000, RIBBON_ROYAL - GoToIfEq VAR_RESULT, 1, _01E7 + GoToIfEq VAR_RESULT, TRUE, ResortAreaRibbonSyndicate1F_OfferGorgeousRoyalRibbon GetPartyMonRibbon VAR_RESULT, VAR_0x8000, RIBBON_GORGEOUS - GoToIfEq VAR_RESULT, 1, _018A - GoTo _012F + GoToIfEq VAR_RESULT, TRUE, ResortAreaRibbonSyndicate1F_OfferRoyalRibbon + GoTo ResortAreaRibbonSyndicate1F_OfferGorgeousRibbon -_012F: +ResortAreaRibbonSyndicate1F_OfferGorgeousRibbon: ShowMoney 20, 2 - Message 3 + Message ResortAreaRibbonSyndicate1F_Text_OfferGorgeousRibbon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _025C - GoToIfNotEnoughMoney 10000, _024F + GoToIfEq VAR_RESULT, MENU_NO, ResortAreaRibbonSyndicate1F_PleaseVisitAgain + GoToIfNotEnoughMoney 10000, ResortAreaRibbonSyndicate1F_DontJokeAboutMoney AddToGameRecord RECORD_MONEY_SPENT, 10000 RemoveMoney 10000 UpdateMoneyDisplay PlaySE SEQ_SE_DP_REGI WaitSE SEQ_SE_DP_REGI - Message 7 - Message 8 + Message ResortAreaRibbonSyndicate1F_Text_BoughtGorgeousRibbon + Message ResortAreaRibbonSyndicate1F_Text_PutGorgeousRibbonOnPokemon WaitButton SetPartyMonRibbon VAR_0x8000, RIBBON_GORGEOUS CloseMessage @@ -97,19 +98,19 @@ _012F: ReleaseAll End -_018A: +ResortAreaRibbonSyndicate1F_OfferRoyalRibbon: ShowMoney 20, 2 - Message 4 + Message ResortAreaRibbonSyndicate1F_Text_OfferRoyalRibbon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _025C - GoToIfNotEnoughMoney 100000, _024F + GoToIfEq VAR_RESULT, MENU_NO, ResortAreaRibbonSyndicate1F_PleaseVisitAgain + GoToIfNotEnoughMoney 100000, ResortAreaRibbonSyndicate1F_DontJokeAboutMoney AddToGameRecordBigValue RECORD_MONEY_SPENT, 100000 RemoveMoney 100000 UpdateMoneyDisplay PlaySE SEQ_SE_DP_REGI WaitSE SEQ_SE_DP_REGI - Message 9 - Message 10 + Message ResortAreaRibbonSyndicate1F_Text_BoughtRoyalRibbon + Message ResortAreaRibbonSyndicate1F_Text_PutRoyalRibbonOnPokemon WaitButton SetPartyMonRibbon VAR_0x8000, RIBBON_ROYAL CloseMessage @@ -117,19 +118,19 @@ _018A: ReleaseAll End -_01E7: +ResortAreaRibbonSyndicate1F_OfferGorgeousRoyalRibbon: ShowMoney 20, 2 - Message 5 + Message ResortAreaRibbonSyndicate1F_Text_OfferGorgeousRoyalRibbon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _025C - GoToIfNotEnoughMoney 999999, _024F + GoToIfEq VAR_RESULT, MENU_NO, ResortAreaRibbonSyndicate1F_PleaseVisitAgain + GoToIfNotEnoughMoney 999999, ResortAreaRibbonSyndicate1F_DontJokeAboutMoney AddToGameRecordBigValue RECORD_MONEY_SPENT, 999999 RemoveMoney 999999 UpdateMoneyDisplay PlaySE SEQ_SE_DP_REGI WaitSE SEQ_SE_DP_REGI - Message 11 - Message 12 + Message ResortAreaRibbonSyndicate1F_Text_BoughtGorgeousRoyalRibbon + Message ResortAreaRibbonSyndicate1F_Text_PutRoyalGorgeousRibbonOnPokemon WaitButton SetPartyMonRibbon VAR_0x8000, RIBBON_GORGEOUS_ROYAL CloseMessage @@ -137,60 +138,60 @@ _01E7: ReleaseAll End -_0244: - Message 6 +ResortAreaRibbonSyndicate1F_ThatsGorgeousRoyalRibbon: + Message ResortAreaRibbonSyndicate1F_Text_ThatsGorgeousRoyalRibbon WaitButton CloseMessage ReleaseAll End -_024F: - Message 13 +ResortAreaRibbonSyndicate1F_DontJokeAboutMoney: + Message ResortAreaRibbonSyndicate1F_Text_DontJokeAboutMoney WaitButton CloseMessage HideMoney ReleaseAll End -_025C: - Message 14 +ResortAreaRibbonSyndicate1F_PleaseVisitAgain: + Message ResortAreaRibbonSyndicate1F_Text_PleaseVisitAgain WaitButton CloseMessage HideMoney ReleaseAll End -_0269: - NPCMessage 15 +ResortAreaRibbonSyndicate1F_MiddleAgedWoman: + NPCMessage ResortAreaRibbonSyndicate1F_Text_SignOfStatus End -_027C: +ResortAreaRibbonSyndicate1F_Lady: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _02A4 - GoToIfEq VAR_RESULT, GENDER_FEMALE, _02AF + GoToIfEq VAR_RESULT, GENDER_MALE, ResortAreaRibbonSyndicate1F_WishMenPayAttention + GoToIfEq VAR_RESULT, GENDER_FEMALE, ResortAreaRibbonSyndicate1F_WomenWorthyBeingSeen End -_02A4: - Message 16 +ResortAreaRibbonSyndicate1F_WishMenPayAttention: + Message ResortAreaRibbonSyndicate1F_Text_WishMenPayAttention WaitButton CloseMessage ReleaseAll End -_02AF: - Message 17 +ResortAreaRibbonSyndicate1F_WomenWorthyBeingSeen: + Message ResortAreaRibbonSyndicate1F_Text_WomenWorthyBeingSeen WaitButton CloseMessage ReleaseAll End -_02BA: - PokemonCryAndMessage SPECIES_SKITTY, 18 +ResortAreaRibbonSyndicate1F_Skitty: + PokemonCryAndMessage SPECIES_SKITTY, ResortAreaRibbonSyndicate1F_Text_SkittyCry End -_02D9: - PokemonCryAndMessage SPECIES_PSYDUCK, 19 +ResortAreaRibbonSyndicate1F_Psyduck: + PokemonCryAndMessage SPECIES_PSYDUCK, ResortAreaRibbonSyndicate1F_Text_PsyduckCry End diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s index 6c1847d88b..3005a05bf3 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s @@ -1,152 +1,153 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area_ribbon_syndicate_2f.h" +#include "res/field/events/events_resort_area_ribbon_syndicate_2f.h" - ScriptEntry _0012 - ScriptEntry _02E8 - ScriptEntry _02FB - ScriptEntry _030E + ScriptEntry ResortAreaRibbonSyndicate2F_Receptionist3 + ScriptEntry ResortAreaRibbonSyndicate2F_Receptionist1 + ScriptEntry ResortAreaRibbonSyndicate2F_Receptionist2 + ScriptEntry ResortAreaRibbonSyndicate2F_Receptionist4 ScriptEntryEnd -_0012: +ResortAreaRibbonSyndicate2F_Receptionist3: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0AA5, _00E2 - GoToIfEq VAR_MAP_LOCAL_A, 1, _00E2 + GoToIfSet FLAG_GOT_SPA_TREATMENT_RESORT_AREA_RIBBON_SYNDICATE_2F, ResortAreaRibbonSyndicate2F_OneSessionADay + GoToIfEq VAR_MAP_LOCAL_A, 1, ResortAreaRibbonSyndicate2F_OneSessionADay GetFirstNonEggInParty VAR_MAP_LOCAL_0 BufferPlayerName 0 BufferPartyMonNickname 1, VAR_MAP_LOCAL_0 - Message 0 + Message ResortAreaRibbonSyndicate2F_Text_CareToHaveSpaTreatment ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _0058 - GoTo _0063 + GoToIfEq VAR_RESULT, MENU_NO, ResortAreaRibbonSyndicate2F_SeeYouAgain + GoTo ResortAreaRibbonSyndicate2F_RightThisWayPlease -_0058: - Message 1 +ResortAreaRibbonSyndicate2F_SeeYouAgain: + Message ResortAreaRibbonSyndicate2F_Text_SeeYouAgain WaitButton CloseMessage ReleaseAll End -_0063: - Message 2 +ResortAreaRibbonSyndicate2F_RightThisWayPlease: + Message ResortAreaRibbonSyndicate2F_Text_RightThisWayPlease CloseMessage - Call _0160 - GoTo _0074 + Call ResortAreaRibbonSyndicate2F_WalkToChair + GoTo ResortAreaRibbonSyndicate2F_ReadyToBegin -_0074: - Message 3 +ResortAreaRibbonSyndicate2F_ReadyToBegin: + Message ResortAreaRibbonSyndicate2F_Text_ReadyToBegin GetRandom VAR_RESULT, 4 - GoToIfEq VAR_RESULT, 0, _00AA - GoToIfEq VAR_RESULT, 1, _00B3 - GoToIfEq VAR_RESULT, 2, _00BC - GoTo _00C5 + GoToIfEq VAR_RESULT, 0, ResortAreaRibbonSyndicate2F_OilContainsDiamonds + GoToIfEq VAR_RESULT, 1, ResortAreaRibbonSyndicate2F_FoamContainsPearls + GoToIfEq VAR_RESULT, 2, ResortAreaRibbonSyndicate2F_ToxinsForcedOut + GoTo ResortAreaRibbonSyndicate2F_PerfumedByAroma -_00AA: - Message 4 - GoTo _00CE +ResortAreaRibbonSyndicate2F_OilContainsDiamonds: + Message ResortAreaRibbonSyndicate2F_Text_OilContainsDiamonds + GoTo ResortAreaRibbonSyndicate2F_TreatmentEnd -_00B3: - Message 5 - GoTo _00CE +ResortAreaRibbonSyndicate2F_FoamContainsPearls: + Message ResortAreaRibbonSyndicate2F_Text_FoamContainsPearls + GoTo ResortAreaRibbonSyndicate2F_TreatmentEnd -_00BC: - Message 6 - GoTo _00CE +ResortAreaRibbonSyndicate2F_ToxinsForcedOut: + Message ResortAreaRibbonSyndicate2F_Text_ToxinsForcedOut + GoTo ResortAreaRibbonSyndicate2F_TreatmentEnd -_00C5: - Message 7 - GoTo _00CE +ResortAreaRibbonSyndicate2F_PerfumedByAroma: + Message ResortAreaRibbonSyndicate2F_Text_PerfumedByAroma + GoTo ResortAreaRibbonSyndicate2F_TreatmentEnd -_00CE: +ResortAreaRibbonSyndicate2F_TreatmentEnd: CloseMessage PlaySE SEQ_SE_DP_FW367 - Call _00ED + Call ResortAreaRibbonSyndicate2F_IncreaseFriendship WaitButton CloseMessage ReleaseAll End -_00E2: - Message 9 +ResortAreaRibbonSyndicate2F_OneSessionADay: + Message ResortAreaRibbonSyndicate2F_Text_OneSessionADay WaitButton CloseMessage ReleaseAll End -_00ED: +ResortAreaRibbonSyndicate2F_IncreaseFriendship: GetRandom VAR_RESULT, 100 - GoToIfLt VAR_RESULT, 5, _0113 - GoToIfLt VAR_RESULT, 30, _0124 - GoTo _0135 + GoToIfLt VAR_RESULT, 5, ResortAreaRibbonSyndicate2F_MuchMoreFriendly + GoToIfLt VAR_RESULT, 30, ResortAreaRibbonSyndicate2F_MoreFriendly + GoTo ResortAreaRibbonSyndicate2F_LittleMoreFriendly -_0113: +ResortAreaRibbonSyndicate2F_MuchMoreFriendly: IncreasePartyMonFriendship 30, VAR_MAP_LOCAL_0 - Call _0146 - Message 8 + Call ResortAreaRibbonSyndicate2F_FinishTreatment + Message ResortAreaRibbonSyndicate2F_Text_MuchMoreFriendly Return -_0124: +ResortAreaRibbonSyndicate2F_MoreFriendly: IncreasePartyMonFriendship 10, VAR_MAP_LOCAL_0 - Call _0146 - Message 10 + Call ResortAreaRibbonSyndicate2F_FinishTreatment + Message ResortAreaRibbonSyndicate2F_Text_MoreFriendly Return -_0135: +ResortAreaRibbonSyndicate2F_LittleMoreFriendly: IncreasePartyMonFriendship 5, VAR_MAP_LOCAL_0 - Call _0146 - Message 11 + Call ResortAreaRibbonSyndicate2F_FinishTreatment + Message ResortAreaRibbonSyndicate2F_Text_LittleMoreFriendly Return -_0146: +ResortAreaRibbonSyndicate2F_FinishTreatment: WaitSE SEQ_SE_DP_FW367 - SetFlag FLAG_UNK_0x0AA5 + SetFlag FLAG_GOT_SPA_TREATMENT_RESORT_AREA_RIBBON_SYNDICATE_2F SetVar VAR_MAP_LOCAL_A, 1 - ApplyMovement 1, _02DC + ApplyMovement LOCALID_RECEPTIONIST_2, ResortAreaRibbonSyndicate2F_Movement_Receptionist2MoveAside WaitMovement Return -_0160: +ResortAreaRibbonSyndicate2F_WalkToChair: GetPlayerMapPos VAR_0x8005, VAR_0x8006 - GoToIfEq VAR_0x8005, 11, _0193 - GoToIfEq VAR_0x8005, 13, _01AB - GoToIfEq VAR_0x8006, 4, _01C3 - GoTo _01DB + GoToIfEq VAR_0x8005, 11, ResortAreaRibbonSyndicate2F_WalkToChairX11 + GoToIfEq VAR_0x8005, 13, ResortAreaRibbonSyndicate2F_WalkToChairX13 + GoToIfEq VAR_0x8006, 4, ResortAreaRibbonSyndicate2F_WalkToChairZ4 + GoTo ResortAreaRibbonSyndicate2F_WalkToChairZ6 -_0193: - ApplyMovement LOCALID_PLAYER, _026C - ApplyMovement 2, _0210 +ResortAreaRibbonSyndicate2F_WalkToChairX11: + ApplyMovement LOCALID_PLAYER, ResortAreaRibbonSyndicate2F_Movement_PlayerWalkToChairX11 + ApplyMovement LOCALID_RECEPTIONIST_3, ResortAreaRibbonSyndicate2F_Movement_Receptionist3WalkToChairX11 WaitMovement - GoTo _01F3 + GoTo ResortAreaRibbonSyndicate2F_ReceptionistsSurroundPlayer -_01AB: - ApplyMovement LOCALID_PLAYER, _0280 - ApplyMovement 2, _0224 +ResortAreaRibbonSyndicate2F_WalkToChairX13: + ApplyMovement LOCALID_PLAYER, ResortAreaRibbonSyndicate2F_Movement_PlayerWalkToChairX13 + ApplyMovement LOCALID_RECEPTIONIST_3, ResortAreaRibbonSyndicate2F_Movement_Receptionist3WalkToChairX13 WaitMovement - GoTo _01F3 + GoTo ResortAreaRibbonSyndicate2F_ReceptionistsSurroundPlayer -_01C3: - ApplyMovement LOCALID_PLAYER, _0294 - ApplyMovement 2, _023C +ResortAreaRibbonSyndicate2F_WalkToChairZ4: + ApplyMovement LOCALID_PLAYER, ResortAreaRibbonSyndicate2F_Movement_PlayerWalkToChairZ4 + ApplyMovement LOCALID_RECEPTIONIST_3, ResortAreaRibbonSyndicate2F_Movement_Receptionist3WalkToChairZ4 WaitMovement - GoTo _01F3 + GoTo ResortAreaRibbonSyndicate2F_ReceptionistsSurroundPlayer -_01DB: - ApplyMovement LOCALID_PLAYER, _02AC - ApplyMovement 2, _0250 +ResortAreaRibbonSyndicate2F_WalkToChairZ6: + ApplyMovement LOCALID_PLAYER, ResortAreaRibbonSyndicate2F_Movement_PlayerWalkToChairZ6 + ApplyMovement LOCALID_RECEPTIONIST_3, ResortAreaRibbonSyndicate2F_Movement_Receptionist3WalkToChairZ6 WaitMovement - GoTo _01F3 + GoTo ResortAreaRibbonSyndicate2F_ReceptionistsSurroundPlayer -_01F3: - ApplyMovement 0, _02C4 - ApplyMovement 1, _02CC - ApplyMovement 3, _02D4 +ResortAreaRibbonSyndicate2F_ReceptionistsSurroundPlayer: + ApplyMovement LOCALID_RECEPTIONIST_1, ResortAreaRibbonSyndicate2F_Movement_Receptionist1WalkToPlayer + ApplyMovement LOCALID_RECEPTIONIST_2, ResortAreaRibbonSyndicate2F_Movement_Receptionist2WalkToPlayer + ApplyMovement LOCALID_RECEPTIONIST_4, ResortAreaRibbonSyndicate2F_Movement_Receptionist4WalkToPlayer WaitMovement Return .balign 4, 0 -_0210: +ResortAreaRibbonSyndicate2F_Movement_Receptionist3WalkToChairX11: WalkNormalEast 2 WalkNormalSouth 2 WalkNormalEast 3 @@ -154,7 +155,7 @@ _0210: EndMovement .balign 4, 0 -_0224: +ResortAreaRibbonSyndicate2F_Movement_Receptionist3WalkToChairX13: WalkNormalSouth WalkNormalEast WalkNormalSouth @@ -163,7 +164,7 @@ _0224: EndMovement .balign 4, 0 -_023C: +ResortAreaRibbonSyndicate2F_Movement_Receptionist3WalkToChairZ4: WalkNormalEast 2 WalkNormalSouth 2 WalkNormalEast 3 @@ -171,7 +172,7 @@ _023C: EndMovement .balign 4, 0 -_0250: +ResortAreaRibbonSyndicate2F_Movement_Receptionist3WalkToChairZ6: WalkNormalEast WalkNormalSouth WalkNormalEast 2 @@ -181,7 +182,7 @@ _0250: EndMovement .balign 4, 0 -_026C: +ResortAreaRibbonSyndicate2F_Movement_PlayerWalkToChairX11: WalkNormalEast 3 WalkNormalSouth 2 WalkNormalEast 2 @@ -189,7 +190,7 @@ _026C: EndMovement .balign 4, 0 -_0280: +ResortAreaRibbonSyndicate2F_Movement_PlayerWalkToChairX13: Delay8 2 WalkNormalSouth 2 WalkNormalEast 3 @@ -197,7 +198,7 @@ _0280: EndMovement .balign 4, 0 -_0294: +ResortAreaRibbonSyndicate2F_Movement_PlayerWalkToChairZ4: WalkNormalSouth WalkNormalEast 3 WalkNormalSouth 2 @@ -206,7 +207,7 @@ _0294: EndMovement .balign 4, 0 -_02AC: +ResortAreaRibbonSyndicate2F_Movement_PlayerWalkToChairZ6: Delay8 2 WalkNormalEast 3 WalkNormalSouth @@ -215,36 +216,36 @@ _02AC: EndMovement .balign 4, 0 -_02C4: +ResortAreaRibbonSyndicate2F_Movement_Receptionist1WalkToPlayer: WalkNormalSouth EndMovement .balign 4, 0 -_02CC: +ResortAreaRibbonSyndicate2F_Movement_Receptionist2WalkToPlayer: WalkNormalEast 3 EndMovement .balign 4, 0 -_02D4: +ResortAreaRibbonSyndicate2F_Movement_Receptionist4WalkToPlayer: WalkNormalNorth 4 EndMovement .balign 4, 0 -_02DC: +ResortAreaRibbonSyndicate2F_Movement_Receptionist2MoveAside: WalkNormalNorth WalkOnSpotNormalSouth EndMovement -_02E8: - NPCMessage 12 +ResortAreaRibbonSyndicate2F_Receptionist1: + NPCMessage ResortAreaRibbonSyndicate2F_Text_KeepFromSeeingOthers End -_02FB: - NPCMessage 13 +ResortAreaRibbonSyndicate2F_Receptionist2: + NPCMessage ResortAreaRibbonSyndicate2F_Text_OnlyFiveMembersADay End -_030E: - NPCMessage 14 +ResortAreaRibbonSyndicate2F_Receptionist4: + NPCMessage ResortAreaRibbonSyndicate2F_Text_BringMembersCloser End .balign 4, 0 diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s index 7c02a81da9..ebfe4a2229 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s @@ -1,6 +1,7 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area_ribbon_syndicate_elevator.h" #include "res/text/bank/menu_entries.h" +#include "res/field/events/events_resort_area_ribbon_syndicate_elevator.h" ScriptEntry ResortAreaRibbonSyndicateElevator_TalkElevatorOperator @@ -62,7 +63,7 @@ ResortAreaRibbonSyndicateElevator_ElevatorAnimation: CallIfEq VAR_0x8004, ELEVATOR_DIR_DOWN, ResortAreaRibbonSyndicateElevator_GoingDownMessage CallIfEq VAR_0x8004, ELEVATOR_DIR_UP, ResortAreaRibbonSyndicateElevator_GoingUpMessage CloseMessage - ApplyMovement 0, ResortAreaRibbonSyndicateElevator_LookDown + ApplyMovement LOCALID_RECEPTIONIST, ResortAreaRibbonSyndicateElevator_Movement_ReceptionistWalkOnSpotSouth WaitMovement WaitSE SEQ_SE_CONFIRM PlayElevatorAnimation VAR_0x8004, 4 @@ -100,6 +101,6 @@ ResortAreaRibbonSyndicateElevator_SelectCurrentFloor: End .balign 4, 0 -ResortAreaRibbonSyndicateElevator_LookDown: +ResortAreaRibbonSyndicateElevator_Movement_ReceptionistWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_resort_area_mart.s b/res/field/scripts/scripts_unused_resort_area_mart.s similarity index 69% rename from res/field/scripts/scripts_resort_area_mart.s rename to res/field/scripts/scripts_unused_resort_area_mart.s index 476b0e7cdd..b2909a931e 100644 --- a/res/field/scripts/scripts_resort_area_mart.s +++ b/res/field/scripts/scripts_unused_resort_area_mart.s @@ -1,11 +1,11 @@ #include "macros/scrcmd.inc" - ScriptEntry _000A + ScriptEntry ResortAreaMart_CashierF ScriptEntry _0020 ScriptEntryEnd -_000A: +ResortAreaMart_CashierF: PokeMartCommonWithGreeting End diff --git a/res/field/scripts/scripts_villa.s b/res/field/scripts/scripts_villa.s index b90a5efcb7..b1e1f53bb4 100644 --- a/res/field/scripts/scripts_villa.s +++ b/res/field/scripts/scripts_villa.s @@ -1,27 +1,28 @@ #include "macros/scrcmd.inc" #include "res/text/bank/villa.h" +#include "res/field/events/events_villa.h" - ScriptEntry _00B2 - ScriptEntry _029C - ScriptEntry _030C - ScriptEntry _0432 - ScriptEntry _049C - ScriptEntry _050C - ScriptEntry _0576 - ScriptEntry _05E0 - ScriptEntry _064A - ScriptEntry _06C4 - ScriptEntry _0734 - ScriptEntry _079E - ScriptEntry _0815 - ScriptEntry _0944 - ScriptEntry _09AE - ScriptEntry _0A50 - ScriptEntry _0AF4 - ScriptEntry _0B5C - ScriptEntry _0BBC - ScriptEntry _0C24 + ScriptEntry Villa_OnTransition + ScriptEntry Villa_Rival + ScriptEntry Villa_Counterpart + ScriptEntry Villa_ProfRowan + ScriptEntry Villa_Mom + ScriptEntry Villa_Roark + ScriptEntry Villa_Gardenia + ScriptEntry Villa_Fantina + ScriptEntry Villa_Maylene + ScriptEntry Villa_CrasherWake + ScriptEntry Villa_Byron + ScriptEntry Villa_Candice + ScriptEntry Villa_Volkner + ScriptEntry Villa_Cynthia + ScriptEntry Villa_Flint + ScriptEntry Villa_MayleneAndCandice + ScriptEntry Villa_TriggerFantina + ScriptEntry Villa_TriggerCrasherWake + ScriptEntry Villa_TriggerCandice + ScriptEntry Villa_TriggerCynthia ScriptEntry Villa_Furniture_Table ScriptEntry Villa_Furniture_BigSofa ScriptEntry Villa_Furniture_SmallSofa @@ -42,769 +43,769 @@ ScriptEntry Villa_Furniture_Masterpiece ScriptEntry Villa_Furniture_TeaSet ScriptEntry Villa_Furniture_Chandelier - ScriptEntry _0E65 - ScriptEntry _0EB4 - ScriptEntry _15F3 - ScriptEntry _1624 + ScriptEntry Villa_OnFrameFirstEntry + ScriptEntry Villa_SchoolKidM + ScriptEntry Villa_TriggerDontGoYet + ScriptEntry Villa_OrderForm ScriptEntryEnd -_00B2: +Villa_OnTransition: InitPersistedMapFeaturesForVilla GetPlayerGender VAR_MAP_LOCAL_0 - CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _01EF - CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, _01F7 - GoToIfSet FLAG_VILLA_VISITOR_OUTSIDE, _01ED - SetFlag FLAG_UNK_0x02A7 - SetFlag FLAG_UNK_0x02A8 - SetFlag FLAG_UNK_0x02A9 - SetFlag FLAG_UNK_0x02AB - SetFlag FLAG_UNK_0x02AC - SetFlag FLAG_UNK_0x02AE - SetFlag FLAG_UNK_0x02B0 - SetFlag FLAG_UNK_0x02B1 - SetFlag FLAG_UNK_0x02B3 - SetFlag FLAG_UNK_0x02B4 - SetFlag FLAG_UNK_0x02B6 - SetFlag FLAG_UNK_0x02B7 - SetFlag FLAG_UNK_0x02B8 - SetFlag FLAG_UNK_0x02B9 - GoToIfEq VAR_RESORT_VILLA_VISITOR, 0xFF, _01FF - SetVar VAR_MAP_LOCAL_F, 0x404E - CallIfEq VAR_RESORT_VILLA_VISITOR, 0, _0201 - CallIfEq VAR_RESORT_VILLA_VISITOR, 1, _0207 - CallIfEq VAR_RESORT_VILLA_VISITOR, 2, _020D - CallIfEq VAR_RESORT_VILLA_VISITOR, 3, _021E - CallIfEq VAR_RESORT_VILLA_VISITOR, 4, _0224 - CallIfEq VAR_RESORT_VILLA_VISITOR, 5, _0235 - CallIfEq VAR_RESORT_VILLA_VISITOR, 6, _0246 - CallIfEq VAR_RESORT_VILLA_VISITOR, 7, _0248 - CallIfEq VAR_RESORT_VILLA_VISITOR, 8, _0259 - CallIfEq VAR_RESORT_VILLA_VISITOR, 9, _025B - CallIfEq VAR_RESORT_VILLA_VISITOR, 10, _026C - CallIfEq VAR_RESORT_VILLA_VISITOR, 11, _026E - CallIfEq VAR_RESORT_VILLA_VISITOR, 12, _0274 - CallIfEq VAR_RESORT_VILLA_VISITOR, 13, _0276 - CallIfEq VAR_RESORT_VILLA_VISITOR, 14, _0280 + CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Villa_SetCounterpartGraphicsDawn + CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, Villa_SetCounterpartGraphicsLucas + GoToIfSet FLAG_VILLA_VISITOR_OUTSIDE, Villa_OnTransitionEnd + SetFlag FLAG_HIDE_VILLA_RIVAL + SetFlag FLAG_HIDE_VILLA_COUNTERPART + SetFlag FLAG_HIDE_VILLA_PROF_ROWAN + SetFlag FLAG_HIDE_VILLA_MOM + SetFlag FLAG_HIDE_VILLA_ROARK + SetFlag FLAG_HIDE_VILLA_GARDENIA + SetFlag FLAG_HIDE_VILLA_FANTINA + SetFlag FLAG_HIDE_VILLA_MAYLENE + SetFlag FLAG_HIDE_VILLA_CRASHER_WAKE + SetFlag FLAG_HIDE_VILLA_BYRON + SetFlag FLAG_HIDE_VILLA_CANDICE + SetFlag FLAG_HIDE_VILLA_VOLKNER + SetFlag FLAG_HIDE_VILLA_CYNTHIA + SetFlag FLAG_HIDE_VILLA_FLINT + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_NONE, Villa_DontShowVisitor + SetVar VAR_MAP_LOCAL_F, VAR_RESORT_VILLA_VISITOR + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_RIVAL, Villa_ShowRival + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_COUNTERPART, Villa_ShowCounterpart + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_PROF_ROWAN, Villa_TryShowProfRowan + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MOM, Villa_ShowMom + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_ROARK, Villa_TryShowRoark + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_GARDENIA, Villa_TryShowGardenia + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_FANTINA, Villa_OnTransitionFantinaReturn + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MAYLENE, Villa_TryShowMaylene + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CRASHER_WAKE, Villa_OnTransitionWakeReturn + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_BYRON, Villa_TryShowByron + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CANDICE, Villa_OnTransitionCandiceReturn + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_VOLKNER, Villa_ShowVolkner + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CYNTHIA, Villa_OnTransitionCynthiaReturn + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_FLINT_VOLKNER, Villa_ShowFlintAndVolkner + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MAYLENE_CANDICE, Villa_ShowMayleneAndCandice End -_01ED: +Villa_OnTransitionEnd: End -_01EF: - SetVar VAR_OBJ_GFX_ID_1, 97 +Villa_SetCounterpartGraphicsDawn: + SetVar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_PLAYER_F Return -_01F7: - SetVar VAR_OBJ_GFX_ID_1, 0 +Villa_SetCounterpartGraphicsLucas: + SetVar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_PLAYER_M Return -_01FF: +Villa_DontShowVisitor: End -_0201: - ClearFlag FLAG_UNK_0x02A7 +Villa_ShowRival: + ClearFlag FLAG_HIDE_VILLA_RIVAL Return -_0207: - ClearFlag FLAG_UNK_0x02A8 +Villa_ShowCounterpart: + ClearFlag FLAG_HIDE_VILLA_COUNTERPART Return -_020D: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _029A - ClearFlag FLAG_UNK_0x02A9 +Villa_TryShowProfRowan: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_TryShowVisitorReturn + ClearFlag FLAG_HIDE_VILLA_PROF_ROWAN Return -_021E: - ClearFlag FLAG_UNK_0x02AB +Villa_ShowMom: + ClearFlag FLAG_HIDE_VILLA_MOM Return -_0224: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _029A - ClearFlag FLAG_UNK_0x02AC +Villa_TryShowRoark: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_TryShowVisitorReturn + ClearFlag FLAG_HIDE_VILLA_ROARK Return -_0235: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _029A - ClearFlag FLAG_UNK_0x02AE +Villa_TryShowGardenia: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_TryShowVisitorReturn + ClearFlag FLAG_HIDE_VILLA_GARDENIA Return -_0246: +Villa_OnTransitionFantinaReturn: Return -_0248: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _029A - ClearFlag FLAG_UNK_0x02B1 +Villa_TryShowMaylene: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_TryShowVisitorReturn + ClearFlag FLAG_HIDE_VILLA_MAYLENE Return -_0259: +Villa_OnTransitionWakeReturn: Return -_025B: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _029A - ClearFlag FLAG_UNK_0x02B4 +Villa_TryShowByron: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_TryShowVisitorReturn + ClearFlag FLAG_HIDE_VILLA_BYRON Return -_026C: +Villa_OnTransitionCandiceReturn: Return -_026E: - ClearFlag FLAG_UNK_0x02B7 +Villa_ShowVolkner: + ClearFlag FLAG_HIDE_VILLA_VOLKNER Return -_0274: +Villa_OnTransitionCynthiaReturn: Return -_0276: - ClearFlag FLAG_UNK_0x02B9 - ClearFlag FLAG_UNK_0x02B7 +Villa_ShowFlintAndVolkner: + ClearFlag FLAG_HIDE_VILLA_FLINT + ClearFlag FLAG_HIDE_VILLA_VOLKNER Return -_0280: - SetObjectEventPos 7, 6, 8 - SetObjectEventPos 10, 7, 8 - ClearFlag FLAG_UNK_0x02B1 - ClearFlag FLAG_UNK_0x02B6 +Villa_ShowMayleneAndCandice: + SetObjectEventPos LOCALID_MAYLENE, 6, 8 + SetObjectEventPos LOCALID_CANDICE, 7, 8 + ClearFlag FLAG_HIDE_VILLA_MAYLENE + ClearFlag FLAG_HIDE_VILLA_CANDICE Return -_029A: +Villa_TryShowVisitorReturn: Return -_029C: +Villa_Rival: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer BufferRivalName 0 BufferPlayerName 1 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _02F3 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _02F8 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _02FD - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _0302 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0307 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_RivalMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_RivalMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_RivalMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_RivalMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_RivalMessage4 + GoTo Villa_VisitorEnd End -_02F3: - Message pl_msg_00000602_00015 +Villa_RivalMessage0: + Message Villa_Text_RivalMessage0 Return -_02F8: - Message pl_msg_00000602_00016 +Villa_RivalMessage1: + Message Villa_Text_RivalMessage1 Return -_02FD: - Message pl_msg_00000602_00017 +Villa_RivalMessage2: + Message Villa_Text_RivalMessage2 Return -_0302: - Message pl_msg_00000602_00018 +Villa_RivalMessage3: + Message Villa_Text_RivalMessage3 Return -_0307: - Message pl_msg_00000602_00019 +Villa_RivalMessage4: + Message Villa_Text_RivalMessage4 Return -_030C: +Villa_Counterpart: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer BufferPlayerName 1 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _0360 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _0380 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _03A0 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _03C0 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _03E0 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_CounterpartMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_CounterpartMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_CounterpartMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_CounterpartMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_CounterpartMessage4 + GoTo Villa_VisitorEnd End -_0360: +Villa_CounterpartMessage0: GetPlayerGender VAR_MAP_LOCAL_0 - CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _0400 - CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, _0405 + CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Villa_DawnMessage0 + CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, Villa_LucasMessage0 Return -_0380: +Villa_CounterpartMessage1: GetPlayerGender VAR_MAP_LOCAL_0 - CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _040A - CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, _040F + CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Villa_DawnMessage1 + CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, Villa_LucasMessage1 Return -_03A0: +Villa_CounterpartMessage2: GetPlayerGender VAR_MAP_LOCAL_0 - CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _0414 - CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, _0419 + CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Villa_DawnMessage2 + CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, Villa_LucasMessage2 Return -_03C0: +Villa_CounterpartMessage3: GetPlayerGender VAR_MAP_LOCAL_0 - CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _041E - CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, _0423 + CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Villa_DawnMessage3 + CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, Villa_LucasMessage3 Return -_03E0: +Villa_CounterpartMessage4: GetPlayerGender VAR_MAP_LOCAL_0 - CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _0428 - CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, _042D + CallIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Villa_DawnMessage4 + CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, Villa_LucasMessage4 Return -_0400: - Message pl_msg_00000602_00020 +Villa_DawnMessage0: + Message Villa_Text_DawnMessage0 Return -_0405: - Message pl_msg_00000602_00025 +Villa_LucasMessage0: + Message Villa_Text_LucasMessage0 Return -_040A: - Message pl_msg_00000602_00021 +Villa_DawnMessage1: + Message Villa_Text_DawnMessage1 Return -_040F: - Message pl_msg_00000602_00026 +Villa_LucasMessage1: + Message Villa_Text_LucasMessage1 Return -_0414: - Message pl_msg_00000602_00022 +Villa_DawnMessage2: + Message Villa_Text_DawnMessage2 Return -_0419: - Message pl_msg_00000602_00027 +Villa_LucasMessage2: + Message Villa_Text_LucasMessage2 Return -_041E: - Message pl_msg_00000602_00023 +Villa_DawnMessage3: + Message Villa_Text_DawnMessage3 Return -_0423: - Message pl_msg_00000602_00028 +Villa_LucasMessage3: + Message Villa_Text_LucasMessage3 Return -_0428: - Message pl_msg_00000602_00024 +Villa_DawnMessage4: + Message Villa_Text_DawnMessage4 Return -_042D: - Message pl_msg_00000602_00029 +Villa_LucasMessage4: + Message Villa_Text_LucasMessage4 Return -_0432: +Villa_ProfRowan: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _0483 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _0488 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _048D - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _0492 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0497 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_RowanMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_RowanMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_RowanMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_RowanMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_RowanMessage4 + GoTo Villa_VisitorEnd End -_0483: - Message pl_msg_00000602_00030 +Villa_RowanMessage0: + Message Villa_Text_RowanMessage0 Return -_0488: - Message pl_msg_00000602_00031 +Villa_RowanMessage1: + Message Villa_Text_RowanMessage1 Return -_048D: - Message pl_msg_00000602_00032 +Villa_RowanMessage2: + Message Villa_Text_RowanMessage2 Return -_0492: - Message pl_msg_00000602_00033 +Villa_RowanMessage3: + Message Villa_Text_RowanMessage3 Return -_0497: - Message pl_msg_00000602_00034 +Villa_RowanMessage4: + Message Villa_Text_RowanMessage4 Return -_049C: +Villa_Mom: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer BufferRivalName 0 BufferPlayerName 1 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _04F3 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _04F8 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _04FD - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _0502 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0507 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_MomMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_MomMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_MomMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_MomMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_MomMessage4 + GoTo Villa_VisitorEnd End -_04F3: - Message pl_msg_00000602_00035 +Villa_MomMessage0: + Message Villa_Text_MomMessage0 Return -_04F8: - Message pl_msg_00000602_00036 +Villa_MomMessage1: + Message Villa_Text_MomMessage1 Return -_04FD: - Message pl_msg_00000602_00037 +Villa_MomMessage2: + Message Villa_Text_MomMessage2 Return -_0502: - Message pl_msg_00000602_00038 +Villa_MomMessage3: + Message Villa_Text_MomMessage3 Return -_0507: - Message pl_msg_00000602_00039 +Villa_MomMessage4: + Message Villa_Text_MomMessage4 Return -_050C: +Villa_Roark: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _055D - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _0562 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _0567 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _056C - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0571 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_RoarkMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_RoarkMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_RoarkMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_RoarkMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_RoarkMessage4 + GoTo Villa_VisitorEnd End -_055D: - Message pl_msg_00000602_00040 +Villa_RoarkMessage0: + Message Villa_Text_RoarkMessage0 Return -_0562: - Message pl_msg_00000602_00041 +Villa_RoarkMessage1: + Message Villa_Text_RoarkMessage1 Return -_0567: - Message pl_msg_00000602_00042 +Villa_RoarkMessage2: + Message Villa_Text_RoarkMessage2 Return -_056C: - Message pl_msg_00000602_00043 +Villa_RoarkMessage3: + Message Villa_Text_RoarkMessage3 Return -_0571: - Message pl_msg_00000602_00044 +Villa_RoarkMessage4: + Message Villa_Text_RoarkMessage4 Return -_0576: +Villa_Gardenia: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _05C7 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _05CC - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _05D1 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _05D6 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _05DB - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_GardeniaMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_GardeniaMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_GardeniaMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_GardeniaMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_GardeniaMessage4 + GoTo Villa_VisitorEnd End -_05C7: - Message pl_msg_00000602_00045 +Villa_GardeniaMessage0: + Message Villa_Text_GardeniaMessage0 Return -_05CC: - Message pl_msg_00000602_00046 +Villa_GardeniaMessage1: + Message Villa_Text_GardeniaMessage1 Return -_05D1: - Message pl_msg_00000602_00047 +Villa_GardeniaMessage2: + Message Villa_Text_GardeniaMessage2 Return -_05D6: - Message pl_msg_00000602_00048 +Villa_GardeniaMessage3: + Message Villa_Text_GardeniaMessage3 Return -_05DB: - Message pl_msg_00000602_00049 +Villa_GardeniaMessage4: + Message Villa_Text_GardeniaMessage4 Return -_05E0: +Villa_Fantina: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _0631 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _0636 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _063B - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _0640 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0645 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_FantinaMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_FantinaMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_FantinaMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_FantinaMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_FantinaMessage4 + GoTo Villa_VisitorEnd End -_0631: - Message pl_msg_00000602_00050 +Villa_FantinaMessage0: + Message Villa_Text_FantinaMessage0 Return -_0636: - Message pl_msg_00000602_00051 +Villa_FantinaMessage1: + Message Villa_Text_FantinaMessage1 Return -_063B: - Message pl_msg_00000602_00052 +Villa_FantinaMessage2: + Message Villa_Text_FantinaMessage2 Return -_0640: - Message pl_msg_00000602_00053 +Villa_FantinaMessage3: + Message Villa_Text_FantinaMessage3 Return -_0645: - Message pl_msg_00000602_00054 +Villa_FantinaMessage4: + Message Villa_Text_FantinaMessage4 Return -_064A: - GoToIfEq VAR_RESORT_VILLA_VISITOR, 14, _0A50 +Villa_Maylene: + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MAYLENE_CANDICE, Villa_MayleneAndCandice PlaySE SEQ_SE_CONFIRM LockAll FacePlayer BufferPlayerName 1 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _06AB - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _06B0 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _06B5 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _06BA - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _06BF - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_MayleneMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_MayleneMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_MayleneMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_MayleneMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_MayleneMessage4 + GoTo Villa_VisitorEnd End -_06AB: - Message pl_msg_00000602_00055 +Villa_MayleneMessage0: + Message Villa_Text_MayleneMessage0 Return -_06B0: - Message pl_msg_00000602_00056 +Villa_MayleneMessage1: + Message Villa_Text_MayleneMessage1 Return -_06B5: - Message pl_msg_00000602_00057 +Villa_MayleneMessage2: + Message Villa_Text_MayleneMessage2 Return -_06BA: - Message pl_msg_00000602_00058 +Villa_MayleneMessage3: + Message Villa_Text_MayleneMessage3 Return -_06BF: - Message pl_msg_00000602_00059 +Villa_MayleneMessage4: + Message Villa_Text_MayleneMessage4 Return -_06C4: +Villa_CrasherWake: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _0715 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _071D - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _0722 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _072A - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _072F - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_WakeMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_WakeMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_WakeMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_WakeMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_WakeMessage4 + GoTo Villa_VisitorEnd End -_0715: +Villa_WakeMessage0: BufferRivalName 0 - Message pl_msg_00000602_00060 + Message Villa_Text_WakeMessage0 Return -_071D: - Message pl_msg_00000602_00061 +Villa_WakeMessage1: + Message Villa_Text_WakeMessage1 Return -_0722: +Villa_WakeMessage2: BufferRivalName 0 - Message pl_msg_00000602_00062 + Message Villa_Text_WakeMessage2 Return -_072A: - Message pl_msg_00000602_00063 +Villa_WakeMessage3: + Message Villa_Text_WakeMessage3 Return -_072F: - Message pl_msg_00000602_00064 +Villa_WakeMessage4: + Message Villa_Text_WakeMessage4 Return -_0734: +Villa_Byron: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _0785 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _078A - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _078F - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _0794 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0799 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_ByronMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_ByronMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_ByronMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_ByronMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_ByronMessage4 + GoTo Villa_VisitorEnd End -_0785: - Message pl_msg_00000602_00065 +Villa_ByronMessage0: + Message Villa_Text_ByronMessage0 Return -_078A: - Message pl_msg_00000602_00066 +Villa_ByronMessage1: + Message Villa_Text_ByronMessage1 Return -_078F: - Message pl_msg_00000602_00067 +Villa_ByronMessage2: + Message Villa_Text_ByronMessage2 Return -_0794: - Message pl_msg_00000602_00068 +Villa_ByronMessage3: + Message Villa_Text_ByronMessage3 Return -_0799: - Message pl_msg_00000602_00069 +Villa_ByronMessage4: + Message Villa_Text_ByronMessage4 Return -_079E: - GoToIfEq VAR_RESORT_VILLA_VISITOR, 14, _0A50 +Villa_Candice: + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MAYLENE_CANDICE, Villa_MayleneAndCandice PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _07FC - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _0801 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _0806 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _080B - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0810 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_CandiceMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_CandiceMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_CandiceMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_CandiceMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_CandiceMessage4 + GoTo Villa_VisitorEnd End -_07FC: - Message pl_msg_00000602_00070 +Villa_CandiceMessage0: + Message Villa_Text_CandiceMessage0 Return -_0801: - Message pl_msg_00000602_00071 +Villa_CandiceMessage1: + Message Villa_Text_CandiceMessage1 Return -_0806: - Message pl_msg_00000602_00072 +Villa_CandiceMessage2: + Message Villa_Text_CandiceMessage2 Return -_080B: - Message pl_msg_00000602_00073 +Villa_CandiceMessage3: + Message Villa_Text_CandiceMessage3 Return -_0810: - Message pl_msg_00000602_00074 +Villa_CandiceMessage4: + Message Villa_Text_CandiceMessage4 Return -_0815: - GoToIfEq VAR_RESORT_VILLA_VISITOR, 13, _088C +Villa_Volkner: + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_FLINT_VOLKNER, Villa_FlintAndVolkner PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _0873 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _0878 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _087D - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _0882 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0887 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_VolknerMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_VolknerMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_VolknerMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_VolknerMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_VolknerMessage4 + GoTo Villa_VisitorEnd End -_0873: - Message pl_msg_00000602_00075 +Villa_VolknerMessage0: + Message Villa_Text_VolknerMessage0 Return -_0878: - Message pl_msg_00000602_00076 +Villa_VolknerMessage1: + Message Villa_Text_VolknerMessage1 Return -_087D: - Message pl_msg_00000602_00077 +Villa_VolknerMessage2: + Message Villa_Text_VolknerMessage2 Return -_0882: - Message pl_msg_00000602_00078 +Villa_VolknerMessage3: + Message Villa_Text_VolknerMessage3 Return -_0887: - Message pl_msg_00000602_00079 +Villa_VolknerMessage4: + Message Villa_Text_VolknerMessage4 Return -_088C: +Villa_FlintAndVolkner: PlaySE SEQ_SE_CONFIRM LockAll - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _08DB - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _08E2 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _08E9 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _0900 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0917 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_FlintAndVolknerMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_FlintAndVolknerMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_FlintAndVolknerMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_FlintAndVolknerMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_FlintAndVolknerMessage4 + GoTo Villa_VisitorEnd End -_08DB: +Villa_FlintAndVolknerMessage0: FacePlayer - Message pl_msg_00000602_00086 + Message Villa_Text_FlintAndVolknerMessage0 Return -_08E2: +Villa_FlintAndVolknerMessage1: FacePlayer - Message pl_msg_00000602_00088 + Message Villa_Text_FlintAndVolknerMessage1 Return -_08E9: - ApplyMovement 11, _0930 - ApplyMovement 13, _093C +Villa_FlintAndVolknerMessage2: + ApplyMovement LOCALID_VOLKNER, Villa_Movement_VolknerFaceFlint + ApplyMovement LOCALID_FLINT, Villa_Movement_FlintFaceVolkner WaitMovement - Message pl_msg_00000602_00089 + Message Villa_Text_FlintAndVolknerMessage2 Return -_0900: - ApplyMovement 11, _0930 - ApplyMovement 13, _093C +Villa_FlintAndVolknerMessage3: + ApplyMovement LOCALID_VOLKNER, Villa_Movement_VolknerFaceFlint + ApplyMovement LOCALID_FLINT, Villa_Movement_FlintFaceVolkner WaitMovement - Message pl_msg_00000602_00090 + Message Villa_Text_FlintAndVolknerMessage3 Return -_0917: - ApplyMovement 11, _0930 - ApplyMovement 13, _093C +Villa_FlintAndVolknerMessage4: + ApplyMovement LOCALID_VOLKNER, Villa_Movement_VolknerFaceFlint + ApplyMovement LOCALID_FLINT, Villa_Movement_FlintFaceVolkner WaitMovement - Message pl_msg_00000602_00091 + Message Villa_Text_FlintAndVolknerMessage4 Return .balign 4, 0 -_0930: +Villa_Movement_VolknerFaceFlint: Delay8 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_093C: +Villa_Movement_FlintFaceVolkner: WalkOnSpotNormalWest EndMovement -_0944: +Villa_Cynthia: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _0995 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _099A - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _099F - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _09A4 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _09A9 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_CynthiaMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_CynthiaMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_CynthiaMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_CynthiaMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_CynthiaMessage4 + GoTo Villa_VisitorEnd End -_0995: - Message pl_msg_00000602_00080 +Villa_CynthiaMessage0: + Message Villa_Text_CynthiaMessage0 Return -_099A: - Message pl_msg_00000602_00081 +Villa_CynthiaMessage1: + Message Villa_Text_CynthiaMessage1 Return -_099F: - Message pl_msg_00000602_00082 +Villa_CynthiaMessage2: + Message Villa_Text_CynthiaMessage2 Return -_09A4: - Message pl_msg_00000602_00083 +Villa_CynthiaMessage3: + Message Villa_Text_CynthiaMessage3 Return -_09A9: - Message pl_msg_00000602_00084 +Villa_CynthiaMessage4: + Message Villa_Text_CynthiaMessage4 Return -_09AE: +Villa_Flint: PlaySE SEQ_SE_CONFIRM LockAll - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _09FD - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _0A04 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _0A0B - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _0A22 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0A39 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_FlintMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_FlintMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_FlintMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_FlintMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_FlintMessage4 + GoTo Villa_VisitorEnd End -_09FD: +Villa_FlintMessage0: FacePlayer - Message pl_msg_00000602_00085 + Message Villa_Text_FlintMessage0 Return -_0A04: +Villa_FlintMessage1: FacePlayer - Message pl_msg_00000602_00087 + Message Villa_Text_FlintMessage1 Return -_0A0B: - ApplyMovement 11, _0930 - ApplyMovement 13, _093C +Villa_FlintMessage2: + ApplyMovement LOCALID_VOLKNER, Villa_Movement_VolknerFaceFlint + ApplyMovement LOCALID_FLINT, Villa_Movement_FlintFaceVolkner WaitMovement - Message pl_msg_00000602_00089 + Message Villa_Text_FlintAndVolknerMessage2 Return -_0A22: - ApplyMovement 11, _0930 - ApplyMovement 13, _093C +Villa_FlintMessage3: + ApplyMovement LOCALID_VOLKNER, Villa_Movement_VolknerFaceFlint + ApplyMovement LOCALID_FLINT, Villa_Movement_FlintFaceVolkner WaitMovement - Message pl_msg_00000602_00090 + Message Villa_Text_FlintAndVolknerMessage3 Return -_0A39: - ApplyMovement 11, _0930 - ApplyMovement 13, _093C +Villa_FlintMessage4: + ApplyMovement LOCALID_VOLKNER, Villa_Movement_VolknerFaceFlint + ApplyMovement LOCALID_FLINT, Villa_Movement_FlintFaceVolkner WaitMovement - Message pl_msg_00000602_00091 + Message Villa_Text_FlintAndVolknerMessage4 Return -_0A50: +Villa_MayleneAndCandice: PlaySE SEQ_SE_CONFIRM LockAll BufferPlayerName 1 - ApplyMovement 10, _0AE0 - ApplyMovement 7, _0AD8 + ApplyMovement LOCALID_CANDICE, Villa_Movement_CandiceFaceMaylene + ApplyMovement LOCALID_MAYLENE, Villa_Movement_MayleneFaceCandice WaitMovement - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, _0AB4 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, _0AB9 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, _0ABE - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, _0AC3 - CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, _0AC8 - GoTo _0AEC + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 0, Villa_MayleneAndCandiceMessage0 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 1, Villa_MayleneAndCandiceMessage1 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 2, Villa_MayleneAndCandiceMessage2 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 3, Villa_MayleneAndCandiceMessage3 + CallIfEq VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM, 4, Villa_MayleneAndCandiceMessage4 + GoTo Villa_VisitorEnd End -_0AB4: - Message pl_msg_00000602_00092 +Villa_MayleneAndCandiceMessage0: + Message Villa_Text_MayleneAndCandiceMessage0 Return -_0AB9: - Message pl_msg_00000602_00093 +Villa_MayleneAndCandiceMessage1: + Message Villa_Text_MayleneAndCandiceMessage1 Return -_0ABE: - Message pl_msg_00000602_00094 +Villa_MayleneAndCandiceMessage2: + Message Villa_Text_MayleneAndCandiceMessage2 Return -_0AC3: - Message pl_msg_00000602_00095 +Villa_MayleneAndCandiceMessage3: + Message Villa_Text_MayleneAndCandiceMessage3 Return -_0AC8: - GoToIfUnset FLAG_VILLA_FURNITURE_TEA_SET, _0AB4 - Message pl_msg_00000602_00096 +Villa_MayleneAndCandiceMessage4: + GoToIfUnset FLAG_VILLA_FURNITURE_TEA_SET, Villa_MayleneAndCandiceMessage0 + Message Villa_Text_MayleneAndCandiceMessage4 Return .balign 4, 0 -_0AD8: +Villa_Movement_MayleneFaceCandice: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0AE0: +Villa_Movement_CandiceFaceMaylene: Delay8 WalkOnSpotNormalWest EndMovement -_0AEC: +Villa_VisitorEnd: WaitButton CloseMessage ReleaseAll End -_0AF4: +Villa_TriggerFantina: LockAll PlaySE SEQ_SE_DP_DOOR_OPEN - ClearFlag FLAG_UNK_0x02B0 - SetObjectEventPos 6, 11, 11 - SetObjectEventMovementType 6, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 6, DIR_NORTH - AddObject 6 + ClearFlag FLAG_HIDE_VILLA_FANTINA + SetObjectEventPos LOCALID_FANTINA, 11, 11 + SetObjectEventMovementType LOCALID_FANTINA, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_FANTINA, DIR_NORTH + AddObject LOCALID_FANTINA WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement LOCALID_PLAYER, _0B3C - ApplyMovement 6, _0B4C + ApplyMovement LOCALID_PLAYER, Villa_Movement_PlayerWatchFantinaEnter + ApplyMovement LOCALID_FANTINA, Villa_Movement_FantinaEnter WaitMovement SetFlag FLAG_VILLA_VISITOR_OUTSIDE SetVar VAR_MAP_LOCAL_F, 0 @@ -812,30 +813,30 @@ _0AF4: End .balign 4, 0 -_0B3C: +Villa_Movement_PlayerWatchFantinaEnter: WalkOnSpotNormalSouth Delay8 5 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0B4C: +Villa_Movement_FantinaEnter: WalkNormalWest 2 WalkNormalNorth 5 WalkNormalWest 3 EndMovement -_0B5C: +Villa_TriggerCrasherWake: LockAll PlaySE SEQ_SE_DP_DOOR_OPEN - ClearFlag FLAG_UNK_0x02B3 - SetObjectEventPos 9, 11, 11 - SetObjectEventMovementType 9, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 9, DIR_NORTH - AddObject 9 + ClearFlag FLAG_HIDE_VILLA_CRASHER_WAKE + SetObjectEventPos LOCALID_CRASHER_WAKE, 11, 11 + SetObjectEventMovementType LOCALID_CRASHER_WAKE, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_CRASHER_WAKE, DIR_NORTH + AddObject LOCALID_CRASHER_WAKE WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement LOCALID_PLAYER, _0BAC - ApplyMovement 9, _0BA4 + ApplyMovement LOCALID_PLAYER, Villa_Movement_PlayerWatchWakeEnter + ApplyMovement LOCALID_CRASHER_WAKE, Villa_Movement_WakeEnter WaitMovement SetFlag FLAG_VILLA_VISITOR_OUTSIDE SetVar VAR_MAP_LOCAL_F, 0 @@ -843,28 +844,28 @@ _0B5C: End .balign 4, 0 -_0BA4: +Villa_Movement_WakeEnter: WalkNormalEast 8 EndMovement .balign 4, 0 -_0BAC: +Villa_Movement_PlayerWatchWakeEnter: WalkOnSpotNormalSouth Delay8 3 WalkOnSpotNormalEast EndMovement -_0BBC: +Villa_TriggerCandice: LockAll PlaySE SEQ_SE_DP_DOOR_OPEN - ClearFlag FLAG_UNK_0x02B6 - SetObjectEventPos 10, 11, 11 - SetObjectEventMovementType 10, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 10, DIR_NORTH - AddObject 10 + ClearFlag FLAG_HIDE_VILLA_CANDICE + SetObjectEventPos LOCALID_CANDICE, 11, 11 + SetObjectEventMovementType LOCALID_CANDICE, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_CANDICE, DIR_NORTH + AddObject LOCALID_CANDICE WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement LOCALID_PLAYER, _0C14 - ApplyMovement 10, _0C04 + ApplyMovement LOCALID_PLAYER, Villa_Movement_PlayerWatchCandiceEnter + ApplyMovement LOCALID_CANDICE, Villa_Movement_CandiceEnter WaitMovement SetFlag FLAG_VILLA_VISITOR_OUTSIDE SetVar VAR_MAP_LOCAL_F, 0 @@ -872,30 +873,30 @@ _0BBC: End .balign 4, 0 -_0C04: +Villa_Movement_CandiceEnter: WalkNormalWest 2 WalkNormalNorth 3 WalkNormalWest 2 EndMovement .balign 4, 0 -_0C14: +Villa_Movement_PlayerWatchCandiceEnter: WalkOnSpotNormalSouth Delay8 4 WalkOnSpotNormalWest EndMovement -_0C24: +Villa_TriggerCynthia: LockAll PlaySE SEQ_SE_DP_DOOR_OPEN - ClearFlag FLAG_UNK_0x02B8 - SetObjectEventPos 12, 11, 11 - SetObjectEventMovementType 12, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 12, DIR_NORTH - AddObject 12 + ClearFlag FLAG_HIDE_VILLA_CYNTHIA + SetObjectEventPos LOCALID_CYNTHIA, 11, 11 + SetObjectEventMovementType LOCALID_CYNTHIA, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_CYNTHIA, DIR_NORTH + AddObject LOCALID_CYNTHIA WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement LOCALID_PLAYER, _0C78 - ApplyMovement 12, _0C6C + ApplyMovement LOCALID_PLAYER, Villa_Movement_PlayerWatchCynthiaEnter + ApplyMovement LOCALID_CYNTHIA, Villa_Movement_CynthiaEnter WaitMovement SetFlag FLAG_VILLA_VISITOR_OUTSIDE SetVar VAR_MAP_LOCAL_F, 0 @@ -903,13 +904,13 @@ _0C24: End .balign 4, 0 -_0C6C: +Villa_Movement_CynthiaEnter: WalkNormalWest 8 WalkNormalNorth 6 EndMovement .balign 4, 0 -_0C78: +Villa_Movement_PlayerWatchCynthiaEnter: WalkOnSpotNormalSouth Delay8 5 WalkOnSpotNormalWest @@ -918,42 +919,42 @@ _0C78: Villa_Furniture_Table: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_Table + Message Villa_Text_DescriptionTable GoTo Villa_Furniture_End End Villa_Furniture_BigSofa: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_BigSofa + Message Villa_Text_DescriptionBigSofa GoTo Villa_Furniture_End End Villa_Furniture_SmallSofa: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_SmallSofa + Message Villa_Text_DescriptionSmallSofa GoTo Villa_Furniture_End End Villa_Furniture_Bed: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_Bed + Message Villa_Text_DescriptionBed GoTo Villa_Furniture_End End Villa_Furniture_NightTable: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_NightTable + Message Villa_Text_DescriptionNightTable GoTo Villa_Furniture_End End Villa_Furniture_TVDummy: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_TV + Message Villa_Text_DescriptionTV GoTo Villa_Furniture_End End @@ -961,29 +962,29 @@ Villa_Furniture_AudioSystem: PlaySE SEQ_SE_CONFIRM LockAll PlayMusic SEQ_PL_AUDIO - Message Villa_Text_AudioSystem + Message Villa_Text_DescriptionAudioSystem GoTo Villa_Furniture_End End Villa_Furniture_Bookshelf: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_Bookshelf + Message Villa_Text_DescriptionBookshelf GoTo Villa_Furniture_End End Villa_Furniture_Rack: PlaySE SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_VILLA_FURNITURE_MUSIC_BOX, _0D63 - Message Villa_Text_Rack + GoToIfSet FLAG_VILLA_FURNITURE_MUSIC_BOX, Villa_StartMusicBox + Message Villa_Text_DescriptionRack GoTo Villa_Furniture_End End Villa_Furniture_Houseplant: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_Houseplant + Message Villa_Text_DescriptionHouseplant GoTo Villa_Furniture_End End @@ -991,61 +992,61 @@ Villa_Furniture_PCDesk: PlaySE SEQ_SE_CONFIRM LockAll BufferPlayerName 0 - Message Villa_Text_PCDesk + Message Villa_Text_DescriptionPCDesk GoTo Villa_Furniture_End End Villa_Furniture_MusicBox: PlaySE SEQ_SE_CONFIRM LockAll - GoTo _0D63 + GoTo Villa_StartMusicBox End -_0D63: - Message Villa_Text_MusicBox - GoTo _0D6E +Villa_StartMusicBox: + Message Villa_Text_DescriptionMusicBox + GoTo Villa_SetScenePlayBGMMusicBox End -_0D6E: +Villa_SetScenePlayBGMMusicBox: GetCurrentBGM VAR_0x8004 - SetScene22 + SetScenePlayBGMMusicBox SetVar VAR_0x8007, 0 WaitTime 1, VAR_RESULT - GoTo _0D88 + GoTo Villa_WaitSceneEndOrABPress End -_0D88: +Villa_WaitSceneEndOrABPress: AddVar VAR_0x8007, 1 WaitTime 1, VAR_RESULT Dummy1F9 VAR_0x8007 - ScrCmd_2FC VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0DC2 + CheckABPress VAR_RESULT + GoToIfEq VAR_RESULT, TRUE, Villa_RestoreSceneAndBGM Dummy1F9 VAR_0x8007 - GoToIfEq VAR_0x8007, 0x258, _0DC2 - GoTo _0D88 + GoToIfEq VAR_0x8007, 600, Villa_RestoreSceneAndBGM + GoTo Villa_WaitSceneEndOrABPress End -_0DC2: +Villa_RestoreSceneAndBGM: SetFieldScene VAR_0x8004 CloseMessage ReleaseAll End Villa_Unused: - Message Villa_Text_Chandelier + Message Villa_Text_DescriptionChandelier Return Villa_Furniture_PokemonBust: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_PokemonBust + Message Villa_Text_DescriptionPokemonBust GoTo Villa_Furniture_End End Villa_Furniture_PokemonBustSilver: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_PokemonBustSilver + Message Villa_Text_DescriptionPokemonBustSilver GoTo Villa_Furniture_End End @@ -1053,42 +1054,42 @@ Villa_Furniture_Piano: PlaySE SEQ_SE_CONFIRM LockAll PlayMusic SEQ_PL_PIANO - Message Villa_Text_Piano + Message Villa_Text_DescriptionPiano GoTo Villa_Furniture_End End Villa_Furniture_GuestSet: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_GuestSet + Message Villa_Text_DescriptionGuestSet GoTo Villa_Furniture_End End Villa_Furniture_WallClock: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_WallClock + Message Villa_Text_DescriptionWallClock GoTo Villa_Furniture_End End Villa_Furniture_Masterpiece: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_Masterpiece + Message Villa_Text_DescriptionMasterpiece GoTo Villa_Furniture_End End Villa_Furniture_TeaSet: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_TeaSet + Message Villa_Text_DescriptionTeaSet GoTo Villa_Furniture_End End Villa_Furniture_Chandelier: PlaySE SEQ_SE_CONFIRM LockAll - Message Villa_Text_Chandelier + Message Villa_Text_DescriptionChandelier GoTo Villa_Furniture_End End @@ -1098,392 +1099,392 @@ Villa_Furniture_End: ReleaseAll End -_0E65: +Villa_OnFrameFirstEntry: LockAll - SetVar VAR_UNK_0x40A1, 1 + SetVar VAR_VILLA_STATE, 1 ShowMoney 21, 1 - Message Villa_Text_TheOriginalOwnersFurnitureIsGone + Message Villa_Text_OriginalFurnitureIsGone InitLocalTextListMenu 1, 1, 0, VAR_0x8002 - AddListMenuEntry 189, 0 + AddListMenuEntry Villa_Text_EntryTableFree, 0 ShowListMenu - GoToIfNe VAR_0x8002, 0, _0EA7 + GoToIfNe VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_OrderTable Call Villa_BuyFurniture CloseMessage - Call _1092 + Call Villa_WarpAndShowDeliveryGuyAndBook ReleaseAll End -_0EA7: - Message Villa_Text_GoAheadOrderATableFromThisOrderForm +Villa_OrderTable: + Message Villa_Text_OrderTable WaitButton CloseMessage HideMoney ReleaseAll End -_0EB4: +Villa_SchoolKidM: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer ShowMoney 21, 1 - Message Villa_Text_GoAheadOrderATableFromThisOrderForm + Message Villa_Text_OrderTable InitLocalTextListMenu 1, 1, 0, VAR_0x8002 - AddListMenuEntry 189, 0 + AddListMenuEntry Villa_Text_EntryTableFree, 0 ShowListMenu - GoToIfNe VAR_0x8002, 0, _1478 + GoToIfNe VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_OrderTable2 Call Villa_BuyFurniture CloseMessage - Call _1092 + Call Villa_WarpAndShowDeliveryGuyAndBook ReleaseAll End -_0EF6: +Villa_ShowFurnitureListMenu: InitLocalTextListMenu 1, 1, 0, VAR_0x8002 - Call _19E4 - Call _1A05 - Call _1A26 - Call _1A47 - Call _1A68 - Call _1A89 - Call _1AAA - Call _1ACB - Call _1AEC - Call _1B0D - Call _1B2E - Call _1B4F - Call _1B7B - Call _1BAF - Call _1BE3 - Call _1C17 - Call _1C4B - Call _1C7F - Call _1CB3 - Call _1CDF + Call Villa_AddMenuEntryTable + Call Villa_AddMenuEntryBigSofa + Call Villa_AddMenuEntrySmallSofa + Call Villa_AddMenuEntryBed + Call Villa_AddMenuEntryNightTable + Call Villa_AddMenuEntryTV + Call Villa_AddMenuEntryAudioSystem + Call Villa_AddMenuEntryBookshelf + Call Villa_AddMenuEntryRack + Call Villa_AddMenuEntryHouseplant + Call Villa_AddMenuEntryPCDesk + Call Villa_TryAddMenuEntryMusicBox + Call Villa_TryAddMenuEntryPokemonBust + Call Villa_TryAddMenuEntryPokemonBustSilver + Call Villa_TryAddMenuEntryPiano + Call Villa_TryAddMenuEntryGuestSet + Call Villa_TryAddMenuEntryWallClock + Call Villa_TryAddMenuEntryMasterpiece + Call Villa_TryAddMenuEntryTeaSet + Call Villa_TryAddMenuEntryChandelier ShowListMenuSetWidth 18 Return Villa_BuyFurniture: PlaySE SEQ_SE_DP_REGI - CallIfEq VAR_0x8002, 0, Villa_BuyFurniture_Table - CallIfEq VAR_0x8002, 1, Villa_BuyFurniture_BigSofa - CallIfEq VAR_0x8002, 2, Villa_BuyFurniture_SmallSofa - CallIfEq VAR_0x8002, 3, Villa_BuyFurniture_Bed - CallIfEq VAR_0x8002, 4, Villa_BuyFurniture_NightTable - CallIfEq VAR_0x8002, 5, Villa_BuyFurniture_TV - CallIfEq VAR_0x8002, 6, Villa_BuyFurniture_AudioSystem - CallIfEq VAR_0x8002, 7, Villa_BuyFurniture_Bookshelf - CallIfEq VAR_0x8002, 8, Villa_BuyFurniture_Rack - CallIfEq VAR_0x8002, 9, Villa_BuyFurniture_Houseplant - CallIfEq VAR_0x8002, 10, Villa_BuyFurniture_PCDesk - CallIfEq VAR_0x8002, 11, Villa_BuyFurniture_MusicBox - CallIfEq VAR_0x8002, 12, Villa_BuyFurniture_PokemonBust - CallIfEq VAR_0x8002, 13, Villa_BuyFurniture_PokemonBustSilver - CallIfEq VAR_0x8002, 14, Villa_BuyFurniture_Piano - CallIfEq VAR_0x8002, 15, Villa_BuyFurniture_GuestSet - CallIfEq VAR_0x8002, 16, Villa_BuyFurniture_WallClock - CallIfEq VAR_0x8002, 17, Villa_BuyFurniture_Masterpiece - CallIfEq VAR_0x8002, 18, Villa_BuyFurniture_TeaSet - CallIfEq VAR_0x8002, 19, Villa_BuyFurniture_Chandelier + CallIfEq VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_BuyFurniture_Table + CallIfEq VAR_0x8002, VILLA_FURNITURE_BIG_SOFA, Villa_BuyFurniture_BigSofa + CallIfEq VAR_0x8002, VILLA_FURNITURE_SMALL_SOFA, Villa_BuyFurniture_SmallSofa + CallIfEq VAR_0x8002, VILLA_FURNITURE_BED, Villa_BuyFurniture_Bed + CallIfEq VAR_0x8002, VILLA_FURNITURE_NIGHT_TABLE, Villa_BuyFurniture_NightTable + CallIfEq VAR_0x8002, VILLA_FURNITURE_TV, Villa_BuyFurniture_TV + CallIfEq VAR_0x8002, VILLA_FURNITURE_AUDIO_SYSTEM, Villa_BuyFurniture_AudioSystem + CallIfEq VAR_0x8002, VILLA_FURNITURE_BOOKSHELF, Villa_BuyFurniture_Bookshelf + CallIfEq VAR_0x8002, VILLA_FURNITURE_RACK, Villa_BuyFurniture_Rack + CallIfEq VAR_0x8002, VILLA_FURNITURE_HOUSEPLANT, Villa_BuyFurniture_Houseplant + CallIfEq VAR_0x8002, VILLA_FURNITURE_PC_DESK, Villa_BuyFurniture_PCDesk + CallIfEq VAR_0x8002, VILLA_FURNITURE_MUSIC_BOX, Villa_BuyFurniture_MusicBox + CallIfEq VAR_0x8002, VILLA_FURNITURE_POKEMON_BUST, Villa_BuyFurniture_PokemonBust + CallIfEq VAR_0x8002, VILLA_FURNITURE_POKEMON_BUST_SILVER, Villa_BuyFurniture_PokemonBustSilver + CallIfEq VAR_0x8002, VILLA_FURNITURE_PIANO, Villa_BuyFurniture_Piano + CallIfEq VAR_0x8002, VILLA_FURNITURE_GUEST_SET, Villa_BuyFurniture_GuestSet + CallIfEq VAR_0x8002, VILLA_FURNITURE_WALL_CLOCK, Villa_BuyFurniture_WallClock + CallIfEq VAR_0x8002, VILLA_FURNITURE_MASTERPIECE, Villa_BuyFurniture_Masterpiece + CallIfEq VAR_0x8002, VILLA_FURNITURE_TEA_SET, Villa_BuyFurniture_TeaSet + CallIfEq VAR_0x8002, VILLA_FURNITURE_CHANDELIER, Villa_BuyFurniture_Chandelier UpdateMoneyDisplay WaitSE SEQ_SE_DP_REGI HideMoney - ScrCmd_30D VAR_0x8002 + SaveTVSegmentHomeAndManor VAR_0x8002 Return -_1092: - ClearFlag FLAG_UNK_0x02C5 - ClearFlag FLAG_UNK_0x02C7 +Villa_WarpAndShowDeliveryGuyAndBook: + ClearFlag FLAG_HIDE_VILLA_DELIVERY_GUY + ClearFlag FLAG_HIDE_VILLA_BOOK FadeScreenOut WaitFadeScreen Warp MAP_HEADER_VILLA, 0, 10, 6, DIR_SOUTH FadeScreenIn WaitFadeScreen - GoToIfEq VAR_0x8002, 0, _1485 - GoToIfNe VAR_0x8002, 0, _1514 + GoToIfEq VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_DeliverFreeTable + GoToIfNe VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_DeliveringOrder End -_10DA: - Call _2209 - GoToIfEq VAR_RESORT_VILLA_VISITOR, 0, _1103 - SetObjectEventPos 1, 11, 11 - SetObjectEventMovementType 1, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 1, DIR_NORTH +Villa_AddTableRival: + Call Villa_TryRemoveVisitor + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_RIVAL, Villa_AddRival + SetObjectEventPos LOCALID_RIVAL, 11, 11 + SetObjectEventMovementType LOCALID_RIVAL, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_RIVAL, DIR_NORTH Return -_1103: - SetObjectEventPos 1, 10, 8 - SetObjectEventMovementType 1, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 1, DIR_NORTH - ClearFlag FLAG_UNK_0x02A7 - AddObject 1 +Villa_AddRival: + SetObjectEventPos LOCALID_RIVAL, 10, 8 + SetObjectEventMovementType LOCALID_RIVAL, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_RIVAL, DIR_NORTH + ClearFlag FLAG_HIDE_VILLA_RIVAL + AddObject LOCALID_RIVAL Return -_1121: - Call _2209 - GoToIfEq VAR_RESORT_VILLA_VISITOR, 1, _114A - SetObjectEventPos 0, 11, 11 - SetObjectEventMovementType 0, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 0, DIR_NORTH +Villa_AddSmallSofaCounterpart: + Call Villa_TryRemoveVisitor + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_COUNTERPART, Villa_AddCounterpart + SetObjectEventPos LOCALID_COUNTERPART, 11, 11 + SetObjectEventMovementType LOCALID_COUNTERPART, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_COUNTERPART, DIR_NORTH Return -_114A: - SetObjectEventPos 0, 10, 8 - SetObjectEventMovementType 0, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 0, DIR_NORTH - ClearFlag FLAG_UNK_0x02A8 - AddObject 0 +Villa_AddCounterpart: + SetObjectEventPos LOCALID_COUNTERPART, 10, 8 + SetObjectEventMovementType LOCALID_COUNTERPART, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_COUNTERPART, DIR_NORTH + ClearFlag FLAG_HIDE_VILLA_COUNTERPART + AddObject LOCALID_COUNTERPART Return -_1168: - Call _2209 - GoToIfEq VAR_RESORT_VILLA_VISITOR, 2, _1199 - GoTo _1183 +Villa_AddBookshelfRowan: + Call Villa_TryRemoveVisitor + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_PROF_ROWAN, Villa_TryAddRowan + GoTo Villa_SetPositionBookshelfRowan End -_1183: - SetObjectEventPos 2, 11, 11 - SetObjectEventMovementType 2, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 2, DIR_NORTH +Villa_SetPositionBookshelfRowan: + SetObjectEventPos LOCALID_PROF_ROWAN, 11, 11 + SetObjectEventMovementType LOCALID_PROF_ROWAN, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_PROF_ROWAN, DIR_NORTH Return -_1199: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _1183 - SetObjectEventPos 2, 10, 8 - SetObjectEventMovementType 2, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 2, DIR_NORTH - ClearFlag FLAG_UNK_0x02A9 - AddObject 2 +Villa_TryAddRowan: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_SetPositionBookshelfRowan + SetObjectEventPos LOCALID_PROF_ROWAN, 10, 8 + SetObjectEventMovementType LOCALID_PROF_ROWAN, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_PROF_ROWAN, DIR_NORTH + ClearFlag FLAG_HIDE_VILLA_PROF_ROWAN + AddObject LOCALID_PROF_ROWAN Return -_11C2: - Call _2209 - GoToIfEq VAR_RESORT_VILLA_VISITOR, 5, _11F3 - GoTo _11DD +Villa_AddHouseplantGardenia: + Call Villa_TryRemoveVisitor + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_GARDENIA, Villa_TryAddGardenia + GoTo Villa_SetPositionHouseplantGardenia End -_11DD: - SetObjectEventPos 5, 11, 11 - SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 5, DIR_NORTH +Villa_SetPositionHouseplantGardenia: + SetObjectEventPos LOCALID_GARDENIA, 11, 11 + SetObjectEventMovementType LOCALID_GARDENIA, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_GARDENIA, DIR_NORTH Return -_11F3: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _11DD - SetObjectEventPos 5, 10, 8 - SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 5, DIR_NORTH - ClearFlag FLAG_UNK_0x02AE - AddObject 5 +Villa_TryAddGardenia: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_SetPositionHouseplantGardenia + SetObjectEventPos LOCALID_GARDENIA, 10, 8 + SetObjectEventMovementType LOCALID_GARDENIA, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_GARDENIA, DIR_NORTH + ClearFlag FLAG_HIDE_VILLA_GARDENIA + AddObject LOCALID_GARDENIA Return -_121C: - Call _2209 - GoToIfEq VAR_RESORT_VILLA_VISITOR, 12, _1245 - SetObjectEventPos 12, 11, 11 - SetObjectEventMovementType 12, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 12, DIR_NORTH +Villa_AddPianoCynthia: + Call Villa_TryRemoveVisitor + GoToIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CYNTHIA, Villa_AddCynthia + SetObjectEventPos LOCALID_CYNTHIA, 11, 11 + SetObjectEventMovementType LOCALID_CYNTHIA, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_CYNTHIA, DIR_NORTH Return -_1245: - SetObjectEventPos 12, 10, 8 - SetObjectEventMovementType 12, MOVEMENT_TYPE_LOOK_NORTH - SetObjectEventDir 12, DIR_NORTH - ClearFlag FLAG_UNK_0x02B8 - AddObject 12 +Villa_AddCynthia: + SetObjectEventPos LOCALID_CYNTHIA, 10, 8 + SetObjectEventMovementType LOCALID_CYNTHIA, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventDir LOCALID_CYNTHIA, DIR_NORTH + ClearFlag FLAG_HIDE_VILLA_CYNTHIA + AddObject LOCALID_CYNTHIA Return -_1263: - CallIfNe VAR_RESORT_VILLA_VISITOR, 0, _12A3 +Villa_EnterTableRival: + CallIfNe VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_RIVAL, Villa_RivalEnter SetFlag FLAG_VILLA_VISITOR_INSIDE - SetVar VAR_RESORT_VILLA_VISITOR, 0xFF - ApplyMovement LOCALID_PLAYER, _1454 + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_NONE + ApplyMovement LOCALID_PLAYER, Villa_Movement_PlayerWalkOnSpotSouth WaitMovement BufferRivalName 0 BufferPlayerName 1 - Message 9 + Message Villa_Text_RivalMessageEntry CloseMessage - ApplyMovement 1, _1468 + ApplyMovement LOCALID_RIVAL, Villa_Movement_RivalLeave WaitMovement PlaySE SEQ_SE_DP_KAIDAN2 - RemoveObject 1 + RemoveObject LOCALID_RIVAL Return -_12A3: - ClearFlag FLAG_UNK_0x02A7 - AddObject 1 +Villa_RivalEnter: + ClearFlag FLAG_HIDE_VILLA_RIVAL + AddObject LOCALID_RIVAL PlaySE SEQ_SE_DP_DOOR_OPEN WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement 1, _145C + ApplyMovement LOCALID_RIVAL, Villa_Movement_VisitorEnter WaitMovement Return -_12BF: - CallIfNe VAR_RESORT_VILLA_VISITOR, 1, _1316 +Villa_EnterSmallSofaCounterpart: + CallIfNe VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_COUNTERPART, Villa_CounterpartEnter SetFlag FLAG_VILLA_VISITOR_INSIDE - SetVar VAR_RESORT_VILLA_VISITOR, 1 + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_COUNTERPART BufferRivalName 0 BufferPlayerName 1 GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _12FC - GoToIfEq VAR_RESULT, GENDER_FEMALE, _1307 + GoToIfEq VAR_RESULT, GENDER_MALE, Villa_SmallSofaDawn + GoToIfEq VAR_RESULT, GENDER_FEMALE, Villa_SmallSofaLucas End -_12FC: - Message pl_msg_00000602_00010 - GoTo _1312 +Villa_SmallSofaDawn: + Message Villa_Text_DawnMessageEntry + GoTo Villa_SmallSofaCounterpartEnd End -_1307: - Message pl_msg_00000602_00011 - GoTo _1312 +Villa_SmallSofaLucas: + Message Villa_Text_LucasMessageEntry + GoTo Villa_SmallSofaCounterpartEnd End -_1312: +Villa_SmallSofaCounterpartEnd: CloseMessage Return -_1316: - ClearFlag FLAG_UNK_0x02A8 - AddObject 0 +Villa_CounterpartEnter: + ClearFlag FLAG_HIDE_VILLA_COUNTERPART + AddObject LOCALID_COUNTERPART PlaySE SEQ_SE_DP_DOOR_OPEN WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement 0, _145C + ApplyMovement LOCALID_COUNTERPART, Villa_Movement_VisitorEnter WaitMovement Return -_1332: - CallIfNe VAR_RESORT_VILLA_VISITOR, 2, _1374 - CallIfEq VAR_RESORT_VILLA_VISITOR, 2, _1367 +Villa_EnterBookshelfRowan: + CallIfNe VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_PROF_ROWAN, Villa_RowanEnter + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_PROF_ROWAN, Villa_TryRowanEnter SetFlag FLAG_VILLA_VISITOR_INSIDE - SetFlag FLAG_UNK_0x02AA - SetVar VAR_RESORT_VILLA_VISITOR, 2 + SetFlag FLAG_HIDE_RESORT_AREA_PROF_ROWAN + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_PROF_ROWAN BufferRivalName 0 BufferPlayerName 1 - Message pl_msg_00000602_00012 + Message Villa_Text_RowanMessageEntry CloseMessage Return -_1367: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _1374 +Villa_TryRowanEnter: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_RowanEnter Return -_1374: - ClearFlag FLAG_UNK_0x02A9 - AddObject 2 +Villa_RowanEnter: + ClearFlag FLAG_HIDE_VILLA_PROF_ROWAN + AddObject LOCALID_PROF_ROWAN PlaySE SEQ_SE_DP_DOOR_OPEN WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement 2, _145C + ApplyMovement LOCALID_PROF_ROWAN, Villa_Movement_VisitorEnter WaitMovement Return -_1390: - CallIfNe VAR_RESORT_VILLA_VISITOR, 5, _13D2 - CallIfEq VAR_RESORT_VILLA_VISITOR, 5, _13C5 +Villa_EnterHouseplantGardenia: + CallIfNe VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_GARDENIA, Villa_GardeniaEnter + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_GARDENIA, Villa_TryGardeniaEnter SetFlag FLAG_VILLA_VISITOR_INSIDE - SetFlag FLAG_UNK_0x02B2 - SetVar VAR_RESORT_VILLA_VISITOR, 5 + SetFlag FLAG_HIDE_RESORT_AREA_MAYLENE + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_GARDENIA BufferRivalName 0 BufferPlayerName 1 - Message pl_msg_00000602_00013 + Message Villa_Text_GardeniaMessageEntry CloseMessage Return -_13C5: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _13D2 +Villa_TryGardeniaEnter: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_GardeniaEnter Return -_13D2: - ClearFlag FLAG_UNK_0x02AE - AddObject 5 +Villa_GardeniaEnter: + ClearFlag FLAG_HIDE_VILLA_GARDENIA + AddObject LOCALID_GARDENIA PlaySE SEQ_SE_DP_DOOR_OPEN WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement 5, _145C + ApplyMovement LOCALID_GARDENIA, Villa_Movement_VisitorEnter WaitMovement Return -_13EE: - CallIfNe VAR_RESORT_VILLA_VISITOR, 12, _1436 - CallIfEq VAR_RESORT_VILLA_VISITOR, 12, _1429 +Villa_EnterPianoCynthia: + CallIfNe VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CYNTHIA, Villa_CynthiaEnter + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CYNTHIA, Villa_TryCynthiaEnter SetFlag FLAG_VILLA_VISITOR_INSIDE - SetVar VAR_RESORT_VILLA_VISITOR, 12 + SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CYNTHIA SetVar VAR_MAP_LOCAL_F, 0 SetFlag FLAG_VILLA_VISITOR_OUTSIDE BufferRivalName 0 BufferPlayerName 1 - Message pl_msg_00000602_00014 + Message Villa_Text_CynthiaMessageEntry CloseMessage Return -_1429: - GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, _1436 +Villa_TryCynthiaEnter: + GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, Villa_CynthiaEnter Return -_1436: - ClearFlag FLAG_UNK_0x02B8 - AddObject 12 +Villa_CynthiaEnter: + ClearFlag FLAG_HIDE_VILLA_CYNTHIA + AddObject LOCALID_CYNTHIA PlaySE SEQ_SE_DP_DOOR_OPEN WaitSE SEQ_SE_DP_DOOR_OPEN - ApplyMovement 12, _145C + ApplyMovement LOCALID_CYNTHIA, Villa_Movement_VisitorEnter WaitMovement Return .balign 4, 0 -_1454: +Villa_Movement_PlayerWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_145C: +Villa_Movement_VisitorEnter: WalkNormalWest WalkNormalNorth 3 EndMovement .balign 4, 0 -_1468: +Villa_Movement_RivalLeave: WalkNormalSouth 3 WalkNormalEast WalkOnSpotNormalSouth EndMovement -_1478: - Message Villa_Text_GoAheadOrderATableFromThisOrderForm +Villa_OrderTable2: + Message Villa_Text_OrderTable WaitButton CloseMessage HideMoney ReleaseAll End -_1485: - Message Villa_Text_ThankYouForWaitingImDeliveringYourOrder_WeHopeYoullKeepOrdering +Villa_DeliverFreeTable: + Message Villa_Text_DeliveringOrderKeepOrdering CloseMessage FadeScreenOut WaitFadeScreen - RemoveObject 15 + RemoveObject LOCALID_DELIVERY_GUY FadeScreenIn WaitFadeScreen - ApplyMovement 14, _14FC - ApplyMovement LOCALID_PLAYER, _14F0 + ApplyMovement LOCALID_SCHOOL_KID_M, Villa_Movement_SchoolKidMFacePlayer + ApplyMovement LOCALID_PLAYER, Villa_Movement_PlayerFaceSchoolKidM WaitMovement - Message 4 + Message Villa_Text_FinallyRidOfVilla CloseMessage FadeScreenOut WaitFadeScreen - RemoveObject 14 - Call _156D + RemoveObject LOCALID_SCHOOL_KID_M + Call Villa_TryAddFurnitureVisitor FadeScreenIn WaitFadeScreen - Call _15B0 - SetVar VAR_UNK_0x40A1, 2 + Call Villa_TryEnterFurnitureVisitor + SetVar VAR_VILLA_STATE, 2 Return .balign 4, 0 -_14F0: +Villa_Movement_PlayerFaceSchoolKidM: Delay8 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_14FC: +Villa_Movement_SchoolKidMFacePlayer: WalkOnSpotNormalEast EndMovement @@ -1493,169 +1494,169 @@ Villa_UnusedMovement: WalkOnSpotNormalSouth EndMovement -_1514: - Call Villa_CheckIfHasAllFurniture - GoToIfEq VAR_RESULT, TRUE, Villa_DeliveryGuy_HasAllFurniture - Message Villa_Text_ThankYouForWaitingImDeliveringYourOrder - GoTo _1532 +Villa_DeliveringOrder: + Call Villa_CheckHasAllFurniture + GoToIfEq VAR_RESULT, TRUE, Villa_HasAllFurniture + Message Villa_Text_DeliveringOrder + GoTo Villa_DeliveryGuyLeaveTryVisitorEnter End -_1532: +Villa_DeliveryGuyLeaveTryVisitorEnter: CloseMessage FadeScreenOut WaitFadeScreen - RemoveObject 15 - Call _156D + RemoveObject LOCALID_DELIVERY_GUY + Call Villa_TryAddFurnitureVisitor FadeScreenIn WaitFadeScreen - Call _15B0 + Call Villa_TryEnterFurnitureVisitor Return -Villa_DeliveryGuy_HasAllFurniture: - IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_49 - Message Villa_Text_ThankYouForWaitingImDeliveringYourOrder_AlsoAndIHateToSayThisBut - GoTo _1532 +Villa_HasAllFurniture: + IncrementTrainerScore TRAINER_SCORE_EVENT_BOUGHT_ALL_VILLA_FURNITURE + Message Villa_Text_DeliveringOrderOutOfFurniture + GoTo Villa_DeliveryGuyLeaveTryVisitorEnter End -_156D: - CallIfEq VAR_0x8002, 0, _10DA - CallIfEq VAR_0x8002, 2, _1121 - CallIfEq VAR_0x8002, 7, _1168 - CallIfEq VAR_0x8002, 9, _11C2 - CallIfEq VAR_0x8002, 14, _121C +Villa_TryAddFurnitureVisitor: + CallIfEq VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_AddTableRival + CallIfEq VAR_0x8002, VILLA_FURNITURE_SMALL_SOFA, Villa_AddSmallSofaCounterpart + CallIfEq VAR_0x8002, VILLA_FURNITURE_BOOKSHELF, Villa_AddBookshelfRowan + CallIfEq VAR_0x8002, VILLA_FURNITURE_HOUSEPLANT, Villa_AddHouseplantGardenia + CallIfEq VAR_0x8002, VILLA_FURNITURE_PIANO, Villa_AddPianoCynthia Return -_15B0: - CallIfEq VAR_0x8002, 0, _1263 - CallIfEq VAR_0x8002, 2, _12BF - CallIfEq VAR_0x8002, 7, _1332 - CallIfEq VAR_0x8002, 9, _1390 - CallIfEq VAR_0x8002, 14, _13EE +Villa_TryEnterFurnitureVisitor: + CallIfEq VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_EnterTableRival + CallIfEq VAR_0x8002, VILLA_FURNITURE_SMALL_SOFA, Villa_EnterSmallSofaCounterpart + CallIfEq VAR_0x8002, VILLA_FURNITURE_BOOKSHELF, Villa_EnterBookshelfRowan + CallIfEq VAR_0x8002, VILLA_FURNITURE_HOUSEPLANT, Villa_EnterHouseplantGardenia + CallIfEq VAR_0x8002, VILLA_FURNITURE_PIANO, Villa_EnterPianoCynthia Return -_15F3: +Villa_TriggerDontGoYet: LockAll - ApplyMovement 14, _1614 + ApplyMovement LOCALID_SCHOOL_KID_M, Villa_Movement_SchoolKidMWalkOnSpotSouth WaitMovement - Message Villa_Text_WhoaWhoaDontGoYet + Message Villa_Text_DontGoYet CloseMessage - ApplyMovement LOCALID_PLAYER, _161C + ApplyMovement LOCALID_PLAYER, Villa_Movement_PlayerWalkNorth WaitMovement ReleaseAll End .balign 4, 0 -_1614: +Villa_Movement_SchoolKidMWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_161C: +Villa_Movement_PlayerWalkNorth: WalkNormalNorth EndMovement -_1624: +Villa_OrderForm: PlaySE SEQ_SE_CONFIRM LockAll ShowMoney 21, 1 BufferPlayerName 1 - Message 119 - Call Villa_CheckIfHasAllFurniture - GoToIfEq VAR_RESULT, TRUE, _1651 - GoTo _165C + Message Villa_Text_PlayerOpenedOrderForm + Call Villa_CheckHasAllFurniture + GoToIfEq VAR_RESULT, TRUE, Villa_ListOfPurchases + GoTo Villa_OrderWhichFurniture End -_1651: - Message Villa_Text_ThisIsTheListOfPurchasedFurniture - GoTo _1667 +Villa_ListOfPurchases: + Message Villa_Text_ListOfPurchases + GoTo Villa_TryBuyFurniture End -_165C: - Message 120 - GoTo _1667 +Villa_OrderWhichFurniture: + Message Villa_Text_OrderWhichFurniture + GoTo Villa_TryBuyFurniture End -_1667: - Call _0EF6 - SetVar VAR_0x8003, 1 - CallIfEq VAR_0x8002, 0, _1EA5 - CallIfEq VAR_0x8002, 1, _1EB2 - CallIfEq VAR_0x8002, 2, _1EBF - CallIfEq VAR_0x8002, 3, _1ECC - CallIfEq VAR_0x8002, 4, _1ED9 - CallIfEq VAR_0x8002, 5, _1EE6 - CallIfEq VAR_0x8002, 6, _1EF3 - CallIfEq VAR_0x8002, 7, _1F00 - CallIfEq VAR_0x8002, 8, _1F0D - CallIfEq VAR_0x8002, 9, _1F1A - CallIfEq VAR_0x8002, 10, _1F27 - CallIfEq VAR_0x8002, 11, _1F34 - CallIfEq VAR_0x8002, 12, _1F41 - CallIfEq VAR_0x8002, 13, _1F4E - CallIfEq VAR_0x8002, 14, _1F5B - CallIfEq VAR_0x8002, 15, _1F68 - CallIfEq VAR_0x8002, 16, _1F75 - CallIfEq VAR_0x8002, 17, _1F82 - CallIfEq VAR_0x8002, 18, _1F8F - CallIfEq VAR_0x8002, 19, _1F9C - GoToIfEq VAR_0x8002, -2, _18DE - GoToIfEq VAR_0x8003, FALSE, _18C8 - Message 121 +Villa_TryBuyFurniture: + Call Villa_ShowFurnitureListMenu + SetVar VAR_0x8003, TRUE + CallIfEq VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_CheckCanBuyTable + CallIfEq VAR_0x8002, VILLA_FURNITURE_BIG_SOFA, Villa_CheckCanBuyBigSofa + CallIfEq VAR_0x8002, VILLA_FURNITURE_SMALL_SOFA, Villa_CheckCanBuySmallSofa + CallIfEq VAR_0x8002, VILLA_FURNITURE_BED, Villa_CheckCanBuyBedSofa + CallIfEq VAR_0x8002, VILLA_FURNITURE_NIGHT_TABLE, Villa_CheckCanBuyNightTable + CallIfEq VAR_0x8002, VILLA_FURNITURE_TV, Villa_CheckCanBuyTV + CallIfEq VAR_0x8002, VILLA_FURNITURE_AUDIO_SYSTEM, Villa_CheckCanBuyAudioSystem + CallIfEq VAR_0x8002, VILLA_FURNITURE_BOOKSHELF, Villa_CheckCanBuyBookshelf + CallIfEq VAR_0x8002, VILLA_FURNITURE_RACK, Villa_CheckCanBuyRack + CallIfEq VAR_0x8002, VILLA_FURNITURE_HOUSEPLANT, Villa_CheckCanBuyHouseplant + CallIfEq VAR_0x8002, VILLA_FURNITURE_PC_DESK, Villa_CheckCanBuyPCDesk + CallIfEq VAR_0x8002, VILLA_FURNITURE_MUSIC_BOX, Villa_CheckCanBuyMusicBox + CallIfEq VAR_0x8002, VILLA_FURNITURE_POKEMON_BUST, Villa_CheckCanBuyPokemonBust + CallIfEq VAR_0x8002, VILLA_FURNITURE_POKEMON_BUST_SILVER, Villa_CheckCanBuyPokemonBustSilver + CallIfEq VAR_0x8002, VILLA_FURNITURE_PIANO, Villa_CheckCanBuyPiano + CallIfEq VAR_0x8002, VILLA_FURNITURE_GUEST_SET, Villa_CheckCanBuyGuestSet + CallIfEq VAR_0x8002, VILLA_FURNITURE_WALL_CLOCK, Villa_CheckCanBuyWallClock + CallIfEq VAR_0x8002, VILLA_FURNITURE_MASTERPIECE, Villa_CheckCanBuyMasterpiece + CallIfEq VAR_0x8002, VILLA_FURNITURE_TEA_SET, Villa_CheckCanBuyTeaSet + CallIfEq VAR_0x8002, VILLA_FURNITURE_CHANDELIER, Villa_CheckCanBuyChandelier + GoToIfEq VAR_0x8002, -2, Villa_CanceledOrder + GoToIfEq VAR_0x8003, FALSE, Villa_AlreadyBoughtOne + Message Villa_Text_OrderChosenFurniture ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _18DE - CallIfEq VAR_0x8002, 0, Villa_CheckMoney_Table - CallIfEq VAR_0x8002, 1, Villa_CheckMoney_BigSofa - CallIfEq VAR_0x8002, 2, Villa_CheckMoney_SmallSofa - CallIfEq VAR_0x8002, 3, Villa_CheckMoney_Bed - CallIfEq VAR_0x8002, 4, Villa_CheckMoney_NightTable - CallIfEq VAR_0x8002, 5, Villa_CheckMoney_TV - CallIfEq VAR_0x8002, 6, Villa_CheckMoney_AudioSystem - CallIfEq VAR_0x8002, 7, Villa_CheckMoney_Bookshelf - CallIfEq VAR_0x8002, 8, Villa_CheckMoney_Rack - CallIfEq VAR_0x8002, 9, Villa_CheckMoney_Houseplant - CallIfEq VAR_0x8002, 10, Villa_CheckMoney_PCDesk - CallIfEq VAR_0x8002, 11, Villa_CheckMoney_MusicBox - CallIfEq VAR_0x8002, 12, Villa_CheckMoney_PokemonBust - CallIfEq VAR_0x8002, 13, Villa_CheckMoney_PokemonBustSilver - CallIfEq VAR_0x8002, 14, Villa_CheckMoney_Piano - CallIfEq VAR_0x8002, 15, Villa_CheckMoney_GuestSet - CallIfEq VAR_0x8002, 16, Villa_CheckMoney_WallClock - CallIfEq VAR_0x8002, 17, Villa_CheckMoney_Masterpiece - CallIfEq VAR_0x8002, 18, Villa_CheckMoney_TeaSet - CallIfEq VAR_0x8002, 19, Villa_CheckMoney_Chandelier - GoToIfEq VAR_0x8003, FALSE, _18D3 + GoToIfEq VAR_RESULT, MENU_NO, Villa_CanceledOrder + CallIfEq VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_CheckMoney_Table + CallIfEq VAR_0x8002, VILLA_FURNITURE_BIG_SOFA, Villa_CheckMoney_BigSofa + CallIfEq VAR_0x8002, VILLA_FURNITURE_SMALL_SOFA, Villa_CheckMoney_SmallSofa + CallIfEq VAR_0x8002, VILLA_FURNITURE_BED, Villa_CheckMoney_Bed + CallIfEq VAR_0x8002, VILLA_FURNITURE_NIGHT_TABLE, Villa_CheckMoney_NightTable + CallIfEq VAR_0x8002, VILLA_FURNITURE_TV, Villa_CheckMoney_TV + CallIfEq VAR_0x8002, VILLA_FURNITURE_AUDIO_SYSTEM, Villa_CheckMoney_AudioSystem + CallIfEq VAR_0x8002, VILLA_FURNITURE_BOOKSHELF, Villa_CheckMoney_Bookshelf + CallIfEq VAR_0x8002, VILLA_FURNITURE_RACK, Villa_CheckMoney_Rack + CallIfEq VAR_0x8002, VILLA_FURNITURE_HOUSEPLANT, Villa_CheckMoney_Houseplant + CallIfEq VAR_0x8002, VILLA_FURNITURE_PC_DESK, Villa_CheckMoney_PCDesk + CallIfEq VAR_0x8002, VILLA_FURNITURE_MUSIC_BOX, Villa_CheckMoney_MusicBox + CallIfEq VAR_0x8002, VILLA_FURNITURE_POKEMON_BUST, Villa_CheckMoney_PokemonBust + CallIfEq VAR_0x8002, VILLA_FURNITURE_POKEMON_BUST_SILVER, Villa_CheckMoney_PokemonBustSilver + CallIfEq VAR_0x8002, VILLA_FURNITURE_PIANO, Villa_CheckMoney_Piano + CallIfEq VAR_0x8002, VILLA_FURNITURE_GUEST_SET, Villa_CheckMoney_GuestSet + CallIfEq VAR_0x8002, VILLA_FURNITURE_WALL_CLOCK, Villa_CheckMoney_WallClock + CallIfEq VAR_0x8002, VILLA_FURNITURE_MASTERPIECE, Villa_CheckMoney_Masterpiece + CallIfEq VAR_0x8002, VILLA_FURNITURE_TEA_SET, Villa_CheckMoney_TeaSet + CallIfEq VAR_0x8002, VILLA_FURNITURE_CHANDELIER, Villa_CheckMoney_Chandelier + GoToIfEq VAR_0x8003, FALSE, Villa_NotEnoughMoney Call Villa_BuyFurniture CloseMessage - Call _1092 + Call Villa_WarpAndShowDeliveryGuyAndBook ReleaseAll End -_18C8: - Message 122 - GoTo _18E6 +Villa_AlreadyBoughtOne: + Message Villa_Text_AlreadyBoughtOne + GoTo Villa_OrderFormWaitButton End -_18D3: - Message 123 - GoTo _18E6 +Villa_NotEnoughMoney: + Message Villa_Text_NotEnoughMoney + GoTo Villa_OrderFormWaitButton End -_18DE: - GoTo _18F0 +Villa_CanceledOrder: + GoTo Villa_OrderFormEnd End -_18E6: +Villa_OrderFormWaitButton: WaitButton - GoTo _18F0 + GoTo Villa_OrderFormEnd End -_18F0: +Villa_OrderFormEnd: CloseMessage HideMoney ReleaseAll End -Villa_CheckIfHasAllFurniture: +Villa_CheckHasAllFurniture: GoToIfUnset FLAG_VILLA_FURNITURE_TABLE, Villa_DoesntHaveAllFurniture GoToIfUnset FLAG_VILLA_FURNITURE_BIG_SOFA, Villa_DoesntHaveAllFurniture GoToIfUnset FLAG_VILLA_FURNITURE_SMALL_SOFA, Villa_DoesntHaveAllFurniture @@ -1683,387 +1684,387 @@ Villa_DoesntHaveAllFurniture: SetVar VAR_RESULT, FALSE Return -_19E4: +Villa_AddMenuEntryTable: BufferValuePaddingDigits 0, 0, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_TABLE, _1D15 - CallIfSet FLAG_VILLA_FURNITURE_TABLE, _1D1F + CallIfUnset FLAG_VILLA_FURNITURE_TABLE, Villa_AddMenuEntryTableAvailable + CallIfSet FLAG_VILLA_FURNITURE_TABLE, Villa_AddMenuEntryTableSoldOut Return -_1A05: +Villa_AddMenuEntryBigSofa: BufferValuePaddingDigits 0, 120000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_BIG_SOFA, _1D29 - CallIfSet FLAG_VILLA_FURNITURE_BIG_SOFA, _1D33 + CallIfUnset FLAG_VILLA_FURNITURE_BIG_SOFA, Villa_AddMenuEntryBigSofaAvailable + CallIfSet FLAG_VILLA_FURNITURE_BIG_SOFA, Villa_AddMenuEntryBigSofaSoldOut Return -_1A26: +Villa_AddMenuEntrySmallSofa: BufferValuePaddingDigits 0, 90000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_SMALL_SOFA, _1D3D - CallIfSet FLAG_VILLA_FURNITURE_SMALL_SOFA, _1D47 + CallIfUnset FLAG_VILLA_FURNITURE_SMALL_SOFA, Villa_AddMenuEntrySmallSofaAvailable + CallIfSet FLAG_VILLA_FURNITURE_SMALL_SOFA, Villa_AddMenuEntrySmallSofaSoldOut Return -_1A47: +Villa_AddMenuEntryBed: BufferValuePaddingDigits 0, 187000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_BED, _1D51 - CallIfSet FLAG_VILLA_FURNITURE_BED, _1D5B + CallIfUnset FLAG_VILLA_FURNITURE_BED, Villa_AddMenuEntryBedAvailable + CallIfSet FLAG_VILLA_FURNITURE_BED, Villa_AddMenuEntryBedSoldOut Return -_1A68: +Villa_AddMenuEntryNightTable: BufferValuePaddingDigits 0, 58000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_NIGHT_TABLE, _1D65 - CallIfSet FLAG_VILLA_FURNITURE_NIGHT_TABLE, _1D6F + CallIfUnset FLAG_VILLA_FURNITURE_NIGHT_TABLE, Villa_AddMenuEntryNightTableAvailable + CallIfSet FLAG_VILLA_FURNITURE_NIGHT_TABLE, Villa_AddMenuEntryNightTableSoldOut Return -_1A89: +Villa_AddMenuEntryTV: BufferValuePaddingDigits 0, 220000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_TV, _1D79 - CallIfSet FLAG_VILLA_FURNITURE_TV, _1D83 + CallIfUnset FLAG_VILLA_FURNITURE_TV, Villa_AddMenuEntryTVAvailable + CallIfSet FLAG_VILLA_FURNITURE_TV, Villa_AddMenuEntryTVSoldOut Return -_1AAA: +Villa_AddMenuEntryAudioSystem: BufferValuePaddingDigits 0, 160000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, _1D8D - CallIfSet FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, _1D97 + CallIfUnset FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, Villa_AddMenuEntryAudioSystemAvailable + CallIfSet FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, Villa_AddMenuEntryAudioSystemSoldOut Return -_1ACB: +Villa_AddMenuEntryBookshelf: BufferValuePaddingDigits 0, 150000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_BOOKSHELF, _1DA1 - CallIfSet FLAG_VILLA_FURNITURE_BOOKSHELF, _1DAB + CallIfUnset FLAG_VILLA_FURNITURE_BOOKSHELF, Villa_AddMenuEntryBookshelfAvailable + CallIfSet FLAG_VILLA_FURNITURE_BOOKSHELF, Villa_AddMenuEntryBookshelfSoldOut Return -_1AEC: +Villa_AddMenuEntryRack: BufferValuePaddingDigits 0, 127000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_RACK, _1DB5 - CallIfSet FLAG_VILLA_FURNITURE_RACK, _1DBF + CallIfUnset FLAG_VILLA_FURNITURE_RACK, Villa_AddMenuEntryRackAvailable + CallIfSet FLAG_VILLA_FURNITURE_RACK, Villa_AddMenuEntryRackSoldOut Return -_1B0D: +Villa_AddMenuEntryHouseplant: BufferValuePaddingDigits 0, 120000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_HOUSEPLANT, _1DC9 - CallIfSet FLAG_VILLA_FURNITURE_HOUSEPLANT, _1DD3 + CallIfUnset FLAG_VILLA_FURNITURE_HOUSEPLANT, Villa_AddMenuEntryHouseplantAvailable + CallIfSet FLAG_VILLA_FURNITURE_HOUSEPLANT, Villa_AddMenuEntryHouseplantSoldOut Return -_1B2E: +Villa_AddMenuEntryPCDesk: BufferValuePaddingDigits 0, 168000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_PC_DESK, _1DDD - CallIfSet FLAG_VILLA_FURNITURE_PC_DESK, _1DE7 + CallIfUnset FLAG_VILLA_FURNITURE_PC_DESK, Villa_AddMenuEntryPCDeskAvailable + CallIfSet FLAG_VILLA_FURNITURE_PC_DESK, Villa_AddMenuEntryPCDeskSoldOut Return -_1B4F: - GoToIfUnset FLAG_VILLA_FURNITURE_RACK, _1D13 +Villa_TryAddMenuEntryMusicBox: + GoToIfUnset FLAG_VILLA_FURNITURE_RACK, Villa_DontAddMenuEntry BufferValuePaddingDigits 0, 25300, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_MUSIC_BOX, _1DF1 - CallIfSet FLAG_VILLA_FURNITURE_MUSIC_BOX, _1DFB + CallIfUnset FLAG_VILLA_FURNITURE_MUSIC_BOX, Villa_AddMenuEntryMusicBoxAvailable + CallIfSet FLAG_VILLA_FURNITURE_MUSIC_BOX, Villa_AddMenuEntryMusicBoxSoldOut Return -_1B7B: - ScrCmd_30F 13, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _1D13 +Villa_TryAddMenuEntryPokemonBust: + CheckMetFurnitureRequirements VILLA_FURNITURE_POKEMON_BUST + 1, VAR_RESULT + GoToIfEq VAR_RESULT, 0, Villa_DontAddMenuEntry BufferValuePaddingDigits 0, 150000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_POKEMON_BUST, _1E05 - CallIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST, _1E0F + CallIfUnset FLAG_VILLA_FURNITURE_POKEMON_BUST, Villa_AddMenuEntryPokemonBustAvailable + CallIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST, Villa_AddMenuEntryPokemonBustSoldOut Return -_1BAF: - ScrCmd_30F 14, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _1D13 +Villa_TryAddMenuEntryPokemonBustSilver: + CheckMetFurnitureRequirements VILLA_FURNITURE_POKEMON_BUST_SILVER + 1, VAR_RESULT + GoToIfEq VAR_RESULT, 0, Villa_DontAddMenuEntry BufferValuePaddingDigits 0, 150000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, _1E19 - CallIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, _1E23 + CallIfUnset FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, Villa_AddMenuEntryPokemonBustSilverAvailable + CallIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, Villa_AddMenuEntryPokemonBustSilverSoldOut Return -_1BE3: - ScrCmd_30F 15, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _1D13 +Villa_TryAddMenuEntryPiano: + CheckMetFurnitureRequirements VILLA_FURNITURE_PIANO + 1, VAR_RESULT + GoToIfEq VAR_RESULT, 0, Villa_DontAddMenuEntry BufferValuePaddingDigits 0, 146700, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_PIANO, _1E2D - CallIfSet FLAG_VILLA_FURNITURE_PIANO, _1E37 + CallIfUnset FLAG_VILLA_FURNITURE_PIANO, Villa_AddMenuEntryPianoAvailable + CallIfSet FLAG_VILLA_FURNITURE_PIANO, Villa_AddMenuEntryPianoSoldOut Return -_1C17: - ScrCmd_30F 16, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _1D13 +Villa_TryAddMenuEntryGuestSet: + CheckMetFurnitureRequirements VILLA_FURNITURE_GUEST_SET + 1, VAR_RESULT + GoToIfEq VAR_RESULT, 0, Villa_DontAddMenuEntry BufferValuePaddingDigits 0, 208000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_GUEST_SET, _1E41 - CallIfSet FLAG_VILLA_FURNITURE_GUEST_SET, _1E4B + CallIfUnset FLAG_VILLA_FURNITURE_GUEST_SET, Villa_AddMenuEntryGuestSetAvailable + CallIfSet FLAG_VILLA_FURNITURE_GUEST_SET, Villa_AddMenuEntryGuestSetSoldOut Return -_1C4B: - ScrCmd_30F 17, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _1D13 +Villa_TryAddMenuEntryWallClock: + CheckMetFurnitureRequirements VILLA_FURNITURE_WALL_CLOCK + 1, VAR_RESULT + GoToIfEq VAR_RESULT, 0, Villa_DontAddMenuEntry BufferValuePaddingDigits 0, 52000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_WALL_CLOCK, _1E55 - CallIfSet FLAG_VILLA_FURNITURE_WALL_CLOCK, _1E5F + CallIfUnset FLAG_VILLA_FURNITURE_WALL_CLOCK, Villa_AddMenuEntryWallClockAvailable + CallIfSet FLAG_VILLA_FURNITURE_WALL_CLOCK, Villa_AddMenuEntryWallClockSoldOut Return -_1C7F: - ScrCmd_30F 18, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _1D13 +Villa_TryAddMenuEntryMasterpiece: + CheckMetFurnitureRequirements VILLA_FURNITURE_MASTERPIECE + 1, VAR_RESULT + GoToIfEq VAR_RESULT, 0, Villa_DontAddMenuEntry BufferValuePaddingDigits 0, 140000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_MASTERPIECE, _1E69 - CallIfSet FLAG_VILLA_FURNITURE_MASTERPIECE, _1E73 + CallIfUnset FLAG_VILLA_FURNITURE_MASTERPIECE, Villa_AddMenuEntryMasterpieceAvailable + CallIfSet FLAG_VILLA_FURNITURE_MASTERPIECE, Villa_AddMenuEntryMasterpieceSoldOut Return -_1CB3: - GoToIfUnset FLAG_VILLA_FURNITURE_GUEST_SET, _1D13 +Villa_TryAddMenuEntryTeaSet: + GoToIfUnset FLAG_VILLA_FURNITURE_GUEST_SET, Villa_DontAddMenuEntry BufferValuePaddingDigits 0, 108000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_TEA_SET, _1E7D - CallIfSet FLAG_VILLA_FURNITURE_TEA_SET, _1E87 + CallIfUnset FLAG_VILLA_FURNITURE_TEA_SET, Villa_AddMenuEntryTeaSetAvailable + CallIfSet FLAG_VILLA_FURNITURE_TEA_SET, Villa_AddMenuEntryTeaSetSoldOut Return -_1CDF: - ScrCmd_30F 20, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _1D13 +Villa_TryAddMenuEntryChandelier: + CheckMetFurnitureRequirements VILLA_FURNITURE_CHANDELIER + 1, VAR_RESULT + GoToIfEq VAR_RESULT, 0, Villa_DontAddMenuEntry BufferValuePaddingDigits 0, 120000, PADDING_MODE_SPACES, 6 - CallIfUnset FLAG_VILLA_FURNITURE_CHANDELIER, _1E91 - CallIfSet FLAG_VILLA_FURNITURE_CHANDELIER, _1E9B + CallIfUnset FLAG_VILLA_FURNITURE_CHANDELIER, Villa_AddMenuEntryChandelierAvailable + CallIfSet FLAG_VILLA_FURNITURE_CHANDELIER, Villa_AddMenuEntryChandelierSoldOut Return -_1D13: +Villa_DontAddMenuEntry: Return -_1D15: - AddListMenuEntry 149, 0 +Villa_AddMenuEntryTableAvailable: + AddListMenuEntry Villa_Text_EntryTableAvailable, 0 Return -_1D1F: - AddListMenuEntry 169, 0 +Villa_AddMenuEntryTableSoldOut: + AddListMenuEntry Villa_Text_EntryTableSoldOut, 0 Return -_1D29: - AddListMenuEntry 150, 1 +Villa_AddMenuEntryBigSofaAvailable: + AddListMenuEntry Villa_Text_EntryBigSofaAvailable, 1 Return -_1D33: - AddListMenuEntry 170, 1 +Villa_AddMenuEntryBigSofaSoldOut: + AddListMenuEntry Villa_Text_EntryBigSofaSoldOut, 1 Return -_1D3D: - AddListMenuEntry 151, 2 +Villa_AddMenuEntrySmallSofaAvailable: + AddListMenuEntry Villa_Text_EntrySmallSofaAvailable, 2 Return -_1D47: - AddListMenuEntry 171, 2 +Villa_AddMenuEntrySmallSofaSoldOut: + AddListMenuEntry Villa_Text_EntrySmallSofaSoldOut, 2 Return -_1D51: - AddListMenuEntry 152, 3 +Villa_AddMenuEntryBedAvailable: + AddListMenuEntry Villa_Text_EntryBedAvailable, 3 Return -_1D5B: - AddListMenuEntry 172, 3 +Villa_AddMenuEntryBedSoldOut: + AddListMenuEntry Villa_Text_EntryBedSoldOut, 3 Return -_1D65: - AddListMenuEntry 153, 4 +Villa_AddMenuEntryNightTableAvailable: + AddListMenuEntry Villa_Text_EntryNightTableAvailable, 4 Return -_1D6F: - AddListMenuEntry 173, 4 +Villa_AddMenuEntryNightTableSoldOut: + AddListMenuEntry Villa_Text_EntryNightTableSoldOut, 4 Return -_1D79: - AddListMenuEntry 154, 5 +Villa_AddMenuEntryTVAvailable: + AddListMenuEntry Villa_Text_EntryTVAvailable, 5 Return -_1D83: - AddListMenuEntry 174, 5 +Villa_AddMenuEntryTVSoldOut: + AddListMenuEntry Villa_Text_EntryTVSoldOut, 5 Return -_1D8D: - AddListMenuEntry 155, 6 +Villa_AddMenuEntryAudioSystemAvailable: + AddListMenuEntry Villa_Text_EntryAudioSystemAvailable, 6 Return -_1D97: - AddListMenuEntry 175, 6 +Villa_AddMenuEntryAudioSystemSoldOut: + AddListMenuEntry Villa_Text_EntryAudioSystemSoldOut, 6 Return -_1DA1: - AddListMenuEntry 156, 7 +Villa_AddMenuEntryBookshelfAvailable: + AddListMenuEntry Villa_Text_EntryBookshelfAvailable, 7 Return -_1DAB: - AddListMenuEntry 176, 7 +Villa_AddMenuEntryBookshelfSoldOut: + AddListMenuEntry Villa_Text_EntryBookshelfSoldOut, 7 Return -_1DB5: - AddListMenuEntry 157, 8 +Villa_AddMenuEntryRackAvailable: + AddListMenuEntry Villa_Text_EntryRackAvailable, 8 Return -_1DBF: - AddListMenuEntry 177, 8 +Villa_AddMenuEntryRackSoldOut: + AddListMenuEntry Villa_Text_EntryRackSoldOut, 8 Return -_1DC9: - AddListMenuEntry 158, 9 +Villa_AddMenuEntryHouseplantAvailable: + AddListMenuEntry Villa_Text_EntryHouseplantAvailable, 9 Return -_1DD3: - AddListMenuEntry 178, 9 +Villa_AddMenuEntryHouseplantSoldOut: + AddListMenuEntry Villa_Text_EntryHouseplantSoldOut, 9 Return -_1DDD: - AddListMenuEntry 159, 10 +Villa_AddMenuEntryPCDeskAvailable: + AddListMenuEntry Villa_Text_EntryPCDeskAvailable, 10 Return -_1DE7: - AddListMenuEntry 179, 10 +Villa_AddMenuEntryPCDeskSoldOut: + AddListMenuEntry Villa_Text_EntryPCDeskSoldOut, 10 Return -_1DF1: - AddListMenuEntry 160, 11 +Villa_AddMenuEntryMusicBoxAvailable: + AddListMenuEntry Villa_Text_EntryMusicBoxAvailable, 11 Return -_1DFB: - AddListMenuEntry 180, 11 +Villa_AddMenuEntryMusicBoxSoldOut: + AddListMenuEntry Villa_Text_EntryMusicBoxSoldOut, 11 Return -_1E05: - AddListMenuEntry 161, 12 +Villa_AddMenuEntryPokemonBustAvailable: + AddListMenuEntry Villa_Text_EntryPokemonBustAvailable, 12 Return -_1E0F: - AddListMenuEntry 181, 12 +Villa_AddMenuEntryPokemonBustSoldOut: + AddListMenuEntry Villa_Text_EntryPokemonBustSoldOut, 12 Return -_1E19: - AddListMenuEntry 162, 13 +Villa_AddMenuEntryPokemonBustSilverAvailable: + AddListMenuEntry Villa_Text_EntryPokemonBustSilverAvailable, 13 Return -_1E23: - AddListMenuEntry 182, 13 +Villa_AddMenuEntryPokemonBustSilverSoldOut: + AddListMenuEntry Villa_Text_EntryPokemonBustSilverSoldOut, 13 Return -_1E2D: - AddListMenuEntry 163, 14 +Villa_AddMenuEntryPianoAvailable: + AddListMenuEntry Villa_Text_EntryPianoAvailable, 14 Return -_1E37: - AddListMenuEntry 183, 14 +Villa_AddMenuEntryPianoSoldOut: + AddListMenuEntry Villa_Text_EntryPianoSoldOut, 14 Return -_1E41: - AddListMenuEntry 164, 15 +Villa_AddMenuEntryGuestSetAvailable: + AddListMenuEntry Villa_Text_EntryGuestSetAvailable, 15 Return -_1E4B: - AddListMenuEntry 184, 15 +Villa_AddMenuEntryGuestSetSoldOut: + AddListMenuEntry Villa_Text_EntryGuestSetSoldOut, 15 Return -_1E55: - AddListMenuEntry 165, 16 +Villa_AddMenuEntryWallClockAvailable: + AddListMenuEntry Villa_Text_EntryWallClockAvailable, 16 Return -_1E5F: - AddListMenuEntry 185, 16 +Villa_AddMenuEntryWallClockSoldOut: + AddListMenuEntry Villa_Text_EntryWallClockSoldOut, 16 Return -_1E69: - AddListMenuEntry 166, 17 +Villa_AddMenuEntryMasterpieceAvailable: + AddListMenuEntry Villa_Text_EntryMasterpieceAvailable, 17 Return -_1E73: - AddListMenuEntry 186, 17 +Villa_AddMenuEntryMasterpieceSoldOut: + AddListMenuEntry Villa_Text_EntryMasterpieceSoldOut, 17 Return -_1E7D: - AddListMenuEntry 167, 18 +Villa_AddMenuEntryTeaSetAvailable: + AddListMenuEntry Villa_Text_EntryTeaSetAvailable, 18 Return -_1E87: - AddListMenuEntry 187, 18 +Villa_AddMenuEntryTeaSetSoldOut: + AddListMenuEntry Villa_Text_EntryTeaSetSoldOut, 18 Return -_1E91: - AddListMenuEntry 168, 19 +Villa_AddMenuEntryChandelierAvailable: + AddListMenuEntry Villa_Text_EntryChandelierAvailable, 19 Return -_1E9B: - AddListMenuEntry 188, 19 +Villa_AddMenuEntryChandelierSoldOut: + AddListMenuEntry Villa_Text_EntryChandelierSoldOut, 19 Return -_1EA5: - GoToIfSet FLAG_VILLA_FURNITURE_TABLE, _1FA9 +Villa_CheckCanBuyTable: + GoToIfSet FLAG_VILLA_FURNITURE_TABLE, Villa_CantBuyFurniture Return -_1EB2: - GoToIfSet FLAG_VILLA_FURNITURE_BIG_SOFA, _1FA9 +Villa_CheckCanBuyBigSofa: + GoToIfSet FLAG_VILLA_FURNITURE_BIG_SOFA, Villa_CantBuyFurniture Return -_1EBF: - GoToIfSet FLAG_VILLA_FURNITURE_SMALL_SOFA, _1FA9 +Villa_CheckCanBuySmallSofa: + GoToIfSet FLAG_VILLA_FURNITURE_SMALL_SOFA, Villa_CantBuyFurniture Return -_1ECC: - GoToIfSet FLAG_VILLA_FURNITURE_BED, _1FA9 +Villa_CheckCanBuyBedSofa: + GoToIfSet FLAG_VILLA_FURNITURE_BED, Villa_CantBuyFurniture Return -_1ED9: - GoToIfSet FLAG_VILLA_FURNITURE_NIGHT_TABLE, _1FA9 +Villa_CheckCanBuyNightTable: + GoToIfSet FLAG_VILLA_FURNITURE_NIGHT_TABLE, Villa_CantBuyFurniture Return -_1EE6: - GoToIfSet FLAG_VILLA_FURNITURE_TV, _1FA9 +Villa_CheckCanBuyTV: + GoToIfSet FLAG_VILLA_FURNITURE_TV, Villa_CantBuyFurniture Return -_1EF3: - GoToIfSet FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, _1FA9 +Villa_CheckCanBuyAudioSystem: + GoToIfSet FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, Villa_CantBuyFurniture Return -_1F00: - GoToIfSet FLAG_VILLA_FURNITURE_BOOKSHELF, _1FA9 +Villa_CheckCanBuyBookshelf: + GoToIfSet FLAG_VILLA_FURNITURE_BOOKSHELF, Villa_CantBuyFurniture Return -_1F0D: - GoToIfSet FLAG_VILLA_FURNITURE_RACK, _1FA9 +Villa_CheckCanBuyRack: + GoToIfSet FLAG_VILLA_FURNITURE_RACK, Villa_CantBuyFurniture Return -_1F1A: - GoToIfSet FLAG_VILLA_FURNITURE_HOUSEPLANT, _1FA9 +Villa_CheckCanBuyHouseplant: + GoToIfSet FLAG_VILLA_FURNITURE_HOUSEPLANT, Villa_CantBuyFurniture Return -_1F27: - GoToIfSet FLAG_VILLA_FURNITURE_PC_DESK, _1FA9 +Villa_CheckCanBuyPCDesk: + GoToIfSet FLAG_VILLA_FURNITURE_PC_DESK, Villa_CantBuyFurniture Return -_1F34: - GoToIfSet FLAG_VILLA_FURNITURE_MUSIC_BOX, _1FA9 +Villa_CheckCanBuyMusicBox: + GoToIfSet FLAG_VILLA_FURNITURE_MUSIC_BOX, Villa_CantBuyFurniture Return -_1F41: - GoToIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST, _1FA9 +Villa_CheckCanBuyPokemonBust: + GoToIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST, Villa_CantBuyFurniture Return -_1F4E: - GoToIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, _1FA9 +Villa_CheckCanBuyPokemonBustSilver: + GoToIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, Villa_CantBuyFurniture Return -_1F5B: - GoToIfSet FLAG_VILLA_FURNITURE_PIANO, _1FA9 +Villa_CheckCanBuyPiano: + GoToIfSet FLAG_VILLA_FURNITURE_PIANO, Villa_CantBuyFurniture Return -_1F68: - GoToIfSet FLAG_VILLA_FURNITURE_GUEST_SET, _1FA9 +Villa_CheckCanBuyGuestSet: + GoToIfSet FLAG_VILLA_FURNITURE_GUEST_SET, Villa_CantBuyFurniture Return -_1F75: - GoToIfSet FLAG_VILLA_FURNITURE_WALL_CLOCK, _1FA9 +Villa_CheckCanBuyWallClock: + GoToIfSet FLAG_VILLA_FURNITURE_WALL_CLOCK, Villa_CantBuyFurniture Return -_1F82: - GoToIfSet FLAG_VILLA_FURNITURE_MASTERPIECE, _1FA9 +Villa_CheckCanBuyMasterpiece: + GoToIfSet FLAG_VILLA_FURNITURE_MASTERPIECE, Villa_CantBuyFurniture Return -_1F8F: - GoToIfSet FLAG_VILLA_FURNITURE_TEA_SET, _1FA9 +Villa_CheckCanBuyTeaSet: + GoToIfSet FLAG_VILLA_FURNITURE_TEA_SET, Villa_CantBuyFurniture Return -_1F9C: - GoToIfSet FLAG_VILLA_FURNITURE_CHANDELIER, _1FA9 +Villa_CheckCanBuyChandelier: + GoToIfSet FLAG_VILLA_FURNITURE_CHANDELIER, Villa_CantBuyFurniture Return -_1FA9: - SetVar VAR_0x8003, 0 +Villa_CantBuyFurniture: + SetVar VAR_0x8003, FALSE Return Villa_CheckMoney_Table: @@ -2266,104 +2267,104 @@ Villa_BuyFurniture_Chandelier: SetFlag FLAG_VILLA_FURNITURE_CHANDELIER Return -_2209: - CallIfEq VAR_RESORT_VILLA_VISITOR, 0, _22CE - CallIfEq VAR_RESORT_VILLA_VISITOR, 1, _22D4 - CallIfEq VAR_RESORT_VILLA_VISITOR, 2, _22DA - CallIfEq VAR_RESORT_VILLA_VISITOR, 3, _22EB - CallIfEq VAR_RESORT_VILLA_VISITOR, 4, _22F1 - CallIfEq VAR_RESORT_VILLA_VISITOR, 5, _2302 - CallIfEq VAR_RESORT_VILLA_VISITOR, 6, _2313 - CallIfEq VAR_RESORT_VILLA_VISITOR, 7, _2324 - CallIfEq VAR_RESORT_VILLA_VISITOR, 8, _2335 - CallIfEq VAR_RESORT_VILLA_VISITOR, 9, _2346 - CallIfEq VAR_RESORT_VILLA_VISITOR, 10, _2357 - CallIfEq VAR_RESORT_VILLA_VISITOR, 11, _2368 - CallIfEq VAR_RESORT_VILLA_VISITOR, 12, _236E - CallIfEq VAR_RESORT_VILLA_VISITOR, 13, _237F - CallIfEq VAR_RESORT_VILLA_VISITOR, 14, _2389 +Villa_TryRemoveVisitor: + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_RIVAL, Villa_RemoveRival + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_COUNTERPART, Villa_RemoveCounterpart + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_PROF_ROWAN, Villa_TryRemoveRowan + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MOM, Villa_RemoveMom + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_ROARK, Villa_TryRemoveRoark + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_GARDENIA, Villa_TryRemoveGardenia + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_FANTINA, Villa_TryRemoveFantina + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MAYLENE, Villa_TryRemoveMaylene + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CRASHER_WAKE, Villa_TryRemoveWake + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_BYRON, Villa_TryRemoveByron + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CANDICE, Villa_TryRemoveCandice + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_VOLKNER, Villa_RemoveVolkner + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_CYNTHIA, Villa_TryRemoveCynthia + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_FLINT_VOLKNER, Villa_RemoveFlintAndVolkner + CallIfEq VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_MAYLENE_CANDICE, Villa_RemoveMayleneAndCandice Return -_22CE: - RemoveObject 1 +Villa_RemoveRival: + RemoveObject LOCALID_RIVAL Return -_22D4: - RemoveObject 0 +Villa_RemoveCounterpart: + RemoveObject LOCALID_COUNTERPART Return -_22DA: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _2395 - RemoveObject 2 +Villa_TryRemoveRowan: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_HideOutsideVisitors + RemoveObject LOCALID_PROF_ROWAN Return -_22EB: - RemoveObject 3 +Villa_RemoveMom: + RemoveObject LOCALID_MOM Return -_22F1: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _2395 - RemoveObject 4 +Villa_TryRemoveRoark: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_HideOutsideVisitors + RemoveObject LOCALID_ROARK Return -_2302: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _2395 - RemoveObject 5 +Villa_TryRemoveGardenia: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_HideOutsideVisitors + RemoveObject LOCALID_GARDENIA Return -_2313: - GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, _2393 - RemoveObject 6 +Villa_TryRemoveFantina: + GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, Villa_DontRemoveVisitor + RemoveObject LOCALID_FANTINA Return -_2324: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _2395 - RemoveObject 7 +Villa_TryRemoveMaylene: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_HideOutsideVisitors + RemoveObject LOCALID_MAYLENE Return -_2335: - GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, _2393 - RemoveObject 9 +Villa_TryRemoveWake: + GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, Villa_DontRemoveVisitor + RemoveObject LOCALID_CRASHER_WAKE Return -_2346: - GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _2395 - RemoveObject 8 +Villa_TryRemoveByron: + GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, Villa_HideOutsideVisitors + RemoveObject LOCALID_BYRON Return -_2357: - GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, _2393 - RemoveObject 10 +Villa_TryRemoveCandice: + GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, Villa_DontRemoveVisitor + RemoveObject LOCALID_CANDICE Return -_2368: - RemoveObject 11 +Villa_RemoveVolkner: + RemoveObject LOCALID_VOLKNER Return -_236E: - GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, _2393 - RemoveObject 12 +Villa_TryRemoveCynthia: + GoToIfUnset FLAG_VILLA_VISITOR_OUTSIDE, Villa_DontRemoveVisitor + RemoveObject LOCALID_CYNTHIA Return -_237F: - RemoveObject 13 - RemoveObject 11 +Villa_RemoveFlintAndVolkner: + RemoveObject LOCALID_FLINT + RemoveObject LOCALID_VOLKNER Return -_2389: - RemoveObject 7 - RemoveObject 10 +Villa_RemoveMayleneAndCandice: + RemoveObject LOCALID_MAYLENE + RemoveObject LOCALID_CANDICE Return -_2393: +Villa_DontRemoveVisitor: Return -_2395: - SetFlag FLAG_UNK_0x02AA - SetFlag FLAG_UNK_0x02AD - SetFlag FLAG_UNK_0x02AF - SetFlag FLAG_UNK_0x02B2 - SetFlag FLAG_UNK_0x02B5 +Villa_HideOutsideVisitors: + SetFlag FLAG_HIDE_RESORT_AREA_PROF_ROWAN + SetFlag FLAG_HIDE_RESORT_AREA_ROARK + SetFlag FLAG_HIDE_RESORT_AREA_GARDENIA + SetFlag FLAG_HIDE_RESORT_AREA_MAYLENE + SetFlag FLAG_HIDE_RESORT_AREA_BYRON Return .balign 4, 0 diff --git a/res/text/resort_area.json b/res/text/resort_area.json index 13b3833a6f..fe1de1e7c9 100644 --- a/res/text/resort_area.json +++ b/res/text/resort_area.json @@ -2,7 +2,7 @@ "key": 18227, "messages": [ { - "id": "pl_msg_00000596_00000", + "id": "ResortArea_Text_TraveledLongWay", "en_US": [ "I’ve traveled a long way to make my\n", "beloved Pokémon even more beautiful.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000596_00001", + "id": "ResortArea_Text_NothingTooGood", "en_US": [ "Nothing is too good for my Pokémon.\n", "There’s no mountain too high to climb.\f", @@ -19,7 +19,7 @@ ] }, { - "id": "pl_msg_00000596_00002", + "id": "ResortArea_Text_LongToBecomeMember", "en_US": [ "Oh, how I long to become a member of\n", "the Ribbon Syndicate.\r", @@ -28,7 +28,7 @@ ] }, { - "id": "pl_msg_00000596_00003", + "id": "ResortArea_Text_YouAreAMember", "en_US": [ "A member of the Ribbon Syndicate?\n", "You are? Really?\r", @@ -37,7 +37,7 @@ ] }, { - "id": "pl_msg_00000596_00004", + "id": "ResortArea_Text_DigUpCoolStuff", "en_US": [ "You know how you can dig up cool\n", "stuff in the Underground?\r", @@ -46,7 +46,7 @@ ] }, { - "id": "pl_msg_00000596_00005", + "id": "ResortArea_Text_SomethingLurks", "en_US": [ "Nobody believes me, but something\n", "lurks in the Resort Area.\r", @@ -59,7 +59,7 @@ ] }, { - "id": "pl_msg_00000596_00006", + "id": "ResortArea_Text_HaveThisVilla", "en_US": [ "Psst, hey, traveler! Yes, you!\n", "I want you to have this Villa!\r", @@ -74,7 +74,7 @@ ] }, { - "id": "pl_msg_00000596_00007", + "id": "ResortArea_Text_LoadOffMyMind", "en_US": [ "Whew, that’s a load off my mind.\r", "The original owner was from Hoenn,\n", @@ -90,7 +90,7 @@ ] }, { - "id": "pl_msg_00000596_00008", + "id": "ResortArea_Text_StillStrikeAsShady", "en_US": [ "What, I still strike you as shady?\n", "I daresay I can’t blame you, though.\r", @@ -99,14 +99,14 @@ ] }, { - "id": "pl_msg_00000596_00009", + "id": "ResortArea_Text_StepInside", "en_US": [ "None too shabby, you have to agree.\n", "Step inside for a look-see.\r" ] }, { - "id": "pl_msg_00000596_00010", + "id": "ResortArea_Text_RowanAskVisit", "en_US": [ "Rowan: Hm! I happened to be in the\n", "area on a small errand.\f", @@ -114,78 +114,78 @@ ] }, { - "id": "pl_msg_00000596_00011", + "id": "ResortArea_Text_RowanAcceptedVisit", "en_US": [ "Rowan: Hm!\n", "I appreciate your hospitality.\r" ] }, { - "id": "pl_msg_00000596_00012", + "id": "ResortArea_Text_RowanDeclinedVisit", "en_US": [ "Rowan: Hmm...\n", "Do you have something to hide?" ] }, { - "id": "pl_msg_00000596_00013", + "id": "ResortArea_Text_RoarkAskVisit", "en_US": [ "Roark: Hi! Could I take a peek inside\n", "your Villa?" ] }, { - "id": "pl_msg_00000596_00014", + "id": "ResortArea_Text_RoarkAcceptedVisit", "en_US": "Roark: Thanks!\r" }, { - "id": "pl_msg_00000596_00015", + "id": "ResortArea_Text_RoarkDeclinedVisit", "en_US": [ "Roark: ...Oh, sorry.\n", "Am I intruding on something?" ] }, { - "id": "pl_msg_00000596_00016", + "id": "ResortArea_Text_GardeniaAskVisit", "en_US": [ "Gardenia: Listen, listen!\n", "I came for a visit! Can I go in?" ] }, { - "id": "pl_msg_00000596_00017", + "id": "ResortArea_Text_GardeniaAcceptedVisit", "en_US": [ "Gardenia: Yes!\n", "No time to waste!\r" ] }, { - "id": "pl_msg_00000596_00018", + "id": "ResortArea_Text_GardeniaDeclinedVisit", "en_US": [ "Gardenia: Oh, right.\n", "You must have plans already." ] }, { - "id": "pl_msg_00000596_00019", + "id": "ResortArea_Text_MayleneAskVisit", "en_US": [ "Maylene: ...Um, your Villa...\n", "Would it be OK if I took a look around?" ] }, { - "id": "pl_msg_00000596_00020", + "id": "ResortArea_Text_MayleneAcceptedVisit", "en_US": "Maylene: Oh, thank you.\r" }, { - "id": "pl_msg_00000596_00021", + "id": "ResortArea_Text_MayleneDeclinedVisit", "en_US": [ "Maylene: Oh...\n", "It makes me a little sad..." ] }, { - "id": "pl_msg_00000596_00022", + "id": "ResortArea_Text_ByronAskVisit", "en_US": [ "Byron: Guhahahaha!\r", "How’s your Villa?\n", @@ -193,35 +193,35 @@ ] }, { - "id": "pl_msg_00000596_00023", + "id": "ResortArea_Text_ByronAcceptedVisit", "en_US": [ "Byron: All right!\n", "Let’s have a look, then!\r" ] }, { - "id": "pl_msg_00000596_00024", + "id": "ResortArea_Text_ByronDeclinedVisit", "en_US": [ "Byron: Well!\n", "How cold can you be?" ] }, { - "id": "pl_msg_00000596_00025", + "id": "ResortArea_Text_MapSign", "en_US": [ "Resort Area\n", "Relax & Play!" ] }, { - "id": "pl_msg_00000596_00026", + "id": "ResortArea_Text_SignRibbonSyndicate", "en_US": [ "The Ribbon Syndicate\n", "Members Only" ] }, { - "id": "pl_msg_00000596_00027", + "id": "ResortArea_Text_SignVilla", "en_US": "A Somewhat Impressive Villa" } ] diff --git a/res/text/resort_area_house.json b/res/text/resort_area_house.json index 33286d1d35..15862c3c95 100644 --- a/res/text/resort_area_house.json +++ b/res/text/resort_area_house.json @@ -2,7 +2,7 @@ "key": 50199, "messages": [ { - "id": "pl_msg_00000604_00000", + "id": "ResortAreaHouse_Text_AllINeedIsTV", "en_US": [ "All I need to be happy is my TV.\n", "That’s all I need.\r", @@ -17,7 +17,7 @@ ] }, { - "id": "pl_msg_00000604_00001", + "id": "ResortAreaHouse_Text_TheresBigTrouble", "en_US": [ "There’s big trouble!\n", "They’re saying the volcano’ll erupt!\r", @@ -25,7 +25,7 @@ ] }, { - "id": "pl_msg_00000604_00002", + "id": "ResortAreaHouse_Text_BestTrainersAtFrontier", "en_US": [ "The best Trainers from all over\n", "congregate at the Battle Frontier.\r", @@ -36,7 +36,7 @@ ] }, { - "id": "pl_msg_00000604_00003", + "id": "ResortAreaHouse_Text_SeenEveryPokemonSinnohMale", "en_US": [ "You’ve seen every Pokémon in Sinnoh!\n", "That is so cool!\r", @@ -45,7 +45,7 @@ ] }, { - "id": "pl_msg_00000604_00004", + "id": "ResortAreaHouse_Text_SeenEveryPokemonSinnohFemale", "en_US": [ "You’ve seen every Pokémon in Sinnoh!\n", "That is so cool!\r", diff --git a/res/text/resort_area_pokecenter_1f.json b/res/text/resort_area_pokecenter_1f.json index a2ebd7033b..d93111a887 100644 --- a/res/text/resort_area_pokecenter_1f.json +++ b/res/text/resort_area_pokecenter_1f.json @@ -2,7 +2,7 @@ "key": 11955, "messages": [ { - "id": "pl_msg_00000598_00000", + "id": "ResortAreaPokecenter1F_Text_DoAHeadstand", "en_US": [ "Do you know there’s a sure way to\n", "change the world?\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000598_00001", + "id": "ResortAreaPokecenter1F_Text_EveryoneKnowsPokemon", "en_US": [ "Wherever you are in the world!\r", "Whoever it is in the world!\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000598_00002", + "id": "ResortAreaPokecenter1F_Text_WillYouBattleMe", "en_US": [ "Po-Po-Pokémon!\r", "I want to become more like a PIKACHU!\n", @@ -28,15 +28,15 @@ ] }, { - "id": "pl_msg_00000598_00003", + "id": "ResortAreaPokecenter1F_Text_PiPikachu", "en_US": "Pi-Pikachu!\r" }, { - "id": "pl_msg_00000598_00004", + "id": "ResortAreaPokecenter1F_Text_PiPikachu2", "en_US": "Pi-Pikachu!" }, { - "id": "pl_msg_00000598_00005", + "id": "ResortAreaPokecenter1F_Text_HadTeamPampered", "en_US": [ "But I just had my team pampered at the\n", "Ribbon Syndicate!\r", diff --git a/res/text/resort_area_ribbon_syndicate_1f.json b/res/text/resort_area_ribbon_syndicate_1f.json index 1721810f64..ffa28e630d 100644 --- a/res/text/resort_area_ribbon_syndicate_1f.json +++ b/res/text/resort_area_ribbon_syndicate_1f.json @@ -2,7 +2,7 @@ "key": 17414, "messages": [ { - "id": "pl_msg_00000599_00000", + "id": "ResortAreaRibbonSyndicate1F_Text_CollectLotsOfRibbons", "en_US": [ "...Sniff...\n", "I do apologize.\r", @@ -15,7 +15,7 @@ ] }, { - "id": "pl_msg_00000599_00001", + "id": "ResortAreaRibbonSyndicate1F_Text_YouMustJoinUs", "en_US": [ "...Sniff...\n", "I do apologize.\r", @@ -38,7 +38,7 @@ ] }, { - "id": "pl_msg_00000599_00002", + "id": "ResortAreaRibbonSyndicate1F_Text_LookedForwardSeeingYou", "en_US": [ "Welcome! We’ve looked forward to\n", "seeing you, {STRVAR_1 3, 0, 0}.\r", @@ -48,7 +48,7 @@ ] }, { - "id": "pl_msg_00000599_00003", + "id": "ResortAreaRibbonSyndicate1F_Text_OfferGorgeousRibbon", "en_US": [ "Welcome.\r", "May I interest you in top-grade\n", @@ -64,7 +64,7 @@ ] }, { - "id": "pl_msg_00000599_00004", + "id": "ResortAreaRibbonSyndicate1F_Text_OfferRoyalRibbon", "en_US": [ "Welcome.\r", "May I interest you in top-grade\n", @@ -80,7 +80,7 @@ ] }, { - "id": "pl_msg_00000599_00005", + "id": "ResortAreaRibbonSyndicate1F_Text_OfferGorgeousRoyalRibbon", "en_US": [ "Welcome.\r", "May I interest you in top-grade\n", @@ -96,7 +96,7 @@ ] }, { - "id": "pl_msg_00000599_00006", + "id": "ResortAreaRibbonSyndicate1F_Text_ThatsGorgeousRoyalRibbon", "en_US": [ "Welcome...\n", "Ooh! That’s a Gorgeous Royal Ribbon!\r", @@ -105,49 +105,49 @@ ] }, { - "id": "pl_msg_00000599_00007", + "id": "ResortAreaRibbonSyndicate1F_Text_BoughtGorgeousRibbon", "en_US": [ "{STRVAR_1 3, 0, 0} bought\n", "a Gorgeous Ribbon.\r" ] }, { - "id": "pl_msg_00000599_00008", + "id": "ResortAreaRibbonSyndicate1F_Text_PutGorgeousRibbonOnPokemon", "en_US": [ "{STRVAR_1 3, 0, 0} put the Gorgeous Ribbon\n", "on {STRVAR_1 0, 2, 0}." ] }, { - "id": "pl_msg_00000599_00009", + "id": "ResortAreaRibbonSyndicate1F_Text_BoughtRoyalRibbon", "en_US": [ "{STRVAR_1 3, 0, 0} bought\n", "a Royal Ribbon.\r" ] }, { - "id": "pl_msg_00000599_00010", + "id": "ResortAreaRibbonSyndicate1F_Text_PutRoyalRibbonOnPokemon", "en_US": [ "{STRVAR_1 3, 0, 0} put the Royal Ribbon\n", "on {STRVAR_1 0, 2, 0}." ] }, { - "id": "pl_msg_00000599_00011", + "id": "ResortAreaRibbonSyndicate1F_Text_BoughtGorgeousRoyalRibbon", "en_US": [ "{STRVAR_1 3, 0, 0} bought\n", "a Gorgeous Royal Ribbon.\r" ] }, { - "id": "pl_msg_00000599_00012", + "id": "ResortAreaRibbonSyndicate1F_Text_PutRoyalGorgeousRibbonOnPokemon", "en_US": [ "{STRVAR_1 3, 0, 0} put the Gorgeous Royal\n", "Ribbon on {STRVAR_1 0, 2, 0}." ] }, { - "id": "pl_msg_00000599_00013", + "id": "ResortAreaRibbonSyndicate1F_Text_DontJokeAboutMoney", "en_US": [ "Oh, please, {STRVAR_1 3, 0, 0}.\r", "You shouldn’t joke about not\n", @@ -155,39 +155,39 @@ ] }, { - "id": "pl_msg_00000599_00014", + "id": "ResortAreaRibbonSyndicate1F_Text_PleaseVisitAgain", "en_US": [ "I see.\n", "Please do visit again." ] }, { - "id": "pl_msg_00000599_00015", + "id": "ResortAreaRibbonSyndicate1F_Text_SignOfStatus", "en_US": [ "Just being in here is a sign of\n", "status, just so you know." ] }, { - "id": "pl_msg_00000599_00016", + "id": "ResortAreaRibbonSyndicate1F_Text_WishMenPayAttention", "en_US": [ "I wish men would pay more attention\n", "to the way they dress themselves..." ] }, { - "id": "pl_msg_00000599_00017", + "id": "ResortAreaRibbonSyndicate1F_Text_WomenWorthyBeingSeen", "en_US": [ "A woman worthy of being seen with\n", "Pokémon... That’s what I hope to be." ] }, { - "id": "pl_msg_00000599_00018", + "id": "ResortAreaRibbonSyndicate1F_Text_SkittyCry", "en_US": "SKITTY: Skiii!" }, { - "id": "pl_msg_00000599_00019", + "id": "ResortAreaRibbonSyndicate1F_Text_PsyduckCry", "en_US": "PSYDUCK: Gyaugyau!" } ] diff --git a/res/text/resort_area_ribbon_syndicate_2f.json b/res/text/resort_area_ribbon_syndicate_2f.json index e23de877cc..9169802e55 100644 --- a/res/text/resort_area_ribbon_syndicate_2f.json +++ b/res/text/resort_area_ribbon_syndicate_2f.json @@ -2,7 +2,7 @@ "key": 17418, "messages": [ { - "id": "pl_msg_00000600_00000", + "id": "ResortAreaRibbonSyndicate2F_Text_CareToHaveSpaTreatment", "en_US": [ "How may we serve you today?\n", "Perhaps a spa treatment?\r", @@ -13,53 +13,53 @@ ] }, { - "id": "pl_msg_00000600_00001", + "id": "ResortAreaRibbonSyndicate2F_Text_SeeYouAgain", "en_US": "We hope to see you again." }, { - "id": "pl_msg_00000600_00002", + "id": "ResortAreaRibbonSyndicate2F_Text_RightThisWayPlease", "en_US": [ "Ah, yes.\n", "Right this way, please...\r" ] }, { - "id": "pl_msg_00000600_00003", + "id": "ResortAreaRibbonSyndicate2F_Text_ReadyToBegin", "en_US": [ "We’re ready to begin.\n", "Please, relax all your muscles.\r" ] }, { - "id": "pl_msg_00000600_00004", + "id": "ResortAreaRibbonSyndicate2F_Text_OilContainsDiamonds", "en_US": [ "This oil contains dissolved diamonds\n", "for enhanced effectiveness.\r" ] }, { - "id": "pl_msg_00000600_00005", + "id": "ResortAreaRibbonSyndicate2F_Text_FoamContainsPearls", "en_US": [ "This foam contains an extract taken\n", "from pearls.\r" ] }, { - "id": "pl_msg_00000600_00006", + "id": "ResortAreaRibbonSyndicate2F_Text_ToxinsForcedOut", "en_US": [ "The body’s toxins are forced out with\n", "a foreign massage technique.\r" ] }, { - "id": "pl_msg_00000600_00007", + "id": "ResortAreaRibbonSyndicate2F_Text_PerfumedByAroma", "en_US": [ "The salon’s air is perfumed by an\n", "herbal aroma for relaxation.\r" ] }, { - "id": "pl_msg_00000600_00008", + "id": "ResortAreaRibbonSyndicate2F_Text_MuchMoreFriendly", "en_US": [ "There.\n", "All done.\r", @@ -68,7 +68,7 @@ ] }, { - "id": "pl_msg_00000600_00009", + "id": "ResortAreaRibbonSyndicate2F_Text_OneSessionADay", "en_US": [ "Oh, I do apologize.\r", "We can only provide one spa\n", @@ -76,7 +76,7 @@ ] }, { - "id": "pl_msg_00000600_00010", + "id": "ResortAreaRibbonSyndicate2F_Text_MoreFriendly", "en_US": [ "There.\n", "All done.\r", @@ -85,7 +85,7 @@ ] }, { - "id": "pl_msg_00000600_00011", + "id": "ResortAreaRibbonSyndicate2F_Text_LittleMoreFriendly", "en_US": [ "There.\n", "All done.\r", @@ -94,7 +94,7 @@ ] }, { - "id": "pl_msg_00000600_00012", + "id": "ResortAreaRibbonSyndicate2F_Text_KeepFromSeeingOthers", "en_US": [ "We keep our clients and Pokémon from\n", "seeing others.\r", @@ -103,14 +103,14 @@ ] }, { - "id": "pl_msg_00000600_00013", + "id": "ResortAreaRibbonSyndicate2F_Text_OnlyFiveMembersADay", "en_US": [ "Our service is very exclusive.\n", "We only accept five members a day." ] }, { - "id": "pl_msg_00000600_00014", + "id": "ResortAreaRibbonSyndicate2F_Text_BringMembersCloser", "en_US": [ "We’ve developed a reputation for\n", "bringing our members closer to\f", diff --git a/res/text/resort_area_mart.json b/res/text/unused_resort_area_mart.json similarity index 63% rename from res/text/resort_area_mart.json rename to res/text/unused_resort_area_mart.json index 14ed3aea20..aae24bdf2c 100644 --- a/res/text/resort_area_mart.json +++ b/res/text/unused_resort_area_mart.json @@ -2,7 +2,7 @@ "key": 53168, "messages": [ { - "id": "pl_msg_00000597_00000", + "id": "ResortAreaMart_Text_Dummy0", "garbage": 18 } ] diff --git a/res/text/villa.json b/res/text/villa.json index 538683a53f..3424024d45 100644 --- a/res/text/villa.json +++ b/res/text/villa.json @@ -2,7 +2,7 @@ "key": 17438, "messages": [ { - "id": "Villa_Text_TheOriginalOwnersFurnitureIsGone", + "id": "Villa_Text_OriginalFurnitureIsGone", "en_US": [ "The original owner’s furniture is gone,\n", "and I didn’t buy any.\r", @@ -16,14 +16,14 @@ ] }, { - "id": "Villa_Text_GoAheadOrderATableFromThisOrderForm", + "id": "Villa_Text_OrderTable", "en_US": [ "Go ahead, order a Table from this\n", "order form!" ] }, { - "id": "Villa_Text_WhoaWhoaDontGoYet", + "id": "Villa_Text_DontGoYet", "en_US": [ "Whoa, whoa!\n", "Don’t go yet!\r", @@ -32,7 +32,7 @@ ] }, { - "id": "Villa_Text_ThankYouForWaitingImDeliveringYourOrder_WeHopeYoullKeepOrdering", + "id": "Villa_Text_DeliveringOrderKeepOrdering", "en_US": [ "Thank you for waiting!\n", "I’m delivering your order!\r", @@ -41,7 +41,7 @@ ] }, { - "id": "pl_msg_00000602_00004", + "id": "Villa_Text_FinallyRidOfVilla", "en_US": [ "The furniture place’s service is great.\n", "They’re real eager for business.\r", @@ -54,22 +54,22 @@ ] }, { - "id": "pl_msg_00000602_00005", + "id": "Villa_Text_Dummy5", "garbage": 25 }, { - "id": "pl_msg_00000602_00006", + "id": "Villa_Text_Dummy6", "garbage": 104 }, { - "id": "Villa_Text_ThankYouForWaitingImDeliveringYourOrder", + "id": "Villa_Text_DeliveringOrder", "en_US": [ "Thank you for waiting!\n", "I’m delivering your order!\r" ] }, { - "id": "Villa_Text_ThankYouForWaitingImDeliveringYourOrder_AlsoAndIHateToSayThisBut", + "id": "Villa_Text_DeliveringOrderOutOfFurniture", "en_US": [ "Thank you for waiting!\n", "I’m delivering your order!\r", @@ -82,7 +82,7 @@ ] }, { - "id": "pl_msg_00000602_00009", + "id": "Villa_Text_RivalMessageEntry", "en_US": [ "{STRVAR_1 3, 0, 0}: Hey, {STRVAR_1 3, 1, 0}!\n", "You got yourself a Villa now?\r", @@ -93,7 +93,7 @@ ] }, { - "id": "pl_msg_00000602_00010", + "id": "Villa_Text_DawnMessageEntry", "en_US": [ "Dawn: Wow, {STRVAR_1 3, 1, 0}, this sofa is\n", "so sumptuous!\r", @@ -102,7 +102,7 @@ ] }, { - "id": "pl_msg_00000602_00011", + "id": "Villa_Text_LucasMessageEntry", "en_US": [ "Lucas: Is this sofa to your taste,\n", "{STRVAR_1 3, 1, 0}?\r", @@ -111,7 +111,7 @@ ] }, { - "id": "pl_msg_00000602_00012", + "id": "Villa_Text_RowanMessageEntry", "en_US": [ "Rowan: Hm, that’s rather a good\n", "Bookshelf.\r", @@ -122,7 +122,7 @@ ] }, { - "id": "pl_msg_00000602_00013", + "id": "Villa_Text_GardeniaMessageEntry", "en_US": [ "Gardenia: Oh, hey! A Houseplant!\r", "It’s really nice!\n", @@ -132,7 +132,7 @@ ] }, { - "id": "pl_msg_00000602_00014", + "id": "Villa_Text_CynthiaMessageEntry", "en_US": [ "Cynthia: Oh...?\n", "This is a good piano.\r", @@ -145,7 +145,7 @@ ] }, { - "id": "pl_msg_00000602_00015", + "id": "Villa_Text_RivalMessage0", "en_US": [ "{STRVAR_1 3, 0, 0}: Too slooooow!\r", "You keep me waiting all the time!\n", @@ -153,7 +153,7 @@ ] }, { - "id": "pl_msg_00000602_00016", + "id": "Villa_Text_RivalMessage1", "en_US": [ "{STRVAR_1 3, 0, 0}: So, anyway, how are\n", "things at the Battle Frontier?\r", @@ -162,7 +162,7 @@ ] }, { - "id": "pl_msg_00000602_00017", + "id": "Villa_Text_RivalMessage2", "en_US": [ "{STRVAR_1 3, 0, 0}: Oh, yeah, the other day\n", "at the Battle Tower...\r", @@ -171,7 +171,7 @@ ] }, { - "id": "pl_msg_00000602_00018", + "id": "Villa_Text_RivalMessage3", "en_US": [ "{STRVAR_1 3, 0, 0}: This is a cool place you\n", "have here.\r", @@ -180,7 +180,7 @@ ] }, { - "id": "pl_msg_00000602_00019", + "id": "Villa_Text_RivalMessage4", "en_US": [ "{STRVAR_1 3, 0, 0}: You know, I’ve been\n", "thinking lately...\r", @@ -189,7 +189,7 @@ ] }, { - "id": "pl_msg_00000602_00020", + "id": "Villa_Text_DawnMessage0", "en_US": [ "Dawn: {STRVAR_1 3, 1, 0}, are you going to\n", "collect furniture now?\r", @@ -200,7 +200,7 @@ ] }, { - "id": "pl_msg_00000602_00021", + "id": "Villa_Text_DawnMessage1", "en_US": [ "Dawn: I had no idea that you can get\n", "a Villa as a gift.\r", @@ -208,7 +208,7 @@ ] }, { - "id": "pl_msg_00000602_00022", + "id": "Villa_Text_DawnMessage2", "en_US": [ "Dawn: I’m envious of you having your\n", "own place.\r", @@ -217,7 +217,7 @@ ] }, { - "id": "pl_msg_00000602_00023", + "id": "Villa_Text_DawnMessage3", "en_US": [ "Dawn: Sigh...\r", "To be with that special someone in a\n", @@ -226,7 +226,7 @@ ] }, { - "id": "pl_msg_00000602_00024", + "id": "Villa_Text_DawnMessage4", "en_US": [ "Dawn: You run into so many Pokémon in\n", "the Battle Zone. It’s a bit much.\r", @@ -235,7 +235,7 @@ ] }, { - "id": "pl_msg_00000602_00025", + "id": "Villa_Text_LucasMessage0", "en_US": [ "Lucas: {STRVAR_1 3, 1, 0}, are you collecting\n", "furniture, too, now?\r", @@ -246,7 +246,7 @@ ] }, { - "id": "pl_msg_00000602_00026", + "id": "Villa_Text_LucasMessage1", "en_US": [ "Lucas: You could get a Villa as a\n", "gift? I did not know that.\r", @@ -256,7 +256,7 @@ ] }, { - "id": "pl_msg_00000602_00027", + "id": "Villa_Text_LucasMessage2", "en_US": [ "Lucas: The Battle Zone’s intense and\n", "fun, huh?\r", @@ -266,7 +266,7 @@ ] }, { - "id": "pl_msg_00000602_00028", + "id": "Villa_Text_LucasMessage3", "en_US": [ "Lucas: Having this Villa must be\n", "convenient.\r", @@ -275,7 +275,7 @@ ] }, { - "id": "pl_msg_00000602_00029", + "id": "Villa_Text_LucasMessage4", "en_US": [ "Lucas: You can find so many different\n", "kinds of Pokémon in the Battle Zone.\r", @@ -284,7 +284,7 @@ ] }, { - "id": "pl_msg_00000602_00030", + "id": "Villa_Text_RowanMessage0", "en_US": [ "Rowan: Hm!\n", "How are things going for you lately?\r", @@ -297,7 +297,7 @@ ] }, { - "id": "pl_msg_00000602_00031", + "id": "Villa_Text_RowanMessage1", "en_US": [ "Rowan: Hm!\n", "You seem well.\r", @@ -311,7 +311,7 @@ ] }, { - "id": "pl_msg_00000602_00032", + "id": "Villa_Text_RowanMessage2", "en_US": [ "Rowan: Hm!\n", "You seem well.\r", @@ -327,7 +327,7 @@ ] }, { - "id": "pl_msg_00000602_00033", + "id": "Villa_Text_RowanMessage3", "en_US": [ "Rowan: Hm!\n", "You look well.\r", @@ -338,7 +338,7 @@ ] }, { - "id": "pl_msg_00000602_00034", + "id": "Villa_Text_RowanMessage4", "en_US": [ "Rowan: Hmm...\r", "This place feels like the home I shared\n", @@ -347,7 +347,7 @@ ] }, { - "id": "pl_msg_00000602_00035", + "id": "Villa_Text_MomMessage0", "en_US": [ "Mom: Oh, {STRVAR_1 3, 1, 0}!\n", "I’d heard from {STRVAR_1 3, 0, 0}, but...\r", @@ -357,7 +357,7 @@ ] }, { - "id": "pl_msg_00000602_00036", + "id": "Villa_Text_MomMessage1", "en_US": [ "Mom: {STRVAR_1 3, 1, 0}, this Villa, if I\n", "were to give it a grade...\r", @@ -366,7 +366,7 @@ ] }, { - "id": "pl_msg_00000602_00037", + "id": "Villa_Text_MomMessage2", "en_US": [ "Mom: If it were me, I would put that\n", "piece of furniture over there...\r", @@ -375,7 +375,7 @@ ] }, { - "id": "pl_msg_00000602_00038", + "id": "Villa_Text_MomMessage3", "en_US": [ "Mom: It must make you happy collecting\n", "the furniture.\r", @@ -386,7 +386,7 @@ ] }, { - "id": "pl_msg_00000602_00039", + "id": "Villa_Text_MomMessage4", "en_US": [ "Mom: I think Contests and home designs\n", "say a lot about the person.\r", @@ -395,7 +395,7 @@ ] }, { - "id": "pl_msg_00000602_00040", + "id": "Villa_Text_RoarkMessage0", "en_US": [ "Roark: The Underground extends\n", "even underneath the Resort Area.\r", @@ -405,7 +405,7 @@ ] }, { - "id": "pl_msg_00000602_00041", + "id": "Villa_Text_RoarkMessage1", "en_US": [ "Roark: If it were me, I would display\n", "the things I dig up.\r", @@ -416,7 +416,7 @@ ] }, { - "id": "pl_msg_00000602_00042", + "id": "Villa_Text_RoarkMessage2", "en_US": [ "Roark: If it were me, I’d like to put\n", "a Fossil over there.\r", @@ -425,7 +425,7 @@ ] }, { - "id": "pl_msg_00000602_00043", + "id": "Villa_Text_RoarkMessage3", "en_US": [ "Roark: This place feels different from\n", "an underground Secret Base.\r", @@ -434,7 +434,7 @@ ] }, { - "id": "pl_msg_00000602_00044", + "id": "Villa_Text_RoarkMessage4", "en_US": [ "Roark: What I think about while digging\n", "underground...\r", @@ -445,7 +445,7 @@ ] }, { - "id": "pl_msg_00000602_00045", + "id": "Villa_Text_GardeniaMessage0", "en_US": [ "Gardenia: Sigh... This is so dreamy...\n", "The Resort Area’s a nice place.\r", @@ -454,7 +454,7 @@ ] }, { - "id": "pl_msg_00000602_00046", + "id": "Villa_Text_GardeniaMessage1", "en_US": [ "Gardenia: I know it’s a little abrupt,\n", "but don’t you think Grass-type Pokémon\f", @@ -464,7 +464,7 @@ ] }, { - "id": "pl_msg_00000602_00047", + "id": "Villa_Text_GardeniaMessage2", "en_US": [ "Gardenia: I could tell you ten good\n", "things about Grass-type Pokémon.\r", @@ -474,7 +474,7 @@ ] }, { - "id": "pl_msg_00000602_00048", + "id": "Villa_Text_GardeniaMessage3", "en_US": [ "Gardenia: Do you remember those rumors\n", "about the Old Chateau?\r", @@ -485,7 +485,7 @@ ] }, { - "id": "pl_msg_00000602_00049", + "id": "Villa_Text_GardeniaMessage4", "en_US": [ "Gardenia: ...I’m in a dilemma now.\r", "You see, I don’t like ghost Pokémon\n", @@ -496,14 +496,14 @@ ] }, { - "id": "pl_msg_00000602_00050", + "id": "Villa_Text_FantinaMessage0", "en_US": [ "Fantina: Oh, c’est fantastique!\n", "This is where you practice dancing, non?" ] }, { - "id": "pl_msg_00000602_00051", + "id": "Villa_Text_FantinaMessage1", "en_US": [ "Fantina: Whenever and wherever, dance,\n", "dance, dance!\r", @@ -513,7 +513,7 @@ ] }, { - "id": "pl_msg_00000602_00052", + "id": "Villa_Text_FantinaMessage2", "en_US": [ "Fantina: Ooh la la!\n", "This is very nice!\r", @@ -526,7 +526,7 @@ ] }, { - "id": "pl_msg_00000602_00053", + "id": "Villa_Text_FantinaMessage3", "en_US": [ "Fantina: Ooh la la!\n", "I have an inspiration!\r", @@ -537,7 +537,7 @@ ] }, { - "id": "pl_msg_00000602_00054", + "id": "Villa_Text_FantinaMessage4", "en_US": [ "Fantina: You!\r", "Have you met Dahlia?\n", @@ -548,7 +548,7 @@ ] }, { - "id": "pl_msg_00000602_00055", + "id": "Villa_Text_MayleneMessage0", "en_US": [ "Maylene: {STRVAR_1 3, 1, 0}, please hear how\n", "my training is going.\r", @@ -558,7 +558,7 @@ ] }, { - "id": "pl_msg_00000602_00056", + "id": "Villa_Text_MayleneMessage1", "en_US": [ "Maylene: {STRVAR_1 3, 1, 0}, please hear how\n", "my training is going.\r", @@ -569,7 +569,7 @@ ] }, { - "id": "pl_msg_00000602_00057", + "id": "Villa_Text_MayleneMessage2", "en_US": [ "Maylene: {STRVAR_1 3, 1, 0}, please hear how\n", "my training is going.\r", @@ -580,7 +580,7 @@ ] }, { - "id": "pl_msg_00000602_00058", + "id": "Villa_Text_MayleneMessage3", "en_US": [ "Maylene: {STRVAR_1 3, 1, 0}, please hear how\n", "my training is going.\r", @@ -591,7 +591,7 @@ ] }, { - "id": "pl_msg_00000602_00059", + "id": "Villa_Text_MayleneMessage4", "en_US": [ "Maylene: {STRVAR_1 3, 1, 0}, please hear how\n", "my training is going.\r", @@ -603,7 +603,7 @@ ] }, { - "id": "pl_msg_00000602_00060", + "id": "Villa_Text_WakeMessage0", "en_US": [ "Wake: Hey!\n", "{STRVAR_1 3, 0, 0} told me to come.\r", @@ -615,7 +615,7 @@ ] }, { - "id": "pl_msg_00000602_00061", + "id": "Villa_Text_WakeMessage1", "en_US": [ "Wake: Mmmmm...!\n", "Listen, you!\r", @@ -626,7 +626,7 @@ ] }, { - "id": "pl_msg_00000602_00062", + "id": "Villa_Text_WakeMessage2", "en_US": [ "Wake: I’ve been thinking, though.\r", "That pal of yours, {STRVAR_1 3, 0, 0}, and\n", @@ -639,7 +639,7 @@ ] }, { - "id": "pl_msg_00000602_00063", + "id": "Villa_Text_WakeMessage3", "en_US": [ "Wake: ...This place here...\n", "You don’t have a microphone handy?\r", @@ -650,7 +650,7 @@ ] }, { - "id": "pl_msg_00000602_00064", + "id": "Villa_Text_WakeMessage4", "en_US": [ "Wake: I was meaning to ask you, by the\n", "way...\r", @@ -665,7 +665,7 @@ ] }, { - "id": "pl_msg_00000602_00065", + "id": "Villa_Text_ByronMessage0", "en_US": [ "Byron: Gwahahahaha!\r", "I spent a long time living on Iron\n", @@ -677,7 +677,7 @@ ] }, { - "id": "pl_msg_00000602_00066", + "id": "Villa_Text_ByronMessage1", "en_US": [ "Byron: Well...\r", "I have to admit I’m not very interested\n", @@ -689,7 +689,7 @@ ] }, { - "id": "pl_msg_00000602_00067", + "id": "Villa_Text_ByronMessage2", "en_US": [ "Byron: Digging underneath Iron Island\n", "was a good time in my life.\r", @@ -701,7 +701,7 @@ ] }, { - "id": "pl_msg_00000602_00068", + "id": "Villa_Text_ByronMessage3", "en_US": [ "Byron: Roark is still a boy, but at the\n", "same time, he’s a man in his own right.\r", @@ -713,7 +713,7 @@ ] }, { - "id": "pl_msg_00000602_00069", + "id": "Villa_Text_ByronMessage4", "en_US": [ "Byron: You’re acquainted with a fellow\n", "named Riley, aren’t you?\r", @@ -723,7 +723,7 @@ ] }, { - "id": "pl_msg_00000602_00070", + "id": "Villa_Text_CandiceMessage0", "en_US": [ "Candice: Giving you an Icicle Badge made\n", "me think.\r", @@ -733,7 +733,7 @@ ] }, { - "id": "pl_msg_00000602_00071", + "id": "Villa_Text_CandiceMessage1", "en_US": [ "Candice: In a battle, when both sides\n", "are down to their last Pokémon...\r", @@ -744,7 +744,7 @@ ] }, { - "id": "pl_msg_00000602_00072", + "id": "Villa_Text_CandiceMessage2", "en_US": [ "Candice: Whew...\n", "The Resort Area is pretty warm.\f", @@ -752,7 +752,7 @@ ] }, { - "id": "pl_msg_00000602_00073", + "id": "Villa_Text_CandiceMessage3", "en_US": [ "Candice: This furniture...\n", "Oh, I get it... It’s like this...\r", @@ -760,7 +760,7 @@ ] }, { - "id": "pl_msg_00000602_00074", + "id": "Villa_Text_CandiceMessage4", "en_US": [ "Candice: Why does the Snowpoint Gym\n", "Leader have to guard that icy temple\f", @@ -768,7 +768,7 @@ ] }, { - "id": "pl_msg_00000602_00075", + "id": "Villa_Text_VolknerMessage0", "en_US": [ "Volkner: I was told by Flint that we’re\n", "meeting here.\r", @@ -777,7 +777,7 @@ ] }, { - "id": "pl_msg_00000602_00076", + "id": "Villa_Text_VolknerMessage1", "en_US": [ "Volkner: Every one of my Pokémon are\n", "top class in potential.\r", @@ -785,7 +785,7 @@ ] }, { - "id": "pl_msg_00000602_00077", + "id": "Villa_Text_VolknerMessage2", "en_US": [ "Volkner: Oh, yeah.\n", "I decided not to join the Elite Four.\r", @@ -796,7 +796,7 @@ ] }, { - "id": "pl_msg_00000602_00078", + "id": "Villa_Text_VolknerMessage3", "en_US": [ "Volkner: My ELECTIVIRE is a force of\n", "nature to be reckoned with.\r", @@ -805,7 +805,7 @@ ] }, { - "id": "pl_msg_00000602_00079", + "id": "Villa_Text_VolknerMessage4", "en_US": [ "Volkner: Hmm...\r", "This place gives me ideas about how\n", @@ -813,7 +813,7 @@ ] }, { - "id": "pl_msg_00000602_00080", + "id": "Villa_Text_CynthiaMessage0", "en_US": [ "Cynthia: I think I could get to like\n", "this atmosphere.\r", @@ -824,7 +824,7 @@ ] }, { - "id": "pl_msg_00000602_00081", + "id": "Villa_Text_CynthiaMessage1", "en_US": [ "Cynthia: It’s so relaxing here...\r", "Sigh...\n", @@ -836,7 +836,7 @@ ] }, { - "id": "pl_msg_00000602_00082", + "id": "Villa_Text_CynthiaMessage2", "en_US": [ "Cynthia: What’s necessary to become\n", "stronger?\r", @@ -847,7 +847,7 @@ ] }, { - "id": "pl_msg_00000602_00083", + "id": "Villa_Text_CynthiaMessage3", "en_US": [ "Cynthia: The Spear Pillar...\n", "The Distortion World...\r", @@ -858,7 +858,7 @@ ] }, { - "id": "pl_msg_00000602_00084", + "id": "Villa_Text_CynthiaMessage4", "en_US": [ "Cynthia: When you are facing a Trainer\n", "in a battle, you can learn everything\f", @@ -872,7 +872,7 @@ ] }, { - "id": "pl_msg_00000602_00085", + "id": "Villa_Text_FlintMessage0", "en_US": [ "Flint: Hey, you!\r", "You used my prize money to buy this\n", @@ -882,14 +882,14 @@ ] }, { - "id": "pl_msg_00000602_00086", + "id": "Villa_Text_FlintAndVolknerMessage0", "en_US": [ "Volkner: My relationship to Flint?\n", "There’s no love lost, that’s for sure." ] }, { - "id": "pl_msg_00000602_00087", + "id": "Villa_Text_FlintMessage1", "en_US": [ "Flint: Hey, listen, you!\r", "If that Volkner tries to sell you on\n", @@ -899,7 +899,7 @@ ] }, { - "id": "pl_msg_00000602_00088", + "id": "Villa_Text_FlintAndVolknerMessage1", "en_US": [ "Volkner: When I got my first Gym Badge,\n", "I used the move Thunderbolt.\r", @@ -914,7 +914,7 @@ ] }, { - "id": "pl_msg_00000602_00089", + "id": "Villa_Text_FlintAndVolknerMessage2", "en_US": [ "Flint: ...Volkner.\r", "Volkner: What?\r", @@ -929,7 +929,7 @@ ] }, { - "id": "pl_msg_00000602_00090", + "id": "Villa_Text_FlintAndVolknerMessage3", "en_US": [ "Flint: Hmm...\r", "Volkner: What’s wrong?\n", @@ -945,7 +945,7 @@ ] }, { - "id": "pl_msg_00000602_00091", + "id": "Villa_Text_FlintAndVolknerMessage4", "en_US": [ "Flint: Say, hey, Volkner.\n", "What do you say we battle here?\r", @@ -958,7 +958,7 @@ ] }, { - "id": "pl_msg_00000602_00092", + "id": "Villa_Text_MayleneAndCandiceMessage0", "en_US": [ "Maylene: What makes a Gym Leader a\n", "good one?\r", @@ -969,7 +969,7 @@ ] }, { - "id": "pl_msg_00000602_00093", + "id": "Villa_Text_MayleneAndCandiceMessage1", "en_US": [ "Maylene: ...You know those Accessories\n", "for Pokémon?\r", @@ -983,7 +983,7 @@ ] }, { - "id": "pl_msg_00000602_00094", + "id": "Villa_Text_MayleneAndCandiceMessage2", "en_US": [ "Maylene: ...Candice?\r", "Candice: Yes?\r", @@ -994,7 +994,7 @@ ] }, { - "id": "pl_msg_00000602_00095", + "id": "Villa_Text_MayleneAndCandiceMessage3", "en_US": [ "Maylene: Candice, what does it mean to\n", "be strong?\r", @@ -1007,7 +1007,7 @@ ] }, { - "id": "pl_msg_00000602_00096", + "id": "Villa_Text_MayleneAndCandiceMessage4", "en_US": [ "Maylene: ...This is delicious!\r", "Candice: Then have some more.\r", @@ -1017,435 +1017,435 @@ ] }, { - "id": "pl_msg_00000602_00097", + "id": "Villa_Text_Dummy97", "garbage": 16 }, { - "id": "pl_msg_00000602_00098", + "id": "Villa_Text_Dummy98", "garbage": 25 }, { - "id": "Villa_Text_Table", + "id": "Villa_Text_DescriptionTable", "en_US": [ "The table’s subtle curves accentuate\n", "its distinctive presence." ] }, { - "id": "Villa_Text_BigSofa", + "id": "Villa_Text_DescriptionBigSofa", "en_US": [ "A big sofa with a wonderful sense\n", "of presence." ] }, { - "id": "Villa_Text_SmallSofa", + "id": "Villa_Text_DescriptionSmallSofa", "en_US": [ "A smaller sofa with a wonderful sense\n", "of presence." ] }, { - "id": "Villa_Text_Bed", + "id": "Villa_Text_DescriptionBed", "en_US": [ "A canopied bed for deep, relaxing\n", "sleep." ] }, { - "id": "Villa_Text_NightTable", + "id": "Villa_Text_DescriptionNightTable", "en_US": "A small night table for the bedside." }, { - "id": "Villa_Text_TV", + "id": "Villa_Text_DescriptionTV", "en_US": "A TV featuring the latest technology." }, { - "id": "Villa_Text_AudioSystem", + "id": "Villa_Text_DescriptionAudioSystem", "en_US": [ "An audio system that maximally draws\n", "out the charms of music." ] }, { - "id": "Villa_Text_Bookshelf", + "id": "Villa_Text_DescriptionBookshelf", "en_US": [ "The shelves are lined with books left\n", "by Prof. Rowan." ] }, { - "id": "Villa_Text_Rack", + "id": "Villa_Text_DescriptionRack", "en_US": [ "An attractive rack that looks good with\n", "or without things on it." ] }, { - "id": "Villa_Text_Houseplant", + "id": "Villa_Text_DescriptionHouseplant", "en_US": [ "All houseplants give off the fragrance\n", "of life." ] }, { - "id": "Villa_Text_PCDesk", + "id": "Villa_Text_DescriptionPCDesk", "en_US": [ "A thin-bodied PC made for the design\n", "conscious." ] }, { - "id": "Villa_Text_MusicBox", + "id": "Villa_Text_DescriptionMusicBox", "en_US": [ "A handmade music box with a soothing\n", "melody." ] }, { - "id": "Villa_Text_PokemonBust", + "id": "Villa_Text_DescriptionPokemonBust", "en_US": [ "An almost lifelike Pokémon statue.\n", "It would be nice to have a pair." ] }, { - "id": "Villa_Text_PokemonBustSilver", + "id": "Villa_Text_DescriptionPokemonBustSilver", "en_US": [ "An almost lifelike Pokémon statue.\n", "It would be nice to have a pair." ] }, { - "id": "Villa_Text_Piano", + "id": "Villa_Text_DescriptionPiano", "en_US": [ "Even playing a simple scale will tell you\n", "this is a special piano." ] }, { - "id": "Villa_Text_GuestSet", + "id": "Villa_Text_DescriptionGuestSet", "en_US": [ "A guest set that exemplifies the\n", "meaning of comfort." ] }, { - "id": "Villa_Text_WallClock", + "id": "Villa_Text_DescriptionWallClock", "en_US": [ "A clock that teaches the beauty of\n", "precisely marking time." ] }, { - "id": "Villa_Text_Masterpiece", + "id": "Villa_Text_DescriptionMasterpiece", "en_US": [ "A breathtaking masterpiece that no\n", "words can ever do justice." ] }, { - "id": "Villa_Text_TeaSet", + "id": "Villa_Text_DescriptionTeaSet", "en_US": [ "An exquisitely designed tea set for\n", "luxuriantly elegant times." ] }, { - "id": "Villa_Text_Chandelier", + "id": "Villa_Text_DescriptionChandelier", "en_US": [ "Light makes the glass gleam, and the\n", "glass dazzlingly reflects the light." ] }, { - "id": "pl_msg_00000602_00119", + "id": "Villa_Text_PlayerOpenedOrderForm", "en_US": "{STRVAR_1 3, 1, 0} opened the order form.\r" }, { - "id": "pl_msg_00000602_00120", + "id": "Villa_Text_OrderWhichFurniture", "en_US": [ "Which furniture would\n", "you like to order?" ] }, { - "id": "pl_msg_00000602_00121", + "id": "Villa_Text_OrderChosenFurniture", "en_US": [ "Order the chosen\n", "furniture?" ] }, { - "id": "pl_msg_00000602_00122", + "id": "Villa_Text_AlreadyBoughtOne", "en_US": "You’ve already bought one." }, { - "id": "pl_msg_00000602_00123", + "id": "Villa_Text_NotEnoughMoney", "en_US": "You don’t have enough money." }, { - "id": "Villa_Text_ThisIsTheListOfPurchasedFurniture", + "id": "Villa_Text_ListOfPurchases", "en_US": "This is the list of purchased furniture." }, { - "id": "pl_msg_00000602_00125", + "id": "Villa_Text_Dummy125", "garbage": 10 }, { - "id": "pl_msg_00000602_00126", + "id": "Villa_Text_Dummy126", "garbage": 13 }, { - "id": "pl_msg_00000602_00127", + "id": "Villa_Text_Dummy127", "garbage": 13 }, { - "id": "pl_msg_00000602_00128", + "id": "Villa_Text_Dummy128", "garbage": 9 }, { - "id": "pl_msg_00000602_00129", + "id": "Villa_Text_Dummy129", "garbage": 13 }, { - "id": "pl_msg_00000602_00130", + "id": "Villa_Text_Dummy130", "garbage": 12 }, { - "id": "pl_msg_00000602_00131", + "id": "Villa_Text_Dummy131", "garbage": 14 }, { - "id": "pl_msg_00000602_00132", + "id": "Villa_Text_Dummy132", "garbage": 10 }, { - "id": "pl_msg_00000602_00133", + "id": "Villa_Text_Dummy133", "garbage": 9 }, { - "id": "pl_msg_00000602_00134", + "id": "Villa_Text_Dummy134", "garbage": 13 }, { - "id": "pl_msg_00000602_00135", + "id": "Villa_Text_Dummy135", "garbage": 13 }, { - "id": "pl_msg_00000602_00136", + "id": "Villa_Text_Dummy136", "garbage": 11 }, { - "id": "pl_msg_00000602_00137", + "id": "Villa_Text_Dummy137", "garbage": 12 }, { - "id": "pl_msg_00000602_00138", + "id": "Villa_Text_Dummy138", "garbage": 12 }, { - "id": "pl_msg_00000602_00139", + "id": "Villa_Text_Dummy139", "garbage": 9 }, { - "id": "pl_msg_00000602_00140", + "id": "Villa_Text_Dummy140", "garbage": 13 }, { - "id": "pl_msg_00000602_00141", + "id": "Villa_Text_Dummy141", "garbage": 11 }, { - "id": "pl_msg_00000602_00142", + "id": "Villa_Text_Dummy142", "garbage": 14 }, { - "id": "pl_msg_00000602_00143", + "id": "Villa_Text_Dummy143", "garbage": 12 }, { - "id": "pl_msg_00000602_00144", + "id": "Villa_Text_Dummy144", "garbage": 12 }, { - "id": "pl_msg_00000602_00145", + "id": "Villa_Text_Dummy145", "garbage": 53 }, { - "id": "pl_msg_00000602_00146", + "id": "Villa_Text_Dummy146", "garbage": 90 }, { - "id": "pl_msg_00000602_00147", + "id": "Villa_Text_Dummy147", "garbage": 70 }, { - "id": "pl_msg_00000602_00148", + "id": "Villa_Text_Dummy148", "garbage": 70 }, { - "id": "pl_msg_00000602_00149", + "id": "Villa_Text_EntryTableAvailable", "en_US": "Table{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00150", + "id": "Villa_Text_EntryBigSofaAvailable", "en_US": "Big Sofa{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00151", + "id": "Villa_Text_EntrySmallSofaAvailable", "en_US": "Small Sofa{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00152", + "id": "Villa_Text_EntryBedAvailable", "en_US": "Bed{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00153", + "id": "Villa_Text_EntryNightTableAvailable", "en_US": "Night Table{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00154", + "id": "Villa_Text_EntryTVAvailable", "en_US": "TV{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00155", + "id": "Villa_Text_EntryAudioSystemAvailable", "en_US": "Audio System{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00156", + "id": "Villa_Text_EntryBookshelfAvailable", "en_US": "Bookshelf{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00157", + "id": "Villa_Text_EntryRackAvailable", "en_US": "Rack{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00158", + "id": "Villa_Text_EntryHouseplantAvailable", "en_US": "Houseplant{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00159", + "id": "Villa_Text_EntryPCDeskAvailable", "en_US": "PC Desk{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00160", + "id": "Villa_Text_EntryMusicBoxAvailable", "en_US": "Music Box{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00161", + "id": "Villa_Text_EntryPokemonBustAvailable", "en_US": "Pokémon Bust{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00162", + "id": "Villa_Text_EntryPokemonBustSilverAvailable", "en_US": "Pokémon Bust{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00163", + "id": "Villa_Text_EntryPianoAvailable", "en_US": "Piano{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00164", + "id": "Villa_Text_EntryGuestSetAvailable", "en_US": "Guest Set{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00165", + "id": "Villa_Text_EntryWallClockAvailable", "en_US": "Wall Clock{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00166", + "id": "Villa_Text_EntryMasterpieceAvailable", "en_US": "Masterpiece{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00167", + "id": "Villa_Text_EntryTeaSetAvailable", "en_US": "Tea Set{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00168", + "id": "Villa_Text_EntryChandelierAvailable", "en_US": "Chandelier{CURSOR_X 96}{STRVAR_1 55, 0, 0}" }, { - "id": "pl_msg_00000602_00169", + "id": "Villa_Text_EntryTableSoldOut", "en_US": "Table{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00170", + "id": "Villa_Text_EntryBigSofaSoldOut", "en_US": "Big Sofa{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00171", + "id": "Villa_Text_EntrySmallSofaSoldOut", "en_US": "Small Sofa{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00172", + "id": "Villa_Text_EntryBedSoldOut", "en_US": "Bed{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00173", + "id": "Villa_Text_EntryNightTableSoldOut", "en_US": "Night Table{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00174", + "id": "Villa_Text_EntryTVSoldOut", "en_US": "TV{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00175", + "id": "Villa_Text_EntryAudioSystemSoldOut", "en_US": "Audio System{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00176", + "id": "Villa_Text_EntryBookshelfSoldOut", "en_US": "Bookshelf{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00177", + "id": "Villa_Text_EntryRackSoldOut", "en_US": "Rack{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00178", + "id": "Villa_Text_EntryHouseplantSoldOut", "en_US": "Houseplant{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00179", + "id": "Villa_Text_EntryPCDeskSoldOut", "en_US": "PC Desk{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00180", + "id": "Villa_Text_EntryMusicBoxSoldOut", "en_US": "Music Box{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00181", + "id": "Villa_Text_EntryPokemonBustSoldOut", "en_US": "Pokémon Bust{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00182", + "id": "Villa_Text_EntryPokemonBustSilverSoldOut", "en_US": "Pokémon Bust{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00183", + "id": "Villa_Text_EntryPianoSoldOut", "en_US": "Piano{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00184", + "id": "Villa_Text_EntryGuestSetSoldOut", "en_US": "Guest Set{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00185", + "id": "Villa_Text_EntryWallClockSoldOut", "en_US": "Wall Clock{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00186", + "id": "Villa_Text_EntryMasterpieceSoldOut", "en_US": "Masterpiece{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00187", + "id": "Villa_Text_EntryTeaSetSoldOut", "en_US": "Tea Set{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00188", + "id": "Villa_Text_EntryChandelierSoldOut", "en_US": "Chandelier{CURSOR_X 100}------" }, { - "id": "pl_msg_00000602_00189", + "id": "Villa_Text_EntryTableFree", "en_US": "Table" } ] diff --git a/src/game_records.c b/src/game_records.c index 1fd78d748d..d2741002c3 100644 --- a/src/game_records.c +++ b/src/game_records.c @@ -44,7 +44,7 @@ static inline u32 HashEncodingSeed(GameRecords *records) static void EncodeGameRecords(GameRecords *records, int id) { - if (id == RECORD_UNK_000) { + if (id == RECORD_STEPS) { return; } @@ -54,7 +54,7 @@ static void EncodeGameRecords(GameRecords *records, int id) static void DecodeGameRecords(GameRecords *records, int id) { - if (id == RECORD_UNK_000) { + if (id == RECORD_STEPS) { return; } @@ -87,7 +87,7 @@ static u32 SetRecordValue(GameRecords *records, int id, u32 val) } static u8 sUsesHighLimit[MAX_RECORDS] = { - [RECORD_UNK_000] = TRUE, + [RECORD_STEPS] = TRUE, [RECORD_TRAINER_SCORE] = TRUE, [RECORD_UNK_002] = TRUE, [RECORD_UNK_003] = FALSE, @@ -147,10 +147,10 @@ static u8 sUsesHighLimit[MAX_RECORDS] = { [RECORD_TIMES_BATTLED_AT_BATTLEGROUND] = TRUE, [RECORD_UNK_058] = TRUE, [RECORD_UNK_059] = TRUE, - [RECORD_UNK_060] = TRUE, - [RECORD_UNK_061] = TRUE, + [RECORD_BATTLE_FACTORY_VICTORIES] = TRUE, + [RECORD_BATTLE_CASTLE_VICTORIES] = TRUE, [RECORD_BATTLE_HALL_VICTORIES] = TRUE, - [RECORD_UNK_063] = TRUE, + [RECORD_BATTLE_ARCADE_VICTORIES] = TRUE, [RECORD_UNK_064] = TRUE, [RECORD_UNK_065] = TRUE, [RECORD_UNK_066] = TRUE, @@ -307,7 +307,7 @@ static const u16 sTrainerScoreIncrements[MAX_TRAINER_SCORE_EVENTS] = { [TRAINER_SCORE_EVENT_UNK_46] = 15, [TRAINER_SCORE_EVENT_UNK_47] = 11, [TRAINER_SCORE_EVENT_UNK_48] = 11, - [TRAINER_SCORE_EVENT_UNK_49] = 10, + [TRAINER_SCORE_EVENT_BOUGHT_ALL_VILLA_FURNITURE] = 10, [TRAINER_SCORE_EVENT_UNK_50] = 10, }; diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 4ff4c6ec5a..26b4639171 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -10,6 +10,7 @@ #include "generated/game_records.h" #include "generated/items.h" #include "generated/species.h" +#include "generated/villa_furniture_type.h" #include "struct_decls/map_object.h" #include "struct_decls/map_object_manager.h" @@ -740,91 +741,91 @@ BOOL ScrCmd_GetPartyMonForm2(ScriptContext *ctx) return FALSE; } -BOOL ScrCmd_30F(ScriptContext *param0) +BOOL ScrCmd_CheckMetFurnitureRequirements(ScriptContext *ctx) { - VarsFlags *v0; - GameRecords *v1; - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v3 = ScriptContext_GetVar(param0); - u16 *v4 = ScriptContext_GetVarPointer(param0); + VarsFlags *varsFlags; + GameRecords *gameRecords; + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 furniture = ScriptContext_GetVar(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - v0 = SaveData_GetVarsFlags(fieldSystem->saveData); - v1 = SaveData_GetGameRecords(fieldSystem->saveData); - *v4 = 1; + varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); + gameRecords = SaveData_GetGameRecords(fieldSystem->saveData); + *destVar = TRUE; - switch (v3) { - case 13: - if (GameRecords_GetRecordValue(v1, RECORD_BATTLE_TOWER_VICTORIES) < 1) { - *v4 = 0; + switch (furniture) { + case VILLA_FURNITURE_POKEMON_BUST + 1: + if (GameRecords_GetRecordValue(gameRecords, RECORD_BATTLE_TOWER_VICTORIES) < 1) { + *destVar = FALSE; } - if (GameRecords_GetRecordValue(v1, RECORD_UNK_060) < 1) { - *v4 = 0; + if (GameRecords_GetRecordValue(gameRecords, RECORD_BATTLE_FACTORY_VICTORIES) < 1) { + *destVar = FALSE; } - if (GameRecords_GetRecordValue(v1, RECORD_UNK_061) < 1) { - *v4 = 0; + if (GameRecords_GetRecordValue(gameRecords, RECORD_BATTLE_CASTLE_VICTORIES) < 1) { + *destVar = FALSE; } - if (GameRecords_GetRecordValue(v1, RECORD_BATTLE_HALL_VICTORIES) < 1) { - *v4 = 0; + if (GameRecords_GetRecordValue(gameRecords, RECORD_BATTLE_HALL_VICTORIES) < 1) { + *destVar = FALSE; } - if (GameRecords_GetRecordValue(v1, RECORD_UNK_063) < 1) { - *v4 = 0; + if (GameRecords_GetRecordValue(gameRecords, RECORD_BATTLE_ARCADE_VICTORIES) < 1) { + *destVar = FALSE; } break; - case 14: - *v4 = 0; + case VILLA_FURNITURE_POKEMON_BUST_SILVER + 1: + *destVar = FALSE; - if (SystemVars_GetBattleFactoryPrintState(v0) >= 2) { - *v4 = 1; + if (SystemVars_GetBattleFactoryPrintState(varsFlags) >= 2) { + *destVar = TRUE; } - if (SystemVars_GetBattleHallPrintState(v0) >= 2) { - *v4 = 1; + if (SystemVars_GetBattleHallPrintState(varsFlags) >= 2) { + *destVar = TRUE; } - if (SystemVars_GetBattleCastlePrintState(v0) >= 2) { - *v4 = 1; + if (SystemVars_GetBattleCastlePrintState(varsFlags) >= 2) { + *destVar = TRUE; } - if (SystemVars_GetBattleArcadePrintState(v0) >= 2) { - *v4 = 1; + if (SystemVars_GetBattleArcadePrintState(varsFlags) >= 2) { + *destVar = TRUE; } - if (SystemVars_GetBattleTowerPrintState(v0) >= 2) { - *v4 = 1; + if (SystemVars_GetBattleTowerPrintState(varsFlags) >= 2) { + *destVar = TRUE; } break; - case 15: - if (GameRecords_GetRecordValue(v1, RECORD_TIMES_ENTERED_HALL_OF_FAME) < 10) { - *v4 = 0; + case VILLA_FURNITURE_PIANO + 1: + if (GameRecords_GetRecordValue(gameRecords, RECORD_TIMES_ENTERED_HALL_OF_FAME) < 10) { + *destVar = FALSE; } break; - case 16: - if (GameRecords_GetRecordValue(v1, RECORD_TIMES_BATTLED_AT_BATTLEGROUND) < 50) { - *v4 = 0; + case VILLA_FURNITURE_GUEST_SET + 1: + if (GameRecords_GetRecordValue(gameRecords, RECORD_TIMES_BATTLED_AT_BATTLEGROUND) < 50) { + *destVar = FALSE; } break; - case 17: - if (GameRecords_GetRecordValue(v1, RECORD_BERRIES_PLANTED) < 50) { - *v4 = 0; + case VILLA_FURNITURE_WALL_CLOCK + 1: + if (GameRecords_GetRecordValue(gameRecords, RECORD_BERRIES_PLANTED) < 50) { + *destVar = FALSE; } break; - case 18: - if (GameRecords_GetRecordValue(v1, RECORD_EGGS_HATCHED) < 30) { - *v4 = 0; + case VILLA_FURNITURE_MASTERPIECE + 1: + if (GameRecords_GetRecordValue(gameRecords, RECORD_EGGS_HATCHED) < 30) { + *destVar = FALSE; } break; - case 20: - if (GameRecords_GetRecordValue(v1, RECORD_UNK_000) < 300000) { - *v4 = 0; + case VILLA_FURNITURE_CHANDELIER + 1: + if (GameRecords_GetRecordValue(gameRecords, RECORD_STEPS) < 300000) { + *destVar = FALSE; } break; } - return 0; + return FALSE; } BOOL ScrCmd_Dummy316(ScriptContext *ctx) diff --git a/src/scrcmd.c b/src/scrcmd.c index 94d918b44b..8c9afce29b 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -722,7 +722,7 @@ static u8 GetRandomBattlegroundStatTrainerID(u16 trainer1ID, u16 trainer2ID, u16 static BOOL ScrCmd_2F6(ScriptContext *ctx); static BOOL ScrCmd_2F7(ScriptContext *ctx); static BOOL ScrCmd_2FB(ScriptContext *ctx); -static BOOL ScrCmd_2FC(ScriptContext *ctx); +static BOOL ScrCmd_CheckABPress(ScriptContext *ctx); static BOOL ScrCmd_GetRotomFormsInSave(ScriptContext *ctx); static BOOL ScrCmd_IncrementTrainerScore(ScriptContext *ctx); static BOOL ScrCmd_AddDistortionWorldMapObject(ScriptContext *ctx); @@ -6889,18 +6889,18 @@ static BOOL ScrCmd_2FB(ScriptContext *ctx) return TRUE; } -static BOOL ScrCmd_2FC(ScriptContext *ctx) +static BOOL ScrCmd_CheckABPress(ScriptContext *ctx) { - u16 *v0 = ScriptContext_GetVarPointer(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - *v0 = 0; + *destVar = FALSE; if (gSystem.heldKeys & PAD_BUTTON_A) { - *v0 = 1; + *destVar = TRUE; } if (gSystem.heldKeys & PAD_BUTTON_B) { - *v0 = 1; + *destVar = TRUE; } return FALSE; diff --git a/src/scrcmd_sound.c b/src/scrcmd_sound.c index 7c7063f6ea..e770e36f5e 100644 --- a/src/scrcmd_sound.c +++ b/src/scrcmd_sound.c @@ -214,14 +214,9 @@ BOOL ScrCmd_SetInitialVolumeForSequence(ScriptContext *ctx) return FALSE; } -BOOL ScrCmd_SetScene22(ScriptContext *ctx) +BOOL ScrCmd_SetScenePlayBGMMusicBox(ScriptContext *ctx) { - if (gSystem.heldKeys & PAD_KEY_UP) { - Sound_SetSceneAndPlayBGM(SOUND_SCENE_22, SEQ_PL_TOWN02, 1); - } else { - Sound_SetSceneAndPlayBGM(SOUND_SCENE_22, SEQ_PL_TOWN02, 1); - } - + Sound_SetSceneAndPlayBGM(SOUND_SCENE_VILLA_MUSIC_BOX, SEQ_PL_TOWN02, 1); return TRUE; } diff --git a/src/scrcmd_tv_broadcast.c b/src/scrcmd_tv_broadcast.c index 16284707e3..0241983d09 100644 --- a/src/scrcmd_tv_broadcast.c +++ b/src/scrcmd_tv_broadcast.c @@ -100,13 +100,13 @@ BOOL ScrCmd_CallTVBroadcast(ScriptContext *ctx) } break; } - return 0; + return FALSE; } BOOL ScrCmd_236(ScriptContext *param0) { FieldSystem_SaveTVSegment_HiddenItemBreakingNews(param0->fieldSystem, ScriptContext_GetVar(param0)); - return 0; + return FALSE; } BOOL ScrCmd_2B8(ScriptContext *param0) @@ -115,27 +115,27 @@ BOOL ScrCmd_2B8(ScriptContext *param0) Pokemon *v1 = Party_GetPokemonBySlotIndex(v0, ScriptContext_GetVar(param0)); FieldSystem_SaveTVSegment_RateThatNameChange(param0->fieldSystem, v1); - return 0; + return FALSE; } BOOL ScrCmd_30B(ScriptContext *param0) { FieldSystem_SaveTVSegment_PokemonStorageSpecialNewsBulletin(param0->fieldSystem); - return 0; + return FALSE; } -BOOL ScrCmd_30C(ScriptContext *param0) +BOOL ScrCmd_SaveTVSegmentHomeAndManorNoFurniture(ScriptContext *ctx) { - FieldSystem_SaveTVSegment_HomeAndManor_NoFurniture(param0->fieldSystem); - return 0; + FieldSystem_SaveTVSegment_HomeAndManor_NoFurniture(ctx->fieldSystem); + return FALSE; } -BOOL ScrCmd_30D(ScriptContext *param0) +BOOL ScrCmd_SaveTVSegmentHomeAndManor(ScriptContext *ctx) { - u16 v0 = ScriptContext_GetVar(param0); + u16 furniture = ScriptContext_GetVar(ctx); - FieldSystem_SaveTVSegment_HomeAndManor(param0->fieldSystem, v0); - return 0; + FieldSystem_SaveTVSegment_HomeAndManor(ctx->fieldSystem, furniture); + return FALSE; } static const TVInterview sInterviews[TV_PROGRAM_TYPE_INTERVIEWS_NUM_SEGMENTS]; @@ -206,7 +206,7 @@ BOOL ScrCmd_27C(ScriptContext *param0) break; } - return 0; + return FALSE; } static void TVInterview_SaveResponse(FieldSystem *fieldSystem, int segmentID, u16 customMessageWord, u16 unused) @@ -437,5 +437,5 @@ BOOL ScrCmd_329(ScriptContext *param0) break; } - return 0; + return FALSE; } diff --git a/src/sound.c b/src/sound.c index d54ea188c4..07cb1201fb 100644 --- a/src/sound.c +++ b/src/sound.c @@ -328,7 +328,7 @@ BOOL Sound_SetSceneAndPlayBGM(u8 scene, u16 bgmID, int unused) case SOUND_SCENE_23: Sound_Impl_PlayCutsceneBGM(scene, bgmID, unused); break; - case SOUND_SCENE_22: + case SOUND_SCENE_VILLA_MUSIC_BOX: Sound_Impl_PlayCutsceneBGM(scene, bgmID, unused); break; } diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index 810b217ca4..9cc5bee074 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -2345,7 +2345,7 @@ static void sub_020615C8(PlayerAvatar *playerAvatar) FieldSystem *fieldSystem = MapObject_FieldSystem(v0); GameRecords *v2 = SaveData_GetGameRecords(fieldSystem->saveData); - GameRecords_IncrementRecordValue(v2, RECORD_UNK_000); + GameRecords_IncrementRecordValue(v2, RECORD_STEPS); } static int sub_020615E0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2)