diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 4da7601511..e020e5925a 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -4505,12 +4505,12 @@ .short \trainerID .endm - .macro ScrCmd_2F4 arg0, arg1, arg2, arg3 - .short SCRCMD_2F4 - .short \arg0 - .short \arg1 - .short \arg2 - .short \arg3 + .macro GetRandomBattlegroundTrainers destVar1, destVar2, destVar3, destVar4 + .short ScrCmd_GETRANDOMBATTLEGROUNDTRAINERS + .short \destVar1 + .short \destVar2 + .short \destVar3 + .short \destVar4 .endm .macro BufferValuePaddingDigits templateArg, value, paddingMode, maxDigits diff --git a/generated/game_records.txt b/generated/game_records.txt index 5c980272fb..1646df81c5 100644 --- a/generated/game_records.txt +++ b/generated/game_records.txt @@ -55,7 +55,7 @@ RECORD_UNK_053 RECORD_TIMES_DRESSED_UP_POKEMON RECORD_UNK_055 RECORD_TIMES_STUCK_IN_DEEP_MUD -RECORD_UNK_057 +RECORD_TIMES_BATTLED_AT_BATTLEGROUND RECORD_UNK_058 RECORD_UNK_059 RECORD_UNK_060 diff --git a/generated/object_events_gfx.txt b/generated/object_events_gfx.txt index 9dcd36822f..19a9071f37 100644 --- a/generated/object_events_gfx.txt +++ b/generated/object_events_gfx.txt @@ -99,22 +99,22 @@ OBJ_EVENT_GFX_PLAYER_F OBJ_EVENT_GFX_PLAYER_F_BIKE OBJ_EVENT_GFX_PROF_ROWAN OBJ_EVENT_GFX_BERRY_SOIL -OBJ_EVENT_GFX_COUNTERPART -OBJ_EVENT_GFX_UNK_102 -OBJ_EVENT_GFX_UNK_103 -OBJ_EVENT_GFX_UNK_104 -OBJ_EVENT_GFX_UNK_105 -OBJ_EVENT_GFX_UNK_106 -OBJ_EVENT_GFX_UNK_107 -OBJ_EVENT_GFX_UNK_108 -OBJ_EVENT_GFX_UNK_109 -OBJ_EVENT_GFX_UNK_110 +OBJ_EVENT_GFX_VAR_0 +OBJ_EVENT_GFX_VAR_1 +OBJ_EVENT_GFX_VAR_2 +OBJ_EVENT_GFX_VAR_3 +OBJ_EVENT_GFX_VAR_4 +OBJ_EVENT_GFX_VAR_5 +OBJ_EVENT_GFX_VAR_6 +OBJ_EVENT_GFX_VAR_7 +OBJ_EVENT_GFX_VAR_8 +OBJ_EVENT_GFX_VAR_9 OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1 OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2 -OBJ_EVENT_GFX_UNK_113 -OBJ_EVENT_GFX_UNK_114 -OBJ_EVENT_GFX_UNK_115 -OBJ_EVENT_GFX_UNK_116 +OBJ_EVENT_GFX_VAR_C +OBJ_EVENT_GFX_VAR_D +OBJ_EVENT_GFX_VAR_E +OBJ_EVENT_GFX_VAR_F OBJ_EVENT_GFX_UNK_117 OBJ_EVENT_GFX_SNOWBALL OBJ_EVENT_GFX_UNK_119 diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index f62e7adb97..ef26eaafe9 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -3,10 +3,10 @@ FLAG_UNK_0x0001 FLAG_UNK_0x0002 FLAG_UNK_0x0003 FLAG_UNK_0x0004 -FLAG_UNK_0x0005 -FLAG_UNK_0x0006 -FLAG_UNK_0x0007 -FLAG_UNK_0x0008 +FLAG_DEFEATED_BATTLEGROUND_TRAINER_1 +FLAG_DEFEATED_BATTLEGROUND_TRAINER_2 +FLAG_DEFEATED_BATTLEGROUND_TRAINER_3 +FLAG_DEFEATED_BATTLEGROUND_TRAINER_4 FLAG_UNK_0x0009 FLAG_UNK_0x000A FLAG_UNK_0x000B @@ -198,7 +198,7 @@ FLAG_TALKED_TO_VEILSTONE_CITY_PRIZE_EXCHANGE_GUITARIST FLAG_RECEIVED_ROUTE_204_NORTH_TM78 FLAG_RECEIVED_ROUTE_211_EAST_TM77 FLAG_RECEIVED_ROUTE_210_SOUTH_TM51 -FLAG_UNK_0x00C8 +FLAG_VISITED_BATTLEGROUND FLAG_RECEIVED_CANALAVE_CITY_SOUTHEAST_HOUSE_TM48 FLAG_RECEIVED_GRAND_LAKE_ROUTE_213_NORTHWEST_HOUSE_TM92 FLAG_RECEIVED_SURVIVAL_AREA_SOUTH_HOUSE_TM42 @@ -468,7 +468,7 @@ FLAG_HIDE_PAL_PARK_LOBBY_PROF_OAK FLAG_HIDE_FIGHT_AREA_RIVAL FLAG_HIDE_FIGHT_AREA_BUCK FLAG_HIDE_VALOR_LAKEFRONT_RIVAL -FLAG_UNK_0x01D6 +FLAG_HIDE_BATTLEGROUND_BUCK FLAG_UNK_0x01D7 FLAG_UNK_0x01D8 FLAG_HIDE_SURVIVAL_AREA_RIVAL @@ -672,10 +672,10 @@ FLAG_HIDE_GALACTIC_HQ_CONTROL_ROOM_CHARON FLAG_HIDE_MT_CORONET_2F_LOOKER FLAG_HIDE_SENDOFF_SPRING_CYNTHIA FLAG_HIDE_AMITY_SQUARE_FOLLOWER_MON -FLAG_UNK_0x02A2 -FLAG_UNK_0x02A3 -FLAG_UNK_0x02A4 -FLAG_UNK_0x02A5 +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 @@ -2743,11 +2743,11 @@ FLAG_OBTAINED_LOTTERY_PRIZE FLAG_RECEIVED_GREAT_MARSH_6_RANDOM_SHARD FLAG_AMITY_SQUARE_MAN_GIFT_RECEIVED FLAG_SET_FIVE_MAID_KNOCKOUT_TURN_TARGET -FLAG_UNK_0x0AB7 -FLAG_UNK_0x0AB8 -FLAG_UNK_0x0AB9 -FLAG_UNK_0x0ABA -FLAG_UNK_0x0ABB +FLAG_SET_BATTLEGROUND_TRAINERS +FLAG_DEFEATED_BATTLEGROUND_ROARK +FLAG_DEFEATED_BATTLEGROUND_GARDENIA +FLAG_DEFEATED_BATTLEGROUND_CRASHER_WAKE +FLAG_DEFEATED_BATTLEGROUND_MAYLENE FLAG_DEFEATED_IDOL_GRACE FLAG_DEFEATED_REPORTER_KINSEY FLAG_DEFEATED_CAMERAMAN_TEVIN @@ -2757,15 +2757,15 @@ FLAG_DEFEATED_POKE_KID_ARIEL FLAG_DEFEATED_GUITARIST_ARTURO FLAG_UNK_0x0AC3 FLAG_UNK_0x0AC4 -FLAG_UNK_0x0AC5 -FLAG_UNK_0x0AC6 -FLAG_UNK_0x0AC7 -FLAG_UNK_0x0AC8 -FLAG_UNK_0x0AC9 -FLAG_UNK_0x0ACA -FLAG_UNK_0x0ACB -FLAG_UNK_0x0ACC -FLAG_UNK_0x0ACD +FLAG_DEFEATED_BATTLEGROUND_FANTINA +FLAG_DEFEATED_BATTLEGROUND_CANDICE +FLAG_DEFEATED_BATTLEGROUND_BYRON +FLAG_DEFEATED_BATTLEGROUND_VOLKNER +FLAG_DEFEATED_BATTLEGROUND_CHERYL +FLAG_DEFEATED_BATTLEGROUND_RILEY +FLAG_DEFEATED_BATTLEGROUND_MARLEY +FLAG_DEFEATED_BATTLEGROUND_BUCK +FLAG_DEFEATED_BATTLEGROUND_MIRA FLAG_UNK_0x0ACE FLAG_UNK_0x0ACF FLAG_UNK_0x0AD0 @@ -4196,14 +4196,14 @@ VAR_UNK_0x405D VAR_ROAMING_MOLTRES_STATE VAR_ROAMING_ZAPDOS_STATE VAR_ROAMING_ARTICUNO_STATE -VAR_UNK_0x4061 +VAR_RANDOM_BATTLEGROUND_MESSAGE VAR_BATTLE_HALL_NEXT_TOTAL_RECORD_MILESTONE VAR_BATTLE_HALL_MAJOR_NPC VAR_WIFI_FRONTIER_CLEARED -VAR_UNK_0x4065 -VAR_UNK_0x4066 -VAR_UNK_0x4067 -VAR_UNK_0x4068 +VAR_BATTLEGROUND_TRAINER_1 +VAR_BATTLEGROUND_TRAINER_2 +VAR_BATTLEGROUND_TRAINER_3 +VAR_BATTLEGROUND_TRAINER_4 VAR_IRON_RUINS_STATE VAR_ICEBERG_RUINS_STATE VAR_ROCK_PEAK_RUINS_STATE @@ -4292,7 +4292,7 @@ VAR_BATTLE_CASTLE_CHALLENGE_TYPE VAR_BATTLE_ARCADE_CHALLENGE_TYPE VAR_UNK_0x40BF VAR_UNK_0x40C0 -VAR_UNK_0x40C1 +VAR_BATTLEGROUND_STATE VAR_RANDOM_SURVIVAL_AREA_RIVAL_MESSAGE VAR_SPEAR_PILLAR_DISTORTED_STATE VAR_SPEAR_PILLAR_DIALGA_STATE diff --git a/include/constants/scrcmd.h b/include/constants/scrcmd.h index 3968a01528..ce42331aa2 100644 --- a/include/constants/scrcmd.h +++ b/include/constants/scrcmd.h @@ -5,6 +5,8 @@ #include "constants/menu.h" #include "generated/backdrops.h" +#define BATTLEGROUND_TRAINER_NONE 0xFFF + #define BERRY_WATERING_START 0 #define BERRY_WATERING_END 1 diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h index 6bc1c44c91..db3bca9006 100644 --- a/include/data/scripts/scrcmd.h +++ b/include/data/scripts/scrcmd.h @@ -761,7 +761,7 @@ ScriptCommand(SCRCMD_INITPERSISTEDMAPFEATURESFORVILLA, ScrCm ScriptCommand(SCRCMD_2F1, ScrCmd_2F1) ScriptCommand(SCRCMD_INITPERSISTEDMAPFEATURESFORDISTORTIONWORLD, ScrCmd_InitPersistedMapFeaturesForDistortionWorld) ScriptCommand(SCRCMD_BUFFERTRAINERNAME, ScrCmd_BufferTrainerName) -ScriptCommand(SCRCMD_2F4, ScrCmd_2F4) +ScriptCommand(ScrCmd_GETRANDOMBATTLEGROUNDTRAINERS, ScrCmd_GetRandomBattlegroundTrainers) ScriptCommand(SCRCMD_BUFFERVALUEPADDINGDIGITS, ScrCmd_BufferValuePaddingDigits) ScriptCommand(SCRCMD_2F6, ScrCmd_2F6) ScriptCommand(SCRCMD_2F7, ScrCmd_2F7) diff --git a/res/field/events/events_amity_square.json b/res/field/events/events_amity_square.json index 137730d24d..b5a712f7b3 100644 --- a/res/field/events/events_amity_square.json +++ b/res/field/events/events_amity_square.json @@ -78,7 +78,7 @@ }, { "id": "LOCALID_FOLLOWER_MON", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_AMITY_SQUARE_FOLLOWER_MON", diff --git a/res/field/events/events_battle_hall.json b/res/field/events/events_battle_hall.json index 81cdc005dd..6339cafe26 100644 --- a/res/field/events/events_battle_hall.json +++ b/res/field/events/events_battle_hall.json @@ -192,7 +192,7 @@ }, { "id": "LOCALID_SERENA_WINSTON", - "graphics_id": "OBJ_EVENT_GFX_UNK_104", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -207,7 +207,7 @@ }, { "id": "LOCALID_MAJOR_NPC", - "graphics_id": "OBJ_EVENT_GFX_UNK_102", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_BATTLE_HALL_MAJOR_NPC", diff --git a/res/field/events/events_battle_tower_battle_room.json b/res/field/events/events_battle_tower_battle_room.json index 99f1299162..c90fe931b9 100644 --- a/res/field/events/events_battle_tower_battle_room.json +++ b/res/field/events/events_battle_tower_battle_room.json @@ -18,7 +18,7 @@ }, { "id": "BATTLE_TOWER_BATTLE_ROOM_UNK_102_1", - "graphics_id": "OBJ_EVENT_GFX_UNK_102", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_UNK_0x01CB", @@ -33,7 +33,7 @@ }, { "id": "BATTLE_TOWER_BATTLE_ROOM_COUNTERPART_2", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_battle_tower_corridor_multi.json b/res/field/events/events_battle_tower_corridor_multi.json index 7bc785d5bd..a3cd172a3b 100644 --- a/res/field/events/events_battle_tower_corridor_multi.json +++ b/res/field/events/events_battle_tower_corridor_multi.json @@ -33,7 +33,7 @@ }, { "id": "BATTLE_TOWER_CORRIDOR_MULTI_LEADER", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -48,7 +48,7 @@ }, { "id": "BATTLE_TOWER_CORRIDOR_MULTI_PARTNER", - "graphics_id": "OBJ_EVENT_GFX_UNK_102", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_battle_tower_multi_battle_room.json b/res/field/events/events_battle_tower_multi_battle_room.json index e7febd6619..09e30750f8 100644 --- a/res/field/events/events_battle_tower_multi_battle_room.json +++ b/res/field/events/events_battle_tower_multi_battle_room.json @@ -33,7 +33,7 @@ }, { "id": "BATTLE_TOWER_MULTI_BATTLE_ROOM_LEADER", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -48,7 +48,7 @@ }, { "id": "BATTLE_TOWER_MULTI_BATTLE_ROOM_PARTNER", - "graphics_id": "OBJ_EVENT_GFX_UNK_102", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -63,7 +63,7 @@ }, { "id": "BATTLE_TOWER_MULTI_BATTLE_ROOM_OPPONENT_2", - "graphics_id": "OBJ_EVENT_GFX_UNK_104", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_MULTI_BATTLE_ROOM_OPPONENT_2", @@ -78,7 +78,7 @@ }, { "id": "BATTLE_TOWER_MULTI_BATTLE_ROOM_OPPONENT_1", - "graphics_id": "OBJ_EVENT_GFX_UNK_103", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_MULTI_BATTLE_ROOM_OPPONENT_1", diff --git a/res/field/events/events_battleground.json b/res/field/events/events_battleground.json index cdd6e7ded4..10ec2564bb 100644 --- a/res/field/events/events_battleground.json +++ b/res/field/events/events_battleground.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "BATTLEGROUND_EXPERT_M_0", + "id": "LOCALID_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,11 +17,11 @@ "y": 0 }, { - "id": "BATTLEGROUND_BUCK_1", + "id": "LOCALID_BUCK", "graphics_id": "OBJ_EVENT_GFX_BUCK", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01D6", + "hidden_flag": "FLAG_HIDE_BATTLEGROUND_BUCK", "script": 2, "initial_dir": 1, "data": [], @@ -32,11 +32,11 @@ "y": 0 }, { - "id": "BATTLEGROUND_UNK_102_2", - "graphics_id": "OBJ_EVENT_GFX_UNK_102", + "id": "LOCALID_TRAINER_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02A2", + "hidden_flag": "FLAG_HIDE_BATTLEGROUND_TRAINER_1", "script": 5, "initial_dir": 3, "data": [], @@ -47,11 +47,11 @@ "y": 0 }, { - "id": "BATTLEGROUND_UNK_103_3", - "graphics_id": "OBJ_EVENT_GFX_UNK_103", + "id": "LOCALID_TRAINER_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02A3", + "hidden_flag": "FLAG_HIDE_BATTLEGROUND_TRAINER_2", "script": 6, "initial_dir": 1, "data": [], @@ -62,11 +62,11 @@ "y": 0 }, { - "id": "BATTLEGROUND_UNK_104_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_104", + "id": "LOCALID_TRAINER_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02A4", + "hidden_flag": "FLAG_HIDE_BATTLEGROUND_TRAINER_3", "script": 7, "initial_dir": 2, "data": [], @@ -77,11 +77,11 @@ "y": 0 }, { - "id": "BATTLEGROUND_UNK_105_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_105", + "id": "LOCALID_TRAINER_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02A5", + "hidden_flag": "FLAG_HIDE_BATTLEGROUND_TRAINER_4", "script": 8, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_canalave_city.json b/res/field/events/events_canalave_city.json index 1bb013ac91..c8b239a3c7 100644 --- a/res/field/events/events_canalave_city.json +++ b/res/field/events/events_canalave_city.json @@ -202,7 +202,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_CANALAVE_CITY_COUNTERPART", diff --git a/res/field/events/events_canalave_library_3f.json b/res/field/events/events_canalave_library_3f.json index ef2050535a..c33253249f 100644 --- a/res/field/events/events_canalave_library_3f.json +++ b/res/field/events/events_canalave_library_3f.json @@ -225,7 +225,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_CANALAVE_LIBRARY_COUNTERPART", diff --git a/res/field/events/events_contest_hall_stage_ongoing_contest.json b/res/field/events/events_contest_hall_stage_ongoing_contest.json index 3c2584da9f..1de2e95218 100644 --- a/res/field/events/events_contest_hall_stage_ongoing_contest.json +++ b/res/field/events/events_contest_hall_stage_ongoing_contest.json @@ -18,7 +18,7 @@ }, { "id": "CONTEST_HALL_STAGE_ONGOING_CONTEST_CONTESTANT1", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_CONTEST_HALL_STAGE_CONTESTANT1", @@ -33,7 +33,7 @@ }, { "id": "CONTEST_HALL_STAGE_ONGOING_CONTEST_CONTESTANT2", - "graphics_id": "OBJ_EVENT_GFX_UNK_102", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_CONTEST_HALL_STAGE_CONTESTANT2", @@ -48,7 +48,7 @@ }, { "id": "CONTEST_HALL_STAGE_ONGOING_CONTEST_CONTESTANT3", - "graphics_id": "OBJ_EVENT_GFX_UNK_103", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_CONTEST_HALL_STAGE_CONTESTANT3", @@ -63,7 +63,7 @@ }, { "id": "CONTEST_HALL_STAGE_ONGOING_CONTEST_CONTESTANT4", - "graphics_id": "OBJ_EVENT_GFX_UNK_104", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_CONTEST_HALL_STAGE_CONTESTANT4", @@ -78,7 +78,7 @@ }, { "id": "CONTEST_HALL_STAGE_ONGOING_CONTEST_CONTESTANT_WINNER", - "graphics_id": "OBJ_EVENT_GFX_UNK_105", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_CONTEST_HALL_STAGE_CONTESTANT_WINNER", diff --git a/res/field/events/events_jubilife_city.json b/res/field/events/events_jubilife_city.json index b9c4465866..7b37902bcd 100644 --- a/res/field/events/events_jubilife_city.json +++ b/res/field/events/events_jubilife_city.json @@ -117,7 +117,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_JUBILIFE_CITY_COUNTERPART", diff --git a/res/field/events/events_lake_verity.json b/res/field/events/events_lake_verity.json index db75f40d51..158c791878 100644 --- a/res/field/events/events_lake_verity.json +++ b/res/field/events/events_lake_verity.json @@ -101,7 +101,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_LAKE_VERITY_COUNTERPART", diff --git a/res/field/events/events_lake_verity_low_water.json b/res/field/events/events_lake_verity_low_water.json index c88026cfe1..2f3194a74f 100644 --- a/res/field/events/events_lake_verity_low_water.json +++ b/res/field/events/events_lake_verity_low_water.json @@ -18,7 +18,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_LAKE_VERITY_LOW_WATER_COUNTERPART", diff --git a/res/field/events/events_pokemon_mansion.json b/res/field/events/events_pokemon_mansion.json index f611e5ff86..54fec5750d 100644 --- a/res/field/events/events_pokemon_mansion.json +++ b/res/field/events/events_pokemon_mansion.json @@ -63,7 +63,7 @@ }, { "id": "LOCALID_FIVE_MAID_KNOCKOUT_BOSS", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_POKEMON_MANSION_FIVE_MAID_KNOCKOUT_BOSS", diff --git a/res/field/events/events_route_201.json b/res/field/events/events_route_201.json index d3181572c3..1bbc843c43 100644 --- a/res/field/events/events_route_201.json +++ b/res/field/events/events_route_201.json @@ -97,7 +97,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_ROUTE_201_COUNTERPART", diff --git a/res/field/events/events_route_202.json b/res/field/events/events_route_202.json index 41136fc7f6..57d93a6833 100644 --- a/res/field/events/events_route_202.json +++ b/res/field/events/events_route_202.json @@ -63,7 +63,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_ROUTE_202_COUNTERPART", diff --git a/res/field/events/events_route_207.json b/res/field/events/events_route_207.json index c67cd07214..cfdf773c77 100644 --- a/res/field/events/events_route_207.json +++ b/res/field/events/events_route_207.json @@ -344,7 +344,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_ROUTE_207_COUNTERPART", diff --git a/res/field/events/events_sandgem_town.json b/res/field/events/events_sandgem_town.json index 02872d1c79..834206f729 100644 --- a/res/field/events/events_sandgem_town.json +++ b/res/field/events/events_sandgem_town.json @@ -63,7 +63,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_SANDGEM_TOWN_COUNTERPART", diff --git a/res/field/events/events_sandgem_town_pokemon_research_lab.json b/res/field/events/events_sandgem_town_pokemon_research_lab.json index 3cdca64ebd..f1c14c018d 100644 --- a/res/field/events/events_sandgem_town_pokemon_research_lab.json +++ b/res/field/events/events_sandgem_town_pokemon_research_lab.json @@ -97,7 +97,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_SANDGEM_TOWN_LAB_COUNTERPART", diff --git a/res/field/events/events_veilstone_city.json b/res/field/events/events_veilstone_city.json index f5ec0d0cdf..dc6a593565 100644 --- a/res/field/events/events_veilstone_city.json +++ b/res/field/events/events_veilstone_city.json @@ -150,7 +150,7 @@ }, { "id": "LOCALID_COUNTERPART", - "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_HIDE_VEILSTONE_COUNTERPART", diff --git a/res/field/events/events_villa.json b/res/field/events/events_villa.json index c9d10a0d5e..ce744aca35 100644 --- a/res/field/events/events_villa.json +++ b/res/field/events/events_villa.json @@ -28,7 +28,7 @@ "object_events": [ { "id": "VILLA_UNK_102_0", - "graphics_id": "OBJ_EVENT_GFX_UNK_102", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "FLAG_UNK_0x02A8", diff --git a/res/field/scripts/scripts_battleground.s b/res/field/scripts/scripts_battleground.s index 2683a52d51..c58fb2549f 100644 --- a/res/field/scripts/scripts_battleground.s +++ b/res/field/scripts/scripts_battleground.s @@ -1,151 +1,157 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battleground.h" +#include "res/field/events/events_battleground.h" + +#define LOCAL_FLAG_DECLINED_BATTLE_TRAINER_1 FLAG_UNK_0x0001 +#define LOCAL_FLAG_DECLINED_BATTLE_TRAINER_2 FLAG_UNK_0x0002 +#define LOCAL_FLAG_DECLINED_BATTLE_TRAINER_3 FLAG_UNK_0x0003 +#define LOCAL_FLAG_DECLINED_BATTLE_TRAINER_4 FLAG_UNK_0x0004 - ScriptEntry _015A - ScriptEntry _0183 - ScriptEntry _0278 - ScriptEntry _0022 - ScriptEntry _02B4 - ScriptEntry _03CA - ScriptEntry _0457 - ScriptEntry _04E4 + ScriptEntry Battleground_ExpertM + ScriptEntry Battleground_Buck + ScriptEntry Battleground_OnFrameWelcome + ScriptEntry Battleground_OnTransition + ScriptEntry Battleground_Trainer1 + ScriptEntry Battleground_Trainer2 + ScriptEntry Battleground_Trainer3 + ScriptEntry Battleground_Trainer4 ScriptEntryEnd -_0022: - SetFlag FLAG_UNK_0x00C8 - GoToIfUnset FLAG_UNK_0x0AB7, _0039 - Call _0140 +Battleground_OnTransition: + SetFlag FLAG_VISITED_BATTLEGROUND + GoToIfUnset FLAG_SET_BATTLEGROUND_TRAINERS, Battleground_SetTrainers + Call Battleground_SetTrainersGraphics End -_0039: - SetFlag FLAG_UNK_0x0AB7 - ScrCmd_2F4 VAR_UNK_0x4065, VAR_UNK_0x4066, VAR_UNK_0x4067, VAR_UNK_0x4068 - Call _0140 - ClearFlag FLAG_UNK_0x02A2 - ClearFlag FLAG_UNK_0x02A3 - ClearFlag FLAG_UNK_0x02A4 - ClearFlag FLAG_UNK_0x02A5 - CallIfEq VAR_OBJ_GFX_ID_2, 0xFFF, _00ED - CallIfEq VAR_OBJ_GFX_ID_3, 0xFFF, _00F3 - CallIfEq VAR_OBJ_GFX_ID_4, 0xFFF, _00F9 - CallIfEq VAR_OBJ_GFX_ID_4, 141, _00FF - CallIfEq VAR_OBJ_GFX_ID_4, 142, _010C - CallIfEq VAR_OBJ_GFX_ID_4, 143, _0119 - CallIfEq VAR_OBJ_GFX_ID_4, 144, _0126 - CallIfEq VAR_OBJ_GFX_ID_4, 145, _0133 - ClearFlag FLAG_UNK_0x0001 - ClearFlag FLAG_UNK_0x0002 - ClearFlag FLAG_UNK_0x0003 - ClearFlag FLAG_UNK_0x0004 - ClearFlag FLAG_UNK_0x0005 - ClearFlag FLAG_UNK_0x0006 - ClearFlag FLAG_UNK_0x0007 - ClearFlag FLAG_UNK_0x0008 - GetRandom VAR_UNK_0x4061, 2 +Battleground_SetTrainers: + SetFlag FLAG_SET_BATTLEGROUND_TRAINERS + GetRandomBattlegroundTrainers VAR_BATTLEGROUND_TRAINER_1, VAR_BATTLEGROUND_TRAINER_2, VAR_BATTLEGROUND_TRAINER_3, VAR_BATTLEGROUND_TRAINER_4 + Call Battleground_SetTrainersGraphics + ClearFlag FLAG_HIDE_BATTLEGROUND_TRAINER_1 + ClearFlag FLAG_HIDE_BATTLEGROUND_TRAINER_2 + ClearFlag FLAG_HIDE_BATTLEGROUND_TRAINER_3 + ClearFlag FLAG_HIDE_BATTLEGROUND_TRAINER_4 + CallIfEq VAR_OBJ_GFX_ID_2, BATTLEGROUND_TRAINER_NONE, Battleground_HideTrainer2 + CallIfEq VAR_OBJ_GFX_ID_3, BATTLEGROUND_TRAINER_NONE, Battleground_HideTrainer3 + CallIfEq VAR_OBJ_GFX_ID_4, BATTLEGROUND_TRAINER_NONE, Battleground_HideTrainer4 + CallIfEq VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_CHERYL, Battleground_TryHideCheryl + CallIfEq VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_RILEY, Battleground_TryHideRiley + CallIfEq VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_MARLEY, Battleground_TryHideMarley + CallIfEq VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_BUCK, Battleground_TryHideBuck + CallIfEq VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_MIRA, Battleground_TryHideMira + ClearFlag LOCAL_FLAG_DECLINED_BATTLE_TRAINER_1 + ClearFlag LOCAL_FLAG_DECLINED_BATTLE_TRAINER_2 + ClearFlag LOCAL_FLAG_DECLINED_BATTLE_TRAINER_3 + ClearFlag LOCAL_FLAG_DECLINED_BATTLE_TRAINER_4 + ClearFlag FLAG_DEFEATED_BATTLEGROUND_TRAINER_1 + ClearFlag FLAG_DEFEATED_BATTLEGROUND_TRAINER_2 + ClearFlag FLAG_DEFEATED_BATTLEGROUND_TRAINER_3 + ClearFlag FLAG_DEFEATED_BATTLEGROUND_TRAINER_4 + GetRandom VAR_RANDOM_BATTLEGROUND_MESSAGE, 2 End -_00ED: - SetFlag FLAG_UNK_0x02A3 +Battleground_HideTrainer2: + SetFlag FLAG_HIDE_BATTLEGROUND_TRAINER_2 Return -_00F3: - SetFlag FLAG_UNK_0x02A4 +Battleground_HideTrainer3: + SetFlag FLAG_HIDE_BATTLEGROUND_TRAINER_3 Return -_00F9: - SetFlag FLAG_UNK_0x02A5 +Battleground_HideTrainer4: + SetFlag FLAG_HIDE_BATTLEGROUND_TRAINER_4 Return -_00FF: - CallIfUnset FLAG_TRAVELED_WITH_CHERYL, _00F9 +Battleground_TryHideCheryl: + CallIfUnset FLAG_TRAVELED_WITH_CHERYL, Battleground_HideTrainer4 Return -_010C: - CallIfUnset FLAG_RECEIVED_RIOLU_EGG_FROM_RILEY, _00F9 +Battleground_TryHideRiley: + CallIfUnset FLAG_RECEIVED_RIOLU_EGG_FROM_RILEY, Battleground_HideTrainer4 Return -_0119: - CallIfUnset FLAG_TRAVELED_WITH_MARLEY, _00F9 +Battleground_TryHideMarley: + CallIfUnset FLAG_TRAVELED_WITH_MARLEY, Battleground_HideTrainer4 Return -_0126: - CallIfUnset FLAG_BUCK_LEFT_BATTLEGROUND, _00F9 +Battleground_TryHideBuck: + CallIfUnset FLAG_BUCK_LEFT_BATTLEGROUND, Battleground_HideTrainer4 Return -_0133: - CallIfUnset FLAG_TRAVELED_WITH_MIRA, _00F9 +Battleground_TryHideMira: + CallIfUnset FLAG_TRAVELED_WITH_MIRA, Battleground_HideTrainer4 Return -_0140: - SetVar VAR_OBJ_GFX_ID_1, VAR_UNK_0x4065 - SetVar VAR_OBJ_GFX_ID_2, VAR_UNK_0x4066 - SetVar VAR_OBJ_GFX_ID_3, VAR_UNK_0x4067 - SetVar VAR_OBJ_GFX_ID_4, VAR_UNK_0x4068 +Battleground_SetTrainersGraphics: + SetVar VAR_OBJ_GFX_ID_1, VAR_BATTLEGROUND_TRAINER_1 + SetVar VAR_OBJ_GFX_ID_2, VAR_BATTLEGROUND_TRAINER_2 + SetVar VAR_OBJ_GFX_ID_3, VAR_BATTLEGROUND_TRAINER_3 + SetVar VAR_OBJ_GFX_ID_4, VAR_BATTLEGROUND_TRAINER_4 Return -_015A: +Battleground_ExpertM: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00D7, _0178 - Message 1 + GoToIfSet FLAG_UNK_0x00D7, Battleground_MakeYourselfAtHome + Message Battleground_Text_TalkAboutStarkMountain WaitButton CloseMessage ReleaseAll End -_0178: - Message 2 +Battleground_MakeYourselfAtHome: + Message Battleground_Text_MakeYourselfAtHome WaitButton CloseMessage ReleaseAll End -_0183: +Battleground_Buck: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer SetFlag FLAG_CAUGHT_MESPRIT - Message 5 + Message Battleground_Text_OpenToToughestTrainers CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8005, 7, _01D5 - CallIfEq VAR_0x8005, 8, _01E9 - CallIfEq VAR_0x8005, 9, _01FD + CallIfEq VAR_0x8005, 7, Battleground_BuckLeaveZ7 + CallIfEq VAR_0x8005, 8, Battleground_BuckLeaveZ8 + CallIfEq VAR_0x8005, 9, Battleground_BuckLeaveZ9 PlaySE SEQ_SE_DP_KAIDAN2 - RemoveObject 1 + RemoveObject LOCALID_BUCK SetFlag FLAG_BUCK_LEFT_BATTLEGROUND - SetFlag FLAG_UNK_0x01D6 + SetFlag FLAG_HIDE_BATTLEGROUND_BUCK ReleaseAll End -_01D5: - ApplyMovement LOCALID_PLAYER, _0214 - ApplyMovement 1, _0240 +Battleground_BuckLeaveZ7: + ApplyMovement LOCALID_PLAYER, Battleground_Movement_PlayerWatchBuckLeaveZ7 + ApplyMovement LOCALID_BUCK, Battleground_Movement_BuckLeaveZ7 WaitMovement Return -_01E9: - ApplyMovement LOCALID_PLAYER, _0220 - ApplyMovement 1, _0254 +Battleground_BuckLeaveZ8: + ApplyMovement LOCALID_PLAYER, Battleground_Movement_PlayerWatchBuckLeaveZ8 + ApplyMovement LOCALID_BUCK, Battleground_Movement_BuckLeaveZ8 WaitMovement Return -_01FD: - ApplyMovement LOCALID_PLAYER, _0234 - ApplyMovement 1, _0264 +Battleground_BuckLeaveZ9: + ApplyMovement LOCALID_PLAYER, Battleground_Movement_PlayerWatchBuckLeaveZ9 + ApplyMovement LOCALID_BUCK, Battleground_Movement_BuckLeaveZ9 WaitMovement Return .balign 4, 0 -_0214: +Battleground_Movement_PlayerWatchBuckLeaveZ7: Delay8 2 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0220: +Battleground_Movement_PlayerWatchBuckLeaveZ8: Delay8 WalkOnSpotNormalSouth Delay8 @@ -153,13 +159,13 @@ _0220: EndMovement .balign 4, 0 -_0234: +Battleground_Movement_PlayerWatchBuckLeaveZ9: Delay8 2 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0240: +Battleground_Movement_BuckLeaveZ7: WalkNormalWest WalkNormalSouth WalkNormalWest 3 @@ -167,1108 +173,1108 @@ _0240: EndMovement .balign 4, 0 -_0254: +Battleground_Movement_BuckLeaveZ8: WalkNormalSouth WalkNormalWest 4 WalkNormalSouth 2 EndMovement .balign 4, 0 -_0264: +Battleground_Movement_BuckLeaveZ9: WalkNormalWest WalkNormalSouth WalkNormalWest 3 WalkNormalSouth 2 EndMovement -_0278: +Battleground_OnFrameWelcome: LockAll - SetVar VAR_UNK_0x40C1, 1 - ApplyMovement 0, _02A0 + SetVar VAR_BATTLEGROUND_STATE, 1 + ApplyMovement LOCALID_EXPERT_M, Battleground_Movement_ExpertFExclamationMark WaitMovement - ApplyMovement LOCALID_PLAYER, _02A8 + ApplyMovement LOCALID_PLAYER, Battleground_Movement_PlayerWalkToExpertF WaitMovement - Message 0 + Message Battleground_Text_WelcomeToBattleground WaitButton CloseMessage ReleaseAll End .balign 4, 0 -_02A0: +Battleground_Movement_ExpertFExclamationMark: EmoteExclamationMark EndMovement .balign 4, 0 -_02A8: +Battleground_Movement_PlayerWalkToExpertF: WalkNormalNorth 2 WalkNormalEast 4 EndMovement -_02B4: +Battleground_Trainer1: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer BufferPlayerName 0 SetVar VAR_MAP_LOCAL_1, VAR_OBJ_GFX_ID_1 - GoToIfSet FLAG_UNK_0x0005, _034D - Call _118A - GoToIfEq VAR_RESULT, 1, _034D - CallIfUnset FLAG_UNK_0x0001, _036E - CallIfSet FLAG_UNK_0x0001, _0376 + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_TRAINER_1, Battleground_PostBattle + Call Battleground_CheckDefeatedTrainer + GoToIfEq VAR_RESULT, TRUE, Battleground_PostBattle + CallIfUnset LOCAL_FLAG_DECLINED_BATTLE_TRAINER_1, Battleground_CallAskBattle + CallIfSet LOCAL_FLAG_DECLINED_BATTLE_TRAINER_1, Battleground_CallAskBattleAgain ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _0386 - Call _032F - GoToIfEq VAR_0x8000, 0, _0398 - SetFlag FLAG_UNK_0x0005 - Call _1091 - GoTo _034D + GoToIfEq VAR_RESULT, MENU_NO, Battleground_DeclinedBattleTrainer1 + Call Battleground_DoBattle + GoToIfEq VAR_0x8000, FALSE, Battleground_LostBattle + SetFlag FLAG_DEFEATED_BATTLEGROUND_TRAINER_1 + Call Battleground_SetFlagDefeatedTrainer + GoTo Battleground_PostBattle End -_032F: - Call _0811 +Battleground_DoBattle: + Call Battleground_MessageIntro CloseMessage - IncrementGameRecord RECORD_UNK_057 - Call _0605 + IncrementGameRecord RECORD_TIMES_BATTLED_AT_BATTLEGROUND + Call Battleground_SetTrainer StartTrainerBattle VAR_MAP_LOCAL_5 CheckWonBattle VAR_0x8000 Return -_034D: - Call _0571 - GoToIfEq VAR_0x8001, 2, _039E - Call _0AFC - GoTo _037E +Battleground_PostBattle: + Call Battleground_CheckBothRoarkAndByron + GoToIfEq VAR_0x8001, 2, Battleground_MessageBothRoarkAndByron + Call Battleground_MessageDefeat + GoTo Battleground_TrainerEnd End -_036E: - Call _0718 +Battleground_CallAskBattle: + Call Battleground_MessageAskBattle Return -_0376: - Call _0A03 +Battleground_CallAskBattleAgain: + Call Battleground_MessageAskBattleAgain Return -_037E: +Battleground_TrainerEnd: WaitButton CloseMessage ReleaseAll End -_0386: - SetFlag FLAG_UNK_0x0001 - Call _090A - GoTo _037E +Battleground_DeclinedBattleTrainer1: + SetFlag LOCAL_FLAG_DECLINED_BATTLE_TRAINER_1 + Call Battleground_MessageDeclinedBattle + GoTo Battleground_TrainerEnd End -_0398: +Battleground_LostBattle: BlackOutFromBattle ReleaseAll End -_039E: - CallIfEq VAR_MAP_LOCAL_1, 126, _03C0 - CallIfEq VAR_MAP_LOCAL_1, 132, _03C5 - GoTo _037E +Battleground_MessageBothRoarkAndByron: + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkDefeatByronPresent + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronDefeatRoarkPresent + GoTo Battleground_TrainerEnd End -_03C0: - Message 22 +Battleground_RoarkDefeatByronPresent: + Message Battleground_Text_RoarkDefeatByronPresent Return -_03C5: - Message 73 +Battleground_ByronDefeatRoarkPresent: + Message Battleground_Text_ByronDefeatRoarkPresent Return -_03CA: +Battleground_Trainer2: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer BufferPlayerName 0 SetVar VAR_MAP_LOCAL_1, VAR_OBJ_GFX_ID_2 - GoToIfSet FLAG_UNK_0x0006, _034D - Call _118A - GoToIfEq VAR_RESULT, 1, _034D - CallIfUnset FLAG_UNK_0x0002, _036E - CallIfSet FLAG_UNK_0x0002, _0376 + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_TRAINER_2, Battleground_PostBattle + Call Battleground_CheckDefeatedTrainer + GoToIfEq VAR_RESULT, TRUE, Battleground_PostBattle + CallIfUnset LOCAL_FLAG_DECLINED_BATTLE_TRAINER_2, Battleground_CallAskBattle + CallIfSet LOCAL_FLAG_DECLINED_BATTLE_TRAINER_2, Battleground_CallAskBattleAgain ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _0445 - Call _032F - GoToIfEq VAR_0x8000, FALSE, _0398 - SetFlag FLAG_UNK_0x0006 - Call _1091 - GoTo _034D + GoToIfEq VAR_RESULT, MENU_NO, Battleground_DeclinedBattleTrainer2 + Call Battleground_DoBattle + GoToIfEq VAR_0x8000, FALSE, Battleground_LostBattle + SetFlag FLAG_DEFEATED_BATTLEGROUND_TRAINER_2 + Call Battleground_SetFlagDefeatedTrainer + GoTo Battleground_PostBattle End -_0445: - SetFlag FLAG_UNK_0x0002 - Call _090A - GoTo _037E +Battleground_DeclinedBattleTrainer2: + SetFlag LOCAL_FLAG_DECLINED_BATTLE_TRAINER_2 + Call Battleground_MessageDeclinedBattle + GoTo Battleground_TrainerEnd End -_0457: +Battleground_Trainer3: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer BufferPlayerName 0 SetVar VAR_MAP_LOCAL_1, VAR_OBJ_GFX_ID_3 - GoToIfSet FLAG_UNK_0x0007, _034D - Call _118A - GoToIfEq VAR_RESULT, 1, _034D - CallIfUnset FLAG_UNK_0x0003, _036E - CallIfSet FLAG_UNK_0x0003, _0376 + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_TRAINER_3, Battleground_PostBattle + Call Battleground_CheckDefeatedTrainer + GoToIfEq VAR_RESULT, TRUE, Battleground_PostBattle + CallIfUnset LOCAL_FLAG_DECLINED_BATTLE_TRAINER_3, Battleground_CallAskBattle + CallIfSet LOCAL_FLAG_DECLINED_BATTLE_TRAINER_3, Battleground_CallAskBattleAgain ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _04D2 - Call _032F - GoToIfEq VAR_0x8000, 0, _0398 - SetFlag FLAG_UNK_0x0007 - Call _1091 - GoTo _034D + GoToIfEq VAR_RESULT, MENU_NO, Battleground_DeclinedBattleTrainer3 + Call Battleground_DoBattle + GoToIfEq VAR_0x8000, FALSE, Battleground_LostBattle + SetFlag FLAG_DEFEATED_BATTLEGROUND_TRAINER_3 + Call Battleground_SetFlagDefeatedTrainer + GoTo Battleground_PostBattle End -_04D2: - SetFlag FLAG_UNK_0x0003 - Call _090A - GoTo _037E +Battleground_DeclinedBattleTrainer3: + SetFlag LOCAL_FLAG_DECLINED_BATTLE_TRAINER_3 + Call Battleground_MessageDeclinedBattle + GoTo Battleground_TrainerEnd End -_04E4: +Battleground_Trainer4: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer BufferPlayerName 0 SetVar VAR_MAP_LOCAL_1, VAR_OBJ_GFX_ID_4 - GoToIfSet FLAG_UNK_0x0008, _034D - Call _118A - GoToIfEq VAR_RESULT, 1, _034D - CallIfUnset FLAG_UNK_0x0004, _036E - CallIfSet FLAG_UNK_0x0004, _0376 + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_TRAINER_4, Battleground_PostBattle + Call Battleground_CheckDefeatedTrainer + GoToIfEq VAR_RESULT, TRUE, Battleground_PostBattle + CallIfUnset LOCAL_FLAG_DECLINED_BATTLE_TRAINER_4, Battleground_CallAskBattle + CallIfSet LOCAL_FLAG_DECLINED_BATTLE_TRAINER_4, Battleground_CallAskBattleAgain ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _055F - Call _032F - GoToIfEq VAR_0x8000, 0, _0398 - SetFlag FLAG_UNK_0x0008 - Call _1091 - GoTo _034D + GoToIfEq VAR_RESULT, MENU_NO, Battleground_DeclinedBattleTrainer4 + Call Battleground_DoBattle + GoToIfEq VAR_0x8000, FALSE, Battleground_LostBattle + SetFlag FLAG_DEFEATED_BATTLEGROUND_TRAINER_4 + Call Battleground_SetFlagDefeatedTrainer + GoTo Battleground_PostBattle End -_055F: - SetFlag FLAG_UNK_0x0004 - Call _090A - GoTo _037E +Battleground_DeclinedBattleTrainer4: + SetFlag LOCAL_FLAG_DECLINED_BATTLE_TRAINER_4 + Call Battleground_MessageDeclinedBattle + GoTo Battleground_TrainerEnd End -_0571: +Battleground_CheckBothRoarkAndByron: SetVar VAR_0x8001, 0 - GoToIfEq VAR_MAP_LOCAL_1, 126, _0593 - GoToIfEq VAR_MAP_LOCAL_1, 132, _0593 + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_IncreaseVarIfRoarkOrByron + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_IncreaseVarIfRoarkOrByron Return -_0593: - CallIfEq VAR_OBJ_GFX_ID_1, 126, _05FD - CallIfEq VAR_OBJ_GFX_ID_2, 126, _05FD - CallIfEq VAR_OBJ_GFX_ID_3, 126, _05FD - CallIfEq VAR_OBJ_GFX_ID_4, 126, _05FD - CallIfEq VAR_OBJ_GFX_ID_1, 132, _05FD - CallIfEq VAR_OBJ_GFX_ID_2, 132, _05FD - CallIfEq VAR_OBJ_GFX_ID_3, 132, _05FD - CallIfEq VAR_OBJ_GFX_ID_4, 132, _05FD +Battleground_IncreaseVarIfRoarkOrByron: + CallIfEq VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_ROARK, Battleground_IncreaseVar + CallIfEq VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_ROARK, Battleground_IncreaseVar + CallIfEq VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_ROARK, Battleground_IncreaseVar + CallIfEq VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_ROARK, Battleground_IncreaseVar + CallIfEq VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BYRON, Battleground_IncreaseVar + CallIfEq VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_BYRON, Battleground_IncreaseVar + CallIfEq VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_BYRON, Battleground_IncreaseVar + CallIfEq VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_BYRON, Battleground_IncreaseVar Return -_05FD: +Battleground_IncreaseVar: AddVar VAR_0x8001, 1 Return -_0605: - CallIfEq VAR_MAP_LOCAL_1, 126, _06B0 - CallIfEq VAR_MAP_LOCAL_1, 127, _06B8 - CallIfEq VAR_MAP_LOCAL_1, 128, _06C0 - CallIfEq VAR_MAP_LOCAL_1, 129, _06C8 - CallIfEq VAR_MAP_LOCAL_1, 130, _06D0 - CallIfEq VAR_MAP_LOCAL_1, 131, _06D8 - CallIfEq VAR_MAP_LOCAL_1, 132, _06E0 - CallIfEq VAR_MAP_LOCAL_1, 133, _06E8 - CallIfEq VAR_MAP_LOCAL_1, 141, _06F0 - CallIfEq VAR_MAP_LOCAL_1, 142, _06F8 - CallIfEq VAR_MAP_LOCAL_1, 143, _0700 - CallIfEq VAR_MAP_LOCAL_1, 144, _0708 - CallIfEq VAR_MAP_LOCAL_1, 145, _0710 +Battleground_SetTrainer: + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_SetTrainerRoark + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_SetTrainerGardenia + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_SetTrainerWake + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_SetTrainerMaylene + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_SetTrainerFantina + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_SetTrainerCandice + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_SetTrainerByron + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_SetTrainerVolkner + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_SetTrainerCheryl + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_SetTrainerRiley + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_SetTrainerMarley + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_SetTrainerBuck + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_SetTrainerMira Return -_06B0: +Battleground_SetTrainerRoark: SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_ROARK_REMATCH Return -_06B8: +Battleground_SetTrainerGardenia: SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_GARDENIA_REMATCH Return -_06C0: +Battleground_SetTrainerWake: SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_WAKE_REMATCH Return -_06C8: +Battleground_SetTrainerMaylene: SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_MAYLENE_REMATCH Return -_06D0: +Battleground_SetTrainerFantina: SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_FANTINA_REMATCH Return -_06D8: +Battleground_SetTrainerCandice: SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_CANDICE_REMATCH Return -_06E0: +Battleground_SetTrainerByron: SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_BYRON_REMATCH Return -_06E8: +Battleground_SetTrainerVolkner: SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_VOLKNER_REMATCH Return -_06F0: +Battleground_SetTrainerCheryl: SetVar VAR_MAP_LOCAL_5, TRAINER_CHERYL_BATTLEGROUND Return -_06F8: +Battleground_SetTrainerRiley: SetVar VAR_MAP_LOCAL_5, TRAINER_RILEY_BATTLEGROUND Return -_0700: +Battleground_SetTrainerMarley: SetVar VAR_MAP_LOCAL_5, TRAINER_MARLEY_BATTLEGROUND Return -_0708: +Battleground_SetTrainerBuck: SetVar VAR_MAP_LOCAL_5, TRAINER_BUCK_BATTLEGROUND Return -_0710: +Battleground_SetTrainerMira: SetVar VAR_MAP_LOCAL_5, TRAINER_MIRA_BATTLEGROUND Return -_0718: - GoToIfEq VAR_UNK_0x4061, 1, _0BF5 - CallIfEq VAR_MAP_LOCAL_1, 126, _07D0 - CallIfEq VAR_MAP_LOCAL_1, 127, _07D5 - CallIfEq VAR_MAP_LOCAL_1, 128, _07DA - CallIfEq VAR_MAP_LOCAL_1, 129, _07DF - CallIfEq VAR_MAP_LOCAL_1, 130, _07E4 - CallIfEq VAR_MAP_LOCAL_1, 131, _07E9 - CallIfEq VAR_MAP_LOCAL_1, 132, _07EE - CallIfEq VAR_MAP_LOCAL_1, 133, _07F3 - CallIfEq VAR_MAP_LOCAL_1, 141, _07F8 - CallIfEq VAR_MAP_LOCAL_1, 142, _07FD - CallIfEq VAR_MAP_LOCAL_1, 143, _0802 - CallIfEq VAR_MAP_LOCAL_1, 144, _0807 - CallIfEq VAR_MAP_LOCAL_1, 145, _080C +Battleground_MessageAskBattle: + GoToIfEq VAR_RANDOM_BATTLEGROUND_MESSAGE, 1, Battleground_MessageAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckAskBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraAskBattle Return -_07D0: - Message 12 +Battleground_RoarkAskBattle: + Message Battleground_Text_RoarkAskBattle Return -_07D5: - Message 23 +Battleground_GardeniaAskBattle: + Message Battleground_Text_GardeniaAskBattle Return -_07DA: - Message 53 +Battleground_WakeAskBattle: + Message Battleground_Text_WakeAskBattle Return -_07DF: - Message 43 +Battleground_MayleneAskBattle: + Message Battleground_Text_MayleneAskBattle Return -_07E4: - Message 33 +Battleground_FantinaAskBattle: + Message Battleground_Text_FantinaAskBattle Return -_07E9: - Message 74 +Battleground_CandiceAskBattle: + Message Battleground_Text_CandiceAskBattle Return -_07EE: - Message 63 +Battleground_ByronAskBattle: + Message Battleground_Text_ByronAskBattle Return -_07F3: - Message 84 +Battleground_VolknerAskBattle: + Message Battleground_Text_VolknerAskBattle Return -_07F8: - Message 94 +Battleground_CherylAskBattle: + Message Battleground_Text_CherylAskBattle Return -_07FD: - Message 114 +Battleground_RileyAskBattle: + Message Battleground_Text_RileyAskBattle Return -_0802: - Message 124 +Battleground_MarleyAskBattle: + Message Battleground_Text_MarleyAskBattle Return -_0807: - Message 134 +Battleground_BuckAskBattle: + Message Battleground_Text_BuckAskBattle Return -_080C: - Message 104 +Battleground_MiraAskBattle: + Message Battleground_Text_MiraAskBattle Return -_0811: - GoToIfEq VAR_UNK_0x4061, 1, _0CE1 - CallIfEq VAR_MAP_LOCAL_1, 126, _08C9 - CallIfEq VAR_MAP_LOCAL_1, 127, _08CE - CallIfEq VAR_MAP_LOCAL_1, 128, _08D3 - CallIfEq VAR_MAP_LOCAL_1, 129, _08D8 - CallIfEq VAR_MAP_LOCAL_1, 130, _08DD - CallIfEq VAR_MAP_LOCAL_1, 131, _08E2 - CallIfEq VAR_MAP_LOCAL_1, 132, _08E7 - CallIfEq VAR_MAP_LOCAL_1, 133, _08EC - CallIfEq VAR_MAP_LOCAL_1, 141, _08F1 - CallIfEq VAR_MAP_LOCAL_1, 142, _08F6 - CallIfEq VAR_MAP_LOCAL_1, 143, _08FB - CallIfEq VAR_MAP_LOCAL_1, 144, _0900 - CallIfEq VAR_MAP_LOCAL_1, 145, _0905 +Battleground_MessageIntro: + GoToIfEq VAR_RANDOM_BATTLEGROUND_MESSAGE, 1, Battleground_MessageIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckIntro + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraIntro Return -_08C9: - Message 13 +Battleground_RoarkIntro: + Message Battleground_Text_RoarkIntro Return -_08CE: - Message 24 +Battleground_GardeniaIntro: + Message Battleground_Text_GardeniaIntro Return -_08D3: - Message 54 +Battleground_WakeIntro: + Message Battleground_Text_WakeIntro Return -_08D8: - Message 44 +Battleground_MayleneIntro: + Message Battleground_Text_MayleneIntro Return -_08DD: - Message 34 +Battleground_FantinaIntro: + Message Battleground_Text_FantinaIntro Return -_08E2: - Message 75 +Battleground_CandiceIntro: + Message Battleground_Text_CandiceIntro Return -_08E7: - Message 64 +Battleground_ByronIntro: + Message Battleground_Text_ByronIntro Return -_08EC: - Message 85 +Battleground_VolknerIntro: + Message Battleground_Text_VolknerIntro Return -_08F1: - Message 95 +Battleground_CherylIntro: + Message Battleground_Text_CherylIntro Return -_08F6: - Message 115 +Battleground_RileyIntro: + Message Battleground_Text_RileyIntro Return -_08FB: - Message 125 +Battleground_MarleyIntro: + Message Battleground_Text_MarleyIntro Return -_0900: - Message 135 +Battleground_BuckIntro: + Message Battleground_Text_BuckIntro Return -_0905: - Message 105 +Battleground_MiraIntro: + Message Battleground_Text_MiraIntro Return -_090A: - GoToIfEq VAR_UNK_0x4061, 1, _0DCD - CallIfEq VAR_MAP_LOCAL_1, 126, _09C2 - CallIfEq VAR_MAP_LOCAL_1, 127, _09C7 - CallIfEq VAR_MAP_LOCAL_1, 128, _09CC - CallIfEq VAR_MAP_LOCAL_1, 129, _09D1 - CallIfEq VAR_MAP_LOCAL_1, 130, _09D6 - CallIfEq VAR_MAP_LOCAL_1, 131, _09DB - CallIfEq VAR_MAP_LOCAL_1, 132, _09E0 - CallIfEq VAR_MAP_LOCAL_1, 133, _09E5 - CallIfEq VAR_MAP_LOCAL_1, 141, _09EA - CallIfEq VAR_MAP_LOCAL_1, 142, _09EF - CallIfEq VAR_MAP_LOCAL_1, 143, _09F4 - CallIfEq VAR_MAP_LOCAL_1, 144, _09F9 - CallIfEq VAR_MAP_LOCAL_1, 145, _09FE +Battleground_MessageDeclinedBattle: + GoToIfEq VAR_RANDOM_BATTLEGROUND_MESSAGE, 1, Battleground_MessageDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckDeclinedBattle + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraDeclinedBattle Return -_09C2: - Message 14 +Battleground_RoarkDeclinedBattle: + Message Battleground_Text_RoarkDeclinedBattle Return -_09C7: - Message 25 +Battleground_GardeniaDeclinedBattle: + Message Battleground_Text_GardeniaDeclinedBattle Return -_09CC: - Message 55 +Battleground_WakeDeclinedBattle: + Message Battleground_Text_WakeDeclinedBattle Return -_09D1: - Message 45 +Battleground_MayleneDeclinedBattle: + Message Battleground_Text_MayleneDeclinedBattle Return -_09D6: - Message 35 +Battleground_FantinaDeclinedBattle: + Message Battleground_Text_FantinaDeclinedBattle Return -_09DB: - Message 76 +Battleground_CandiceDeclinedBattle: + Message Battleground_Text_CandiceDeclinedBattle Return -_09E0: - Message 65 +Battleground_ByronDeclinedBattle: + Message Battleground_Text_ByronDeclinedBattle Return -_09E5: - Message 86 +Battleground_VolknerDeclinedBattle: + Message Battleground_Text_VolknerDeclinedBattle Return -_09EA: - Message 96 +Battleground_CherylDeclinedBattle: + Message Battleground_Text_CherylDeclinedBattle Return -_09EF: - Message 116 +Battleground_RileyDeclinedBattle: + Message Battleground_Text_RileyDeclinedBattle Return -_09F4: - Message 126 +Battleground_MarleyDeclinedBattle: + Message Battleground_Text_MarleyDeclinedBattle Return -_09F9: - Message 136 +Battleground_BuckDeclinedBattle: + Message Battleground_Text_BuckDeclinedBattle Return -_09FE: - Message 106 +Battleground_MiraDeclinedBattle: + Message Battleground_Text_MiraDeclinedBattle Return -_0A03: - GoToIfEq VAR_UNK_0x4061, 1, _0EB9 - CallIfEq VAR_MAP_LOCAL_1, 126, _0ABB - CallIfEq VAR_MAP_LOCAL_1, 127, _0AC0 - CallIfEq VAR_MAP_LOCAL_1, 128, _0AC5 - CallIfEq VAR_MAP_LOCAL_1, 129, _0ACA - CallIfEq VAR_MAP_LOCAL_1, 130, _0ACF - CallIfEq VAR_MAP_LOCAL_1, 131, _0AD4 - CallIfEq VAR_MAP_LOCAL_1, 132, _0AD9 - CallIfEq VAR_MAP_LOCAL_1, 133, _0ADE - CallIfEq VAR_MAP_LOCAL_1, 141, _0AE3 - CallIfEq VAR_MAP_LOCAL_1, 142, _0AE8 - CallIfEq VAR_MAP_LOCAL_1, 143, _0AED - CallIfEq VAR_MAP_LOCAL_1, 144, _0AF2 - CallIfEq VAR_MAP_LOCAL_1, 145, _0AF7 +Battleground_MessageAskBattleAgain: + GoToIfEq VAR_RANDOM_BATTLEGROUND_MESSAGE, 1, Battleground_MessageAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckAskBattleAgain + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraAskBattleAgain Return -_0ABB: - Message 15 +Battleground_RoarkAskBattleAgain: + Message Battleground_Text_RoarkAskBattleAgain Return -_0AC0: - Message 26 +Battleground_GardeniaAskBattleAgain: + Message Battleground_Text_GardeniaAskBattleAgain Return -_0AC5: - Message 56 +Battleground_WakeAskBattleAgain: + Message Battleground_Text_WakeAskBattleAgain Return -_0ACA: - Message 46 +Battleground_MayleneAskBattleAgain: + Message Battleground_Text_MayleneAskBattleAgain Return -_0ACF: - Message 36 +Battleground_FantinaAskBattleAgain: + Message Battleground_Text_FantinaAskBattleAgain Return -_0AD4: - Message 77 +Battleground_CandiceAskBattleAgain: + Message Battleground_Text_CandiceAskBattleAgain Return -_0AD9: - Message 66 +Battleground_ByronAskBattleAgain: + Message Battleground_Text_ByronAskBattleAgain Return -_0ADE: - Message 87 +Battleground_VolknerAskBattleAgain: + Message Battleground_Text_VolknerAskBattleAgain Return -_0AE3: - Message 97 +Battleground_CherylAskBattleAgain: + Message Battleground_Text_CherylAskBattleAgain Return -_0AE8: - Message 117 +Battleground_RileyAskBattleAgain: + Message Battleground_Text_RileyAskBattleAgain Return -_0AED: - Message 127 +Battleground_MarleyAskBattleAgain: + Message Battleground_Text_MarleyAskBattleAgain Return -_0AF2: - Message 137 +Battleground_BuckAskBattleAgain: + Message Battleground_Text_BuckAskBattleAgain Return -_0AF7: - Message 107 +Battleground_MiraAskBattleAgain: + Message Battleground_Text_MiraAskBattleAgain Return -_0AFC: - GoToIfEq VAR_UNK_0x4061, 1, _0FA5 - CallIfEq VAR_MAP_LOCAL_1, 126, _0BB4 - CallIfEq VAR_MAP_LOCAL_1, 127, _0BB9 - CallIfEq VAR_MAP_LOCAL_1, 128, _0BBE - CallIfEq VAR_MAP_LOCAL_1, 129, _0BC3 - CallIfEq VAR_MAP_LOCAL_1, 130, _0BC8 - CallIfEq VAR_MAP_LOCAL_1, 131, _0BCD - CallIfEq VAR_MAP_LOCAL_1, 132, _0BD2 - CallIfEq VAR_MAP_LOCAL_1, 133, _0BD7 - CallIfEq VAR_MAP_LOCAL_1, 141, _0BDC - CallIfEq VAR_MAP_LOCAL_1, 142, _0BE1 - CallIfEq VAR_MAP_LOCAL_1, 143, _0BE6 - CallIfEq VAR_MAP_LOCAL_1, 144, _0BEB - CallIfEq VAR_MAP_LOCAL_1, 145, _0BF0 +Battleground_MessageDefeat: + GoToIfEq VAR_RANDOM_BATTLEGROUND_MESSAGE, 1, Battleground_MessageDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckDefeat + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraDefeat Return -_0BB4: - Message 16 +Battleground_RoarkDefeat: + Message Battleground_Text_RoarkDefeat Return -_0BB9: - Message 27 +Battleground_GardeniaDefeat: + Message Battleground_Text_GardeniaDefeat Return -_0BBE: - Message 57 +Battleground_WakeDefeat: + Message Battleground_Text_WakeDefeat Return -_0BC3: - Message 47 +Battleground_MayleneDefeat: + Message Battleground_Text_MayleneDefeat Return -_0BC8: - Message 37 +Battleground_FantinaDefeat: + Message Battleground_Text_FantinaDefeat Return -_0BCD: - Message 78 +Battleground_CandiceDefeat: + Message Battleground_Text_CandiceDefeat Return -_0BD2: - Message 67 +Battleground_ByronDefeat: + Message Battleground_Text_ByronDefeat Return -_0BD7: - Message 88 +Battleground_VolknerDefeat: + Message Battleground_Text_VolknerDefeat Return -_0BDC: - Message 98 +Battleground_CherylDefeat: + Message Battleground_Text_CherylDefeat Return -_0BE1: - Message 118 +Battleground_RileyDefeat: + Message Battleground_Text_RileyDefeat Return -_0BE6: - Message 128 +Battleground_MarleyDefeat: + Message Battleground_Text_MarleyDefeat Return -_0BEB: - Message 138 +Battleground_BuckDefeat: + Message Battleground_Text_BuckDefeat Return -_0BF0: - Message 108 +Battleground_MiraDefeat: + Message Battleground_Text_MiraDefeat Return -_0BF5: - CallIfEq VAR_MAP_LOCAL_1, 126, _0CA0 - CallIfEq VAR_MAP_LOCAL_1, 127, _0CA5 - CallIfEq VAR_MAP_LOCAL_1, 128, _0CAA - CallIfEq VAR_MAP_LOCAL_1, 129, _0CAF - CallIfEq VAR_MAP_LOCAL_1, 130, _0CB4 - CallIfEq VAR_MAP_LOCAL_1, 131, _0CB9 - CallIfEq VAR_MAP_LOCAL_1, 132, _0CBE - CallIfEq VAR_MAP_LOCAL_1, 133, _0CC3 - CallIfEq VAR_MAP_LOCAL_1, 141, _0CC8 - CallIfEq VAR_MAP_LOCAL_1, 142, _0CCD - CallIfEq VAR_MAP_LOCAL_1, 143, _0CD2 - CallIfEq VAR_MAP_LOCAL_1, 144, _0CD7 - CallIfEq VAR_MAP_LOCAL_1, 145, _0CDC +Battleground_MessageAskBattle2: + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckAskBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraAskBattle2 Return -_0CA0: - Message 17 +Battleground_RoarkAskBattle2: + Message Battleground_Text_RoarkAskBattle2 Return -_0CA5: - Message 28 +Battleground_GardeniaAskBattle2: + Message Battleground_Text_GardeniaAskBattle2 Return -_0CAA: - Message 58 +Battleground_WakeAskBattle2: + Message Battleground_Text_WakeAskBattle2 Return -_0CAF: - Message 48 +Battleground_MayleneAskBattle2: + Message Battleground_Text_MayleneAskBattle2 Return -_0CB4: - Message 38 +Battleground_FantinaAskBattle2: + Message Battleground_Text_FantinaAskBattle2 Return -_0CB9: - Message 79 +Battleground_CandiceAskBattle2: + Message Battleground_Text_CandiceAskBattle2 Return -_0CBE: - Message 68 +Battleground_ByronAskBattle2: + Message Battleground_Text_ByronAskBattle2 Return -_0CC3: - Message 89 +Battleground_VolknerAskBattle2: + Message Battleground_Text_VolknerAskBattle2 Return -_0CC8: - Message 99 +Battleground_CherylAskBattle2: + Message Battleground_Text_CherylAskBattle2 Return -_0CCD: - Message 119 +Battleground_RileyAskBattle2: + Message Battleground_Text_RileyAskBattle2 Return -_0CD2: - Message 129 +Battleground_MarleyAskBattle2: + Message Battleground_Text_MarleyAskBattle2 Return -_0CD7: - Message 139 +Battleground_BuckAskBattle2: + Message Battleground_Text_BuckAskBattle2 Return -_0CDC: - Message 109 +Battleground_MiraAskBattle2: + Message Battleground_Text_MiraAskBattle2 Return -_0CE1: - CallIfEq VAR_MAP_LOCAL_1, 126, _0D8C - CallIfEq VAR_MAP_LOCAL_1, 127, _0D91 - CallIfEq VAR_MAP_LOCAL_1, 128, _0D96 - CallIfEq VAR_MAP_LOCAL_1, 129, _0D9B - CallIfEq VAR_MAP_LOCAL_1, 130, _0DA0 - CallIfEq VAR_MAP_LOCAL_1, 131, _0DA5 - CallIfEq VAR_MAP_LOCAL_1, 132, _0DAA - CallIfEq VAR_MAP_LOCAL_1, 133, _0DAF - CallIfEq VAR_MAP_LOCAL_1, 141, _0DB4 - CallIfEq VAR_MAP_LOCAL_1, 142, _0DB9 - CallIfEq VAR_MAP_LOCAL_1, 143, _0DBE - CallIfEq VAR_MAP_LOCAL_1, 144, _0DC3 - CallIfEq VAR_MAP_LOCAL_1, 145, _0DC8 +Battleground_MessageIntro2: + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckIntro2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraIntro2 Return -_0D8C: - Message 18 +Battleground_RoarkIntro2: + Message Battleground_Text_RoarkIntro2 Return -_0D91: - Message 29 +Battleground_GardeniaIntro2: + Message Battleground_Text_GardeniaIntro2 Return -_0D96: - Message 59 +Battleground_WakeIntro2: + Message Battleground_Text_WakeIntro2 Return -_0D9B: - Message 49 +Battleground_MayleneIntro2: + Message Battleground_Text_MayleneIntro2 Return -_0DA0: - Message 39 +Battleground_FantinaIntro2: + Message Battleground_Text_FantinaIntro2 Return -_0DA5: - Message 80 +Battleground_CandiceIntro2: + Message Battleground_Text_CandiceIntro2 Return -_0DAA: - Message 69 +Battleground_ByronIntro2: + Message Battleground_Text_ByronIntro2 Return -_0DAF: - Message 90 +Battleground_VolknerIntro2: + Message Battleground_Text_VolknerIntro2 Return -_0DB4: - Message 100 +Battleground_CherylIntro2: + Message Battleground_Text_CherylIntro2 Return -_0DB9: - Message 120 +Battleground_RileyIntro2: + Message Battleground_Text_RileyIntro2 Return -_0DBE: - Message 130 +Battleground_MarleyIntro2: + Message Battleground_Text_MarleyIntro2 Return -_0DC3: - Message 140 +Battleground_BuckIntro2: + Message Battleground_Text_BuckIntro2 Return -_0DC8: - Message 110 +Battleground_MiraIntro2: + Message Battleground_Text_MiraIntro2 Return -_0DCD: - CallIfEq VAR_MAP_LOCAL_1, 126, _0E78 - CallIfEq VAR_MAP_LOCAL_1, 127, _0E7D - CallIfEq VAR_MAP_LOCAL_1, 128, _0E82 - CallIfEq VAR_MAP_LOCAL_1, 129, _0E87 - CallIfEq VAR_MAP_LOCAL_1, 130, _0E8C - CallIfEq VAR_MAP_LOCAL_1, 131, _0E91 - CallIfEq VAR_MAP_LOCAL_1, 132, _0E96 - CallIfEq VAR_MAP_LOCAL_1, 133, _0E9B - CallIfEq VAR_MAP_LOCAL_1, 141, _0EA0 - CallIfEq VAR_MAP_LOCAL_1, 142, _0EA5 - CallIfEq VAR_MAP_LOCAL_1, 143, _0EAA - CallIfEq VAR_MAP_LOCAL_1, 144, _0EAF - CallIfEq VAR_MAP_LOCAL_1, 145, _0EB4 +Battleground_MessageDeclinedBattle2: + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckDeclinedBattle2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraDeclinedBattle2 Return -_0E78: - Message 19 +Battleground_RoarkDeclinedBattle2: + Message Battleground_Text_RoarkDeclinedBattle2 Return -_0E7D: - Message 30 +Battleground_GardeniaDeclinedBattle2: + Message Battleground_Text_GardeniaDeclinedBattle2 Return -_0E82: - Message 60 +Battleground_WakeDeclinedBattle2: + Message Battleground_Text_WakeDeclinedBattle2 Return -_0E87: - Message 50 +Battleground_MayleneDeclinedBattle2: + Message Battleground_Text_MayleneDeclinedBattle2 Return -_0E8C: - Message 40 +Battleground_FantinaDeclinedBattle2: + Message Battleground_Text_FantinaDeclinedBattle2 Return -_0E91: - Message 81 +Battleground_CandiceDeclinedBattle2: + Message Battleground_Text_CandiceDeclinedBattle2 Return -_0E96: - Message 70 +Battleground_ByronDeclinedBattle2: + Message Battleground_Text_ByronDeclinedBattle2 Return -_0E9B: - Message 91 +Battleground_VolknerDeclinedBattle2: + Message Battleground_Text_VolknerDeclinedBattle2 Return -_0EA0: - Message 101 +Battleground_CherylDeclinedBattle2: + Message Battleground_Text_CherylDeclinedBattle2 Return -_0EA5: - Message 121 +Battleground_RileyDeclinedBattle2: + Message Battleground_Text_RileyDeclinedBattle2 Return -_0EAA: - Message 131 +Battleground_MarleyDeclinedBattle2: + Message Battleground_Text_MarleyDeclinedBattle2 Return -_0EAF: - Message 141 +Battleground_BuckDeclinedBattle2: + Message Battleground_Text_BuckDeclinedBattle2 Return -_0EB4: - Message 111 +Battleground_MiraDeclinedBattle2: + Message Battleground_Text_MiraDeclinedBattle2 Return -_0EB9: - CallIfEq VAR_MAP_LOCAL_1, 126, _0F64 - CallIfEq VAR_MAP_LOCAL_1, 127, _0F69 - CallIfEq VAR_MAP_LOCAL_1, 128, _0F6E - CallIfEq VAR_MAP_LOCAL_1, 129, _0F73 - CallIfEq VAR_MAP_LOCAL_1, 130, _0F78 - CallIfEq VAR_MAP_LOCAL_1, 131, _0F7D - CallIfEq VAR_MAP_LOCAL_1, 132, _0F82 - CallIfEq VAR_MAP_LOCAL_1, 133, _0F87 - CallIfEq VAR_MAP_LOCAL_1, 141, _0F8C - CallIfEq VAR_MAP_LOCAL_1, 142, _0F91 - CallIfEq VAR_MAP_LOCAL_1, 143, _0F96 - CallIfEq VAR_MAP_LOCAL_1, 144, _0F9B - CallIfEq VAR_MAP_LOCAL_1, 145, _0FA0 +Battleground_MessageAskBattleAgain2: + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckAskBattleAgain2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraAskBattleAgain2 Return -_0F64: - Message 20 +Battleground_RoarkAskBattleAgain2: + Message Battleground_Text_RoarkAskBattleAgain2 Return -_0F69: - Message 31 +Battleground_GardeniaAskBattleAgain2: + Message Battleground_Text_GardeniaAskBattleAgain2 Return -_0F6E: - Message 61 +Battleground_WakeAskBattleAgain2: + Message Battleground_Text_WakeAskBattleAgain2 Return -_0F73: - Message 51 +Battleground_MayleneAskBattleAgain2: + Message Battleground_Text_MayleneAskBattleAgain2 Return -_0F78: - Message 41 +Battleground_FantinaAskBattleAgain2: + Message Battleground_Text_FantinaAskBattleAgain2 Return -_0F7D: - Message 82 +Battleground_CandiceAskBattleAgain2: + Message Battleground_Text_CandiceAskBattleAgain2 Return -_0F82: - Message 71 +Battleground_ByronAskBattleAgain2: + Message Battleground_Text_ByronAskBattleAgain2 Return -_0F87: - Message 92 +Battleground_VolknerAskBattleAgain2: + Message Battleground_Text_VolknerAskBattleAgain2 Return -_0F8C: - Message 102 +Battleground_CherylAskBattleAgain2: + Message Battleground_Text_CherylAskBattleAgain2 Return -_0F91: - Message 122 +Battleground_RileyAskBattleAgain2: + Message Battleground_Text_RileyAskBattleAgain2 Return -_0F96: - Message 132 +Battleground_MarleyAskBattleAgain2: + Message Battleground_Text_MarleyAskBattleAgain2 Return -_0F9B: - Message 142 +Battleground_BuckAskBattleAgain2: + Message Battleground_Text_BuckAskBattleAgain2 Return -_0FA0: - Message 112 +Battleground_MiraAskBattleAgain2: + Message Battleground_Text_MiraAskBattleAgain2 Return -_0FA5: - CallIfEq VAR_MAP_LOCAL_1, 126, _1050 - CallIfEq VAR_MAP_LOCAL_1, 127, _1055 - CallIfEq VAR_MAP_LOCAL_1, 128, _105A - CallIfEq VAR_MAP_LOCAL_1, 129, _105F - CallIfEq VAR_MAP_LOCAL_1, 130, _1064 - CallIfEq VAR_MAP_LOCAL_1, 131, _1069 - CallIfEq VAR_MAP_LOCAL_1, 132, _106E - CallIfEq VAR_MAP_LOCAL_1, 133, _1073 - CallIfEq VAR_MAP_LOCAL_1, 141, _1078 - CallIfEq VAR_MAP_LOCAL_1, 142, _107D - CallIfEq VAR_MAP_LOCAL_1, 143, _1082 - CallIfEq VAR_MAP_LOCAL_1, 144, _1087 - CallIfEq VAR_MAP_LOCAL_1, 145, _108C +Battleground_MessageDefeat2: + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_RoarkDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_GardeniaDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_WakeDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_MayleneDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_FantinaDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CandiceDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_ByronDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_VolknerDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CherylDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_RileyDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_MarleyDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_BuckDefeat2 + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_MiraDefeat2 Return -_1050: - Message 21 +Battleground_RoarkDefeat2: + Message Battleground_Text_RoarkDefeat2 Return -_1055: - Message 32 +Battleground_GardeniaDefeat2: + Message Battleground_Text_GardeniaDefeat2 Return -_105A: - Message 62 +Battleground_WakeDefeat2: + Message Battleground_Text_WakeDefeat2 Return -_105F: - Message 52 +Battleground_MayleneDefeat2: + Message Battleground_Text_MayleneDefeat2 Return -_1064: - Message 42 +Battleground_FantinaDefeat2: + Message Battleground_Text_FantinaDefeat2 Return -_1069: - Message 83 +Battleground_CandiceDefeat2: + Message Battleground_Text_CandiceDefeat2 Return -_106E: - Message 72 +Battleground_ByronDefeat2: + Message Battleground_Text_ByronDefeat2 Return -_1073: - Message 93 +Battleground_VolknerDefeat2: + Message Battleground_Text_VolknerDefeat2 Return -_1078: - Message 103 +Battleground_CherylDefeat2: + Message Battleground_Text_CherylDefeat2 Return -_107D: - Message 123 +Battleground_RileyDefeat2: + Message Battleground_Text_RileyDefeat2 Return -_1082: - Message 133 +Battleground_MarleyDefeat2: + Message Battleground_Text_MarleyDefeat2 Return -_1087: - Message 143 +Battleground_BuckDefeat2: + Message Battleground_Text_BuckDefeat2 Return -_108C: - Message 113 +Battleground_MiraDefeat2: + Message Battleground_Text_MiraDefeat2 Return -_1091: - CallIfEq VAR_MAP_LOCAL_1, 126, _113C - CallIfEq VAR_MAP_LOCAL_1, 127, _1142 - CallIfEq VAR_MAP_LOCAL_1, 128, _1148 - CallIfEq VAR_MAP_LOCAL_1, 129, _114E - CallIfEq VAR_MAP_LOCAL_1, 130, _1154 - CallIfEq VAR_MAP_LOCAL_1, 131, _115A - CallIfEq VAR_MAP_LOCAL_1, 132, _1160 - CallIfEq VAR_MAP_LOCAL_1, 133, _1166 - CallIfEq VAR_MAP_LOCAL_1, 141, _116C - CallIfEq VAR_MAP_LOCAL_1, 142, _1172 - CallIfEq VAR_MAP_LOCAL_1, 143, _1178 - CallIfEq VAR_MAP_LOCAL_1, 144, _117E - CallIfEq VAR_MAP_LOCAL_1, 145, _1184 +Battleground_SetFlagDefeatedTrainer: + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_SetFlagDefeatedRoark + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_SetFlagDefeatedGardenia + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_SetFlagDefeatedWake + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_SetFlagDefeatedMaylene + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_SetFlagDefeatedFantina + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_SetFlagDefeatedCandice + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_SetFlagDefeatedByron + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_SetFlagDefeatedVolkner + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_SetFlagDefeatedCheryl + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_SetFlagDefeatedRiley + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_SetFlagDefeatedMarley + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_SetFlagDefeatedBuck + CallIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_SetFlagDefeatedMira Return -_113C: - SetFlag FLAG_UNK_0x0AB8 +Battleground_SetFlagDefeatedRoark: + SetFlag FLAG_DEFEATED_BATTLEGROUND_ROARK Return -_1142: - SetFlag FLAG_UNK_0x0AB9 +Battleground_SetFlagDefeatedGardenia: + SetFlag FLAG_DEFEATED_BATTLEGROUND_GARDENIA Return -_1148: - SetFlag FLAG_UNK_0x0ABA +Battleground_SetFlagDefeatedWake: + SetFlag FLAG_DEFEATED_BATTLEGROUND_CRASHER_WAKE Return -_114E: - SetFlag FLAG_UNK_0x0ABB +Battleground_SetFlagDefeatedMaylene: + SetFlag FLAG_DEFEATED_BATTLEGROUND_MAYLENE Return -_1154: - SetFlag FLAG_UNK_0x0AC5 +Battleground_SetFlagDefeatedFantina: + SetFlag FLAG_DEFEATED_BATTLEGROUND_FANTINA Return -_115A: - SetFlag FLAG_UNK_0x0AC6 +Battleground_SetFlagDefeatedCandice: + SetFlag FLAG_DEFEATED_BATTLEGROUND_CANDICE Return -_1160: - SetFlag FLAG_UNK_0x0AC7 +Battleground_SetFlagDefeatedByron: + SetFlag FLAG_DEFEATED_BATTLEGROUND_BYRON Return -_1166: - SetFlag FLAG_UNK_0x0AC8 +Battleground_SetFlagDefeatedVolkner: + SetFlag FLAG_DEFEATED_BATTLEGROUND_VOLKNER Return -_116C: - SetFlag FLAG_UNK_0x0AC9 +Battleground_SetFlagDefeatedCheryl: + SetFlag FLAG_DEFEATED_BATTLEGROUND_CHERYL Return -_1172: - SetFlag FLAG_UNK_0x0ACA +Battleground_SetFlagDefeatedRiley: + SetFlag FLAG_DEFEATED_BATTLEGROUND_RILEY Return -_1178: - SetFlag FLAG_UNK_0x0ACB +Battleground_SetFlagDefeatedMarley: + SetFlag FLAG_DEFEATED_BATTLEGROUND_MARLEY Return -_117E: - SetFlag FLAG_UNK_0x0ACC +Battleground_SetFlagDefeatedBuck: + SetFlag FLAG_DEFEATED_BATTLEGROUND_BUCK Return -_1184: - SetFlag FLAG_UNK_0x0ACD +Battleground_SetFlagDefeatedMira: + SetFlag FLAG_DEFEATED_BATTLEGROUND_MIRA Return -_118A: - SetVar VAR_RESULT, 0 - GoToIfEq VAR_MAP_LOCAL_1, 126, _123B - GoToIfEq VAR_MAP_LOCAL_1, 127, _1248 - GoToIfEq VAR_MAP_LOCAL_1, 128, _1255 - GoToIfEq VAR_MAP_LOCAL_1, 129, _1262 - GoToIfEq VAR_MAP_LOCAL_1, 130, _126F - GoToIfEq VAR_MAP_LOCAL_1, 131, _127C - GoToIfEq VAR_MAP_LOCAL_1, 132, _1289 - GoToIfEq VAR_MAP_LOCAL_1, 133, _1296 - GoToIfEq VAR_MAP_LOCAL_1, 141, _12A3 - GoToIfEq VAR_MAP_LOCAL_1, 142, _12B0 - GoToIfEq VAR_MAP_LOCAL_1, 143, _12BD - GoToIfEq VAR_MAP_LOCAL_1, 144, _12CA - GoToIfEq VAR_MAP_LOCAL_1, 145, _12D7 +Battleground_CheckDefeatedTrainer: + SetVar VAR_RESULT, FALSE + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_ROARK, Battleground_CheckDefeatedRoark + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_GARDENIA, Battleground_CheckDefeatedGardenia + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CRASHER_WAKE, Battleground_CheckDefeatedWake + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MAYLENE, Battleground_CheckDefeatedMaylene + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_FANTINA, Battleground_CheckDefeatedFantina + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CANDICE, Battleground_CheckDefeatedCandice + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BYRON, Battleground_CheckDefeatedByron + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_VOLKNER, Battleground_CheckDefeatedVolkner + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_CHERYL, Battleground_CheckDefeatedCheryl + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_RILEY, Battleground_CheckDefeatedRiley + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MARLEY, Battleground_CheckDefeatedMarley + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_BUCK, Battleground_CheckDefeatedBuck + GoToIfEq VAR_MAP_LOCAL_1, OBJ_EVENT_GFX_MIRA, Battleground_CheckDefeatedMira Return -_123B: - GoToIfSet FLAG_UNK_0x0AB8, _12E4 +Battleground_CheckDefeatedRoark: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_ROARK, Battleground_SetResultTrue Return -_1248: - GoToIfSet FLAG_UNK_0x0AB9, _12E4 +Battleground_CheckDefeatedGardenia: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_GARDENIA, Battleground_SetResultTrue Return -_1255: - GoToIfSet FLAG_UNK_0x0ABA, _12E4 +Battleground_CheckDefeatedWake: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_CRASHER_WAKE, Battleground_SetResultTrue Return -_1262: - GoToIfSet FLAG_UNK_0x0ABB, _12E4 +Battleground_CheckDefeatedMaylene: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_MAYLENE, Battleground_SetResultTrue Return -_126F: - GoToIfSet FLAG_UNK_0x0AC5, _12E4 +Battleground_CheckDefeatedFantina: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_FANTINA, Battleground_SetResultTrue Return -_127C: - GoToIfSet FLAG_UNK_0x0AC6, _12E4 +Battleground_CheckDefeatedCandice: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_CANDICE, Battleground_SetResultTrue Return -_1289: - GoToIfSet FLAG_UNK_0x0AC7, _12E4 +Battleground_CheckDefeatedByron: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_BYRON, Battleground_SetResultTrue Return -_1296: - GoToIfSet FLAG_UNK_0x0AC8, _12E4 +Battleground_CheckDefeatedVolkner: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_VOLKNER, Battleground_SetResultTrue Return -_12A3: - GoToIfSet FLAG_UNK_0x0AC9, _12E4 +Battleground_CheckDefeatedCheryl: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_CHERYL, Battleground_SetResultTrue Return -_12B0: - GoToIfSet FLAG_UNK_0x0ACA, _12E4 +Battleground_CheckDefeatedRiley: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_RILEY, Battleground_SetResultTrue Return -_12BD: - GoToIfSet FLAG_UNK_0x0ACB, _12E4 +Battleground_CheckDefeatedMarley: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_MARLEY, Battleground_SetResultTrue Return -_12CA: - GoToIfSet FLAG_UNK_0x0ACC, _12E4 +Battleground_CheckDefeatedBuck: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_BUCK, Battleground_SetResultTrue Return -_12D7: - GoToIfSet FLAG_UNK_0x0ACD, _12E4 +Battleground_CheckDefeatedMira: + GoToIfSet FLAG_DEFEATED_BATTLEGROUND_MIRA, Battleground_SetResultTrue Return -_12E4: - SetVar VAR_RESULT, 1 +Battleground_SetResultTrue: + SetVar VAR_RESULT, TRUE Return diff --git a/res/field/scripts/scripts_init_battleground.s b/res/field/scripts/scripts_init_battleground.s index c3a269ffea..19ee39963b 100644 --- a/res/field/scripts/scripts_init_battleground.s +++ b/res/field/scripts/scripts_init_battleground.s @@ -6,7 +6,7 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x40C1, 0, 3 + InitScriptGoToIfEqual VAR_BATTLEGROUND_STATE, 0, 3 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index 919070afdc..c3b5d3b444 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -82,7 +82,7 @@ _0006: SetFlag FLAG_UNK_0x01E9 SetFlag FLAG_UNK_0x0276 SetFlag FLAG_UNK_0x0277 - SetFlag FLAG_UNK_0x01D6 + SetFlag FLAG_HIDE_BATTLEGROUND_BUCK SetFlag FLAG_HIDE_SURVIVAL_AREA_BUCK SetFlag FLAG_HIDE_SURVIVAL_AREA_RIVAL SetFlag FLAG_UNK_0x0231 diff --git a/res/field/scripts/scripts_stark_mountain_room_3.s b/res/field/scripts/scripts_stark_mountain_room_3.s index 5c1c93a8ae..0e1e7dd000 100644 --- a/res/field/scripts/scripts_stark_mountain_room_3.s +++ b/res/field/scripts/scripts_stark_mountain_room_3.s @@ -229,7 +229,7 @@ _019C: SetFlag FLAG_ARRESTED_CHARON_STARK_MOUNTAIN ClearFlag FLAG_HIDE_GAME_CORNER_LOOKER ClearFlag FLAG_HIDE_SURVIVAL_AREA_RIVAL - ClearFlag FLAG_UNK_0x01D6 + ClearFlag FLAG_HIDE_BATTLEGROUND_BUCK ClearFlag FLAG_HIDE_SURVIVAL_AREA_BUCK ClearFlag FLAG_UNK_0x022D ClearFlag FLAG_UNK_0x022E diff --git a/res/field/scripts/scripts_survival_area_pokecenter_1f.s b/res/field/scripts/scripts_survival_area_pokecenter_1f.s index 25f1022686..5b99243a8e 100644 --- a/res/field/scripts/scripts_survival_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_survival_area_pokecenter_1f.s @@ -17,7 +17,7 @@ SurvivalAreaPokecenter1F_AceTrainerM: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00C8, SurvivalAreaPokecenter1F_ChallengeWithoutOwnPokemon + GoToIfSet FLAG_VISITED_BATTLEGROUND, SurvivalAreaPokecenter1F_ChallengeWithoutOwnPokemon Message SurvivalAreaPokecenter1F_Text_BuildingNextDoor WaitButton CloseMessage diff --git a/res/text/battleground.json b/res/text/battleground.json index e9fce04006..68267f00c1 100644 --- a/res/text/battleground.json +++ b/res/text/battleground.json @@ -2,7 +2,7 @@ "key": 21510, "messages": [ { - "id": "pl_msg_00000593_00000", + "id": "Battleground_Text_WelcomeToBattleground", "en_US": [ "Oh? So, you are?!\n", "You’re Buck’s friend, yes!\r", @@ -19,7 +19,7 @@ ] }, { - "id": "pl_msg_00000593_00001", + "id": "Battleground_Text_TalkAboutStarkMountain", "en_US": [ "What should we talk about today?\n", "...Ah, I know.\r", @@ -36,22 +36,22 @@ ] }, { - "id": "pl_msg_00000593_00002", + "id": "Battleground_Text_MakeYourselfAtHome", "en_US": [ "Welcome to the Battleground!\n", "Make yourself at home like always." ] }, { - "id": "pl_msg_00000593_00003", + "id": "Battleground_Text_Dummy3", "garbage": 108 }, { - "id": "pl_msg_00000593_00004", + "id": "Battleground_Text_Dummy4", "garbage": 98 }, { - "id": "pl_msg_00000593_00005", + "id": "Battleground_Text_OpenToToughestTrainers", "en_US": [ "Buck: My place is open only to the\n", "toughest Trainers--I’m serious.\r", @@ -63,31 +63,31 @@ ] }, { - "id": "pl_msg_00000593_00006", + "id": "Battleground_Text_Dummy6", "garbage": 127 }, { - "id": "pl_msg_00000593_00007", + "id": "Battleground_Text_Dummy7", "garbage": 14 }, { - "id": "pl_msg_00000593_00008", + "id": "Battleground_Text_Dummy8", "garbage": 14 }, { - "id": "pl_msg_00000593_00009", + "id": "Battleground_Text_Dummy9", "garbage": 14 }, { - "id": "pl_msg_00000593_00010", + "id": "Battleground_Text_Dummy10", "garbage": 14 }, { - "id": "pl_msg_00000593_00011", + "id": "Battleground_Text_Dummy11", "garbage": 14 }, { - "id": "pl_msg_00000593_00012", + "id": "Battleground_Text_RoarkAskBattle", "en_US": [ "Roark: I went down to the Underground\n", "every day.\r", @@ -98,14 +98,14 @@ ] }, { - "id": "pl_msg_00000593_00013", + "id": "Battleground_Text_RoarkIntro", "en_US": [ "Roark: Here goes! These are my rocking\n", "Pokémon, my pride and joy!\r" ] }, { - "id": "pl_msg_00000593_00014", + "id": "Battleground_Text_RoarkDeclinedBattle", "en_US": [ "Roark: This is another topic, but you\n", "know those Spheres you can dig up?\r", @@ -118,7 +118,7 @@ ] }, { - "id": "pl_msg_00000593_00015", + "id": "Battleground_Text_RoarkAskBattleAgain", "en_US": [ "Roark: Look, can I have some time?\r", "I feel lucky to have run into you here,\n", @@ -126,7 +126,7 @@ ] }, { - "id": "pl_msg_00000593_00016", + "id": "Battleground_Text_RoarkDefeat", "en_US": [ "Roark: ...We lost control there.\r", "Next time, I’d like to challenge you to\n", @@ -134,7 +134,7 @@ ] }, { - "id": "pl_msg_00000593_00017", + "id": "Battleground_Text_RoarkAskBattle2", "en_US": [ "Roark: Would you like to battle?\r", "You’ll get to see a different me than\n", @@ -142,7 +142,7 @@ ] }, { - "id": "pl_msg_00000593_00018", + "id": "Battleground_Text_RoarkIntro2", "en_US": [ "Roark: I’ve got a TYRANITAR I’m going\n", "to send out.\r", @@ -151,18 +151,18 @@ ] }, { - "id": "pl_msg_00000593_00019", + "id": "Battleground_Text_RoarkDeclinedBattle2", "en_US": [ "Roark: Hmm...\n", "That’s a heartbreaking answer." ] }, { - "id": "pl_msg_00000593_00020", + "id": "Battleground_Text_RoarkAskBattleAgain2", "en_US": "Roark: Oh, you do want to battle?" }, { - "id": "pl_msg_00000593_00021", + "id": "Battleground_Text_RoarkDefeat2", "en_US": [ "Roark: Pokémon from ancient\n", "times...\r", @@ -173,7 +173,7 @@ ] }, { - "id": "pl_msg_00000593_00022", + "id": "Battleground_Text_RoarkDefeatByronPresent", "en_US": [ "Roark: When I became a Gym Leader,\n", "I finally realized how great my dad is.\r", @@ -182,7 +182,7 @@ ] }, { - "id": "pl_msg_00000593_00023", + "id": "Battleground_Text_GardeniaAskBattle", "en_US": [ "Gardenia: Hi, have you been keeping\n", "well?\r", @@ -191,7 +191,7 @@ ] }, { - "id": "pl_msg_00000593_00024", + "id": "Battleground_Text_GardeniaIntro", "en_US": [ "Gardenia: Yes, that’s right!\r", "A battle will tell you if someone you\n", @@ -199,7 +199,7 @@ ] }, { - "id": "pl_msg_00000593_00025", + "id": "Battleground_Text_GardeniaDeclinedBattle", "en_US": [ "Gardenia: You won’t battle?\n", "You’re not in the mood, huh?\r", @@ -208,14 +208,14 @@ ] }, { - "id": "pl_msg_00000593_00026", + "id": "Battleground_Text_GardeniaAskBattleAgain", "en_US": [ "Gardenia: Oh?\n", "You do want a battle?" ] }, { - "id": "pl_msg_00000593_00027", + "id": "Battleground_Text_GardeniaDefeat", "en_US": [ "Gardenia: Out of the Gym, a Gym Leader\n", "is just another Trainer.\r", @@ -226,7 +226,7 @@ ] }, { - "id": "pl_msg_00000593_00028", + "id": "Battleground_Text_GardeniaAskBattle2", "en_US": [ "Gardenia: My Grass-type Pokémon are\n", "growing good and strong.\r", @@ -237,7 +237,7 @@ ] }, { - "id": "pl_msg_00000593_00029", + "id": "Battleground_Text_GardeniaIntro2", "en_US": [ "Gardenia: I can’t deny that Grass-type\n", "Pokémon have many weak points.\r", @@ -246,7 +246,7 @@ ] }, { - "id": "pl_msg_00000593_00030", + "id": "Battleground_Text_GardeniaDeclinedBattle2", "en_US": [ "Gardenia: Aww, really?\r", "My grass Pokémon are growing good\n", @@ -254,7 +254,7 @@ ] }, { - "id": "pl_msg_00000593_00031", + "id": "Battleground_Text_GardeniaAskBattleAgain2", "en_US": [ "Gardenia: My Grass-type Pokémon are\n", "growing good and strong.\r", @@ -263,7 +263,7 @@ ] }, { - "id": "pl_msg_00000593_00032", + "id": "Battleground_Text_GardeniaDefeat2", "en_US": [ "Gardenia: By the way...\n", "Have you been to the Old Chateau?\r", @@ -276,7 +276,7 @@ ] }, { - "id": "pl_msg_00000593_00033", + "id": "Battleground_Text_FantinaAskBattle", "en_US": [ "Fantina: Finally, you have arrived!\r", "So, you shall challenge me.\n", @@ -286,11 +286,11 @@ ] }, { - "id": "pl_msg_00000593_00034", + "id": "Battleground_Text_FantinaIntro", "en_US": "{SIZE 200}Ohohoho!!{SIZE 100}\r" }, { - "id": "pl_msg_00000593_00035", + "id": "Battleground_Text_FantinaDeclinedBattle", "en_US": [ "Fantina: You... You disappoint me.\n", "It is very sad.\r", @@ -299,7 +299,7 @@ ] }, { - "id": "pl_msg_00000593_00036", + "id": "Battleground_Text_FantinaAskBattleAgain", "en_US": [ "Fantina: This time, you shall challenge\n", "me, yes?\r", @@ -309,7 +309,7 @@ ] }, { - "id": "pl_msg_00000593_00037", + "id": "Battleground_Text_FantinaDefeat", "en_US": [ "Fantina: You are an amazing person!\n", "Très fantastique!\r", @@ -320,7 +320,7 @@ ] }, { - "id": "pl_msg_00000593_00038", + "id": "Battleground_Text_FantinaAskBattle2", "en_US": [ "Fantina: Oh? It is you?\n", "Are you not taking part in Contests?\r", @@ -329,7 +329,7 @@ ] }, { - "id": "pl_msg_00000593_00039", + "id": "Battleground_Text_FantinaIntro2", "en_US": [ "Fantina: Pokémon battles, they are fun,\n", "always without fail.\r", @@ -338,7 +338,7 @@ ] }, { - "id": "pl_msg_00000593_00040", + "id": "Battleground_Text_FantinaDeclinedBattle2", "en_US": [ "Fantina: No?\n", "Well, that is OK, also.\r", @@ -347,21 +347,21 @@ ] }, { - "id": "pl_msg_00000593_00041", + "id": "Battleground_Text_FantinaAskBattleAgain2", "en_US": [ "Fantina: Yes, what is it?\n", "I accept your challenge if you give it!" ] }, { - "id": "pl_msg_00000593_00042", + "id": "Battleground_Text_FantinaDefeat2", "en_US": [ "Fantina: I wish to battle as if I were\n", "dancing." ] }, { - "id": "pl_msg_00000593_00043", + "id": "Battleground_Text_MayleneAskBattle", "en_US": [ "Maylene: I think it’s OK if I were to\n", "keep losing to the same Trainer.\r", @@ -372,7 +372,7 @@ ] }, { - "id": "pl_msg_00000593_00044", + "id": "Battleground_Text_MayleneIntro", "en_US": [ "Maylene: OK! Rei!\n", "Oh, that’s my bow before a match.\r", @@ -381,7 +381,7 @@ ] }, { - "id": "pl_msg_00000593_00045", + "id": "Battleground_Text_MayleneDeclinedBattle", "en_US": [ "Maylene: Sigh...\r", "I braced myself for a battle.\n", @@ -389,14 +389,14 @@ ] }, { - "id": "pl_msg_00000593_00046", + "id": "Battleground_Text_MayleneAskBattleAgain", "en_US": [ "Maylene: Yes, what is it, {STRVAR_1 3, 0, 0}?\n", "Would you maybe like a battle?" ] }, { - "id": "pl_msg_00000593_00047", + "id": "Battleground_Text_MayleneDefeat", "en_US": [ "Maylene: I love visiting here.\r", "Buck’s grandpa cooks for us, and it’s\n", @@ -406,7 +406,7 @@ ] }, { - "id": "pl_msg_00000593_00048", + "id": "Battleground_Text_MayleneAskBattle2", "en_US": [ "Maylene: Being together with Pokémon\n", "gave me the strength to keep going.\r", @@ -415,14 +415,14 @@ ] }, { - "id": "pl_msg_00000593_00049", + "id": "Battleground_Text_MayleneIntro2", "en_US": [ "Maylene: OK, here we come,\n", "{STRVAR_1 3, 0, 0}!\r" ] }, { - "id": "pl_msg_00000593_00050", + "id": "Battleground_Text_MayleneDeclinedBattle2", "en_US": [ "Maylene: OK! Got it!\r", "We’ll train much harder so we can\n", @@ -430,7 +430,7 @@ ] }, { - "id": "pl_msg_00000593_00051", + "id": "Battleground_Text_MayleneAskBattleAgain2", "en_US": [ "Maylene: {STRVAR_1 3, 0, 0}!\n", "I know I’m being a pest, but please,\f", @@ -438,7 +438,7 @@ ] }, { - "id": "pl_msg_00000593_00052", + "id": "Battleground_Text_MayleneDefeat2", "en_US": [ "Maylene: Hello, {STRVAR_1 3, 0, 0}!\r", "I’ve heard that it’s more healthy to\n", @@ -448,7 +448,7 @@ ] }, { - "id": "pl_msg_00000593_00053", + "id": "Battleground_Text_WakeAskBattle", "en_US": [ "Wake: What’s there to do for Trainers\n", "here?\r", @@ -457,7 +457,7 @@ ] }, { - "id": "pl_msg_00000593_00054", + "id": "Battleground_Text_WakeIntro", "en_US": [ "Wake: My Pokémon have new Water-type\n", "moves under their belts!\r", @@ -465,7 +465,7 @@ ] }, { - "id": "pl_msg_00000593_00055", + "id": "Battleground_Text_WakeDeclinedBattle", "en_US": [ "Wake: Then, you get my song instead!\n", "Er-hem!\r", @@ -482,7 +482,7 @@ ] }, { - "id": "pl_msg_00000593_00056", + "id": "Battleground_Text_WakeAskBattleAgain", "en_US": [ "Wake: Words aren’t needed.\r", "We understand each other through\n", @@ -491,7 +491,7 @@ ] }, { - "id": "pl_msg_00000593_00057", + "id": "Battleground_Text_WakeDefeat", "en_US": [ "Wake: Battles that end with both sides\n", "enjoying the experience without caring\f", @@ -503,7 +503,7 @@ ] }, { - "id": "pl_msg_00000593_00058", + "id": "Battleground_Text_WakeAskBattle2", "en_US": [ "Wake: All right!\n", "How’s it going?\r", @@ -516,14 +516,14 @@ ] }, { - "id": "pl_msg_00000593_00059", + "id": "Battleground_Text_WakeIntro2", "en_US": [ "Wake: That’s the spirit!\n", "Bring it on!\r" ] }, { - "id": "pl_msg_00000593_00060", + "id": "Battleground_Text_WakeDeclinedBattle2", "en_US": [ "Wake: Whoops!\r", "You’re giving me the slip?\n", @@ -531,14 +531,14 @@ ] }, { - "id": "pl_msg_00000593_00061", + "id": "Battleground_Text_WakeAskBattleAgain2", "en_US": [ "Wake: So, what’s the story?\n", "Are we gonna battle?" ] }, { - "id": "pl_msg_00000593_00062", + "id": "Battleground_Text_WakeDefeat2", "en_US": [ "Wake: For all the training I do, there\n", "are still plenty tougher than me.\r", @@ -551,7 +551,7 @@ ] }, { - "id": "pl_msg_00000593_00063", + "id": "Battleground_Text_ByronAskBattle", "en_US": [ "Byron: I’ve faced many a challenger at\n", "my Gym.\r", @@ -563,7 +563,7 @@ ] }, { - "id": "pl_msg_00000593_00064", + "id": "Battleground_Text_ByronIntro", "en_US": [ "Byron: We are tempered and honed by\n", "battling the strong.\r", @@ -571,14 +571,14 @@ ] }, { - "id": "pl_msg_00000593_00065", + "id": "Battleground_Text_ByronDeclinedBattle", "en_US": [ "Byron: When you came to the Gym, you\n", "had a glint that’s dulled now." ] }, { - "id": "pl_msg_00000593_00066", + "id": "Battleground_Text_ByronAskBattleAgain", "en_US": [ "Byron: I have the confidence now to\n", "batter down your defenses.\r", @@ -586,7 +586,7 @@ ] }, { - "id": "pl_msg_00000593_00067", + "id": "Battleground_Text_ByronDefeat", "en_US": [ "Byron: I trained by pummeling steel\n", "continuously on Iron Island alongside\f", @@ -596,7 +596,7 @@ ] }, { - "id": "pl_msg_00000593_00068", + "id": "Battleground_Text_ByronAskBattle2", "en_US": [ "Byron: Since we last lost to you, we’ve\n", "been in training.\r", @@ -606,7 +606,7 @@ ] }, { - "id": "pl_msg_00000593_00069", + "id": "Battleground_Text_ByronIntro2", "en_US": [ "Byron: Thank you!\r", "Like me, my Pokémon were longing for\n", @@ -614,7 +614,7 @@ ] }, { - "id": "pl_msg_00000593_00070", + "id": "Battleground_Text_ByronDeclinedBattle2", "en_US": [ "Byron: Gwahahaha!\n", "That’s disappointing, but all right!\r", @@ -623,14 +623,14 @@ ] }, { - "id": "pl_msg_00000593_00071", + "id": "Battleground_Text_ByronAskBattleAgain2", "en_US": [ "Byron: Could I ask you for another\n", "rematch?" ] }, { - "id": "pl_msg_00000593_00072", + "id": "Battleground_Text_ByronDefeat2", "en_US": [ "Byron: Argh...\n", "Came up short again...\r", @@ -641,7 +641,7 @@ ] }, { - "id": "pl_msg_00000593_00073", + "id": "Battleground_Text_ByronDefeatRoarkPresent", "en_US": [ "Byron: ...That Roark thinks he can show\n", "up his old man?\r", @@ -651,7 +651,7 @@ ] }, { - "id": "pl_msg_00000593_00074", + "id": "Battleground_Text_CandiceAskBattle", "en_US": [ "Candice: Hiya!\n", "What’s up?\r", @@ -661,28 +661,28 @@ ] }, { - "id": "pl_msg_00000593_00075", + "id": "Battleground_Text_CandiceIntro", "en_US": [ "Candice: This time, Candice is going to\n", "push through on willpower!\r" ] }, { - "id": "pl_msg_00000593_00076", + "id": "Battleground_Text_CandiceDeclinedBattle", "en_US": [ "Candice: Oh...\n", "Did my willpower intimidate you?" ] }, { - "id": "pl_msg_00000593_00077", + "id": "Battleground_Text_CandiceAskBattleAgain", "en_US": [ "Candice: Listen, listen.\n", "You’ll battle Candice, won’t you?" ] }, { - "id": "pl_msg_00000593_00078", + "id": "Battleground_Text_CandiceDefeat", "en_US": [ "Candice: Oh, wow, your scarf is totally\n", "in fashion.\r", @@ -690,7 +690,7 @@ ] }, { - "id": "pl_msg_00000593_00079", + "id": "Battleground_Text_CandiceAskBattle2", "en_US": [ "Candice: Candice is on fire!\r", "I’m blazing hot!\r", @@ -699,7 +699,7 @@ ] }, { - "id": "pl_msg_00000593_00080", + "id": "Battleground_Text_CandiceIntro2", "en_US": [ "Candice: OK! I’ll show you how good\n", "Candice...\r", @@ -707,18 +707,18 @@ ] }, { - "id": "pl_msg_00000593_00081", + "id": "Battleground_Text_CandiceDeclinedBattle2", "en_US": "Candice: Awww!" }, { - "id": "pl_msg_00000593_00082", + "id": "Battleground_Text_CandiceAskBattleAgain2", "en_US": [ "Candice: You really want to battle\n", "with me, don’t you?" ] }, { - "id": "pl_msg_00000593_00083", + "id": "Battleground_Text_CandiceDefeat2", "en_US": [ "Candice: Awww!\n", "That’s it!\r", @@ -727,7 +727,7 @@ ] }, { - "id": "pl_msg_00000593_00084", + "id": "Battleground_Text_VolknerAskBattle", "en_US": [ "Volkner: Your Pokémon...\n", "I can feel their power!\r", @@ -737,7 +737,7 @@ ] }, { - "id": "pl_msg_00000593_00085", + "id": "Battleground_Text_VolknerIntro", "en_US": [ "Volkner: Yeah! It’s electric, this\n", "feeling of anticipation!\r", @@ -746,21 +746,21 @@ ] }, { - "id": "pl_msg_00000593_00086", + "id": "Battleground_Text_VolknerDeclinedBattle", "en_US": [ "Volkner: Aww, come on now.\n", "Don’t disappoint me..." ] }, { - "id": "pl_msg_00000593_00087", + "id": "Battleground_Text_VolknerAskBattleAgain", "en_US": [ "Volkner: Hm? What’s up?\n", "You do want to battle?" ] }, { - "id": "pl_msg_00000593_00088", + "id": "Battleground_Text_VolknerDefeat", "en_US": [ "Volkner: Winning makes me happy, and\n", "losing leaves me angry...\r", @@ -769,7 +769,7 @@ ] }, { - "id": "pl_msg_00000593_00089", + "id": "Battleground_Text_VolknerAskBattle2", "en_US": [ "Volkner: My ELECTIVIRE demands tough\n", "opponents.\r", @@ -778,21 +778,21 @@ ] }, { - "id": "pl_msg_00000593_00090", + "id": "Battleground_Text_VolknerIntro2", "en_US": [ "Volkner: You! And me!\n", "Let’s make some sparks fly!\r" ] }, { - "id": "pl_msg_00000593_00091", + "id": "Battleground_Text_VolknerDeclinedBattle2", "en_US": [ "Volkner: Well, yeah, an ELECTIVIRE is\n", "intimidating. I hear you..." ] }, { - "id": "pl_msg_00000593_00092", + "id": "Battleground_Text_VolknerAskBattleAgain2", "en_US": [ "Volkner: Hm? What’s up?\n", "You’re willing to face my ELECTIVIRE?\f", @@ -800,7 +800,7 @@ ] }, { - "id": "pl_msg_00000593_00093", + "id": "Battleground_Text_VolknerDefeat2", "en_US": [ "Volkner: Some Trainers have Pokémon\n", "they just have to have in their party.\r", @@ -808,35 +808,35 @@ ] }, { - "id": "pl_msg_00000593_00094", + "id": "Battleground_Text_CherylAskBattle", "en_US": [ "Cheryl: Oh, hello, {STRVAR_1 3, 0, 0}.\n", "You’re my opponent of the day?" ] }, { - "id": "pl_msg_00000593_00095", + "id": "Battleground_Text_CherylIntro", "en_US": [ "Cheryl: My Pokémon have been itching\n", "for a battle.\r" ] }, { - "id": "pl_msg_00000593_00096", + "id": "Battleground_Text_CherylDeclinedBattle", "en_US": [ "Cheryl: Oh, but my Pokémon were itching\n", "for a battle..." ] }, { - "id": "pl_msg_00000593_00097", + "id": "Battleground_Text_CherylAskBattleAgain", "en_US": [ "Cheryl: {STRVAR_1 3, 0, 0}, may I ask you for\n", "a battle?" ] }, { - "id": "pl_msg_00000593_00098", + "id": "Battleground_Text_CherylDefeat", "en_US": [ "Cheryl: Thank you, {STRVAR_1 3, 0, 0}!\r", "Thanks to you, my adorable Pokémon\n", @@ -844,7 +844,7 @@ ] }, { - "id": "pl_msg_00000593_00099", + "id": "Battleground_Text_CherylAskBattle2", "en_US": [ "Cheryl: It’s been a long time...\n", "Hasn’t it?\r", @@ -853,14 +853,14 @@ ] }, { - "id": "pl_msg_00000593_00100", + "id": "Battleground_Text_CherylIntro2", "en_US": [ "Cheryl: I should warn you, my Pokémon\n", "can be quite rambunctious.\r" ] }, { - "id": "pl_msg_00000593_00101", + "id": "Battleground_Text_CherylDeclinedBattle2", "en_US": [ "Cheryl: Giggle...\r", "Pokémon would get worn out if we\n", @@ -868,14 +868,14 @@ ] }, { - "id": "pl_msg_00000593_00102", + "id": "Battleground_Text_CherylAskBattleAgain2", "en_US": [ "Cheryl: ...Yes?\n", "Would you like to battle after all?" ] }, { - "id": "pl_msg_00000593_00103", + "id": "Battleground_Text_CherylDefeat2", "en_US": [ "Cheryl: Being a Trainer isn’t easy.\r", "The more you battle, the more you\n", @@ -885,14 +885,14 @@ ] }, { - "id": "pl_msg_00000593_00104", + "id": "Battleground_Text_MiraAskBattle", "en_US": [ "Mira: {STRVAR_1 3, 0, 0}!\n", "Please teach Mira about Pokémon!" ] }, { - "id": "pl_msg_00000593_00105", + "id": "Battleground_Text_MiraIntro", "en_US": [ "Mira: {STRVAR_1 3, 0, 0}!\r", "Mira will show you that Mira doesn’t get\n", @@ -900,21 +900,21 @@ ] }, { - "id": "pl_msg_00000593_00106", + "id": "Battleground_Text_MiraDeclinedBattle", "en_US": [ "Mira: Mira is a little sad...\n", "Mira’s Pokémon are stronger now." ] }, { - "id": "pl_msg_00000593_00107", + "id": "Battleground_Text_MiraAskBattleAgain", "en_US": [ "Mira: {STRVAR_1 3, 0, 0}, please?\n", "Please teach Mira about Pokémon!" ] }, { - "id": "pl_msg_00000593_00108", + "id": "Battleground_Text_MiraDefeat", "en_US": [ "Mira: {STRVAR_1 3, 0, 0}, please teach Mira\n", "about Pokémon again!\r", @@ -923,7 +923,7 @@ ] }, { - "id": "pl_msg_00000593_00109", + "id": "Battleground_Text_MiraAskBattle2", "en_US": [ "Mira: {STRVAR_1 3, 0, 0}!\n", "Mira is stronger now!\f", @@ -931,25 +931,25 @@ ] }, { - "id": "pl_msg_00000593_00110", + "id": "Battleground_Text_MiraIntro2", "en_US": [ "Mira: {STRVAR_1 3, 0, 0} will be shocked by\n", "Mira!\r" ] }, { - "id": "pl_msg_00000593_00111", + "id": "Battleground_Text_MiraDeclinedBattle2", "en_US": [ "Mira: Mira really did get stronger.\n", "Mira wanted {STRVAR_1 3, 0, 0} to see." ] }, { - "id": "pl_msg_00000593_00112", + "id": "Battleground_Text_MiraAskBattleAgain2", "en_US": "Mira: You will battle Mira?" }, { - "id": "pl_msg_00000593_00113", + "id": "Battleground_Text_MiraDefeat2", "en_US": [ "Mira: {STRVAR_1 3, 0, 0}, you are always with\n", "your Pokémon.\r", @@ -958,7 +958,7 @@ ] }, { - "id": "pl_msg_00000593_00114", + "id": "Battleground_Text_RileyAskBattle", "en_US": [ "Riley: You and I, we’re both Trainers.\r", "Let’s forego the small talk and proceed\n", @@ -967,25 +967,25 @@ ] }, { - "id": "pl_msg_00000593_00115", + "id": "Battleground_Text_RileyIntro", "en_US": "Riley: Battling is our way of greeting!\r" }, { - "id": "pl_msg_00000593_00116", + "id": "Battleground_Text_RileyDeclinedBattle", "en_US": [ "Riley: All right, then.\n", "So, what’ve you got to tell me?" ] }, { - "id": "pl_msg_00000593_00117", + "id": "Battleground_Text_RileyAskBattleAgain", "en_US": [ "Riley: See? It just doesn’t feel right\n", "if we don’t battle, does it?" ] }, { - "id": "pl_msg_00000593_00118", + "id": "Battleground_Text_RileyDefeat", "en_US": [ "Riley: Know your enemy.\r", "If you know your opponent’s Pokémon\n", @@ -995,7 +995,7 @@ ] }, { - "id": "pl_msg_00000593_00119", + "id": "Battleground_Text_RileyAskBattle2", "en_US": [ "Riley: Hi. Long time, no see.\r", "If it’s all right with you, I’d like to\n", @@ -1003,28 +1003,28 @@ ] }, { - "id": "pl_msg_00000593_00120", + "id": "Battleground_Text_RileyIntro2", "en_US": [ "Riley: We’re pulling out all the stops\n", "to put your Pokémon down.\r" ] }, { - "id": "pl_msg_00000593_00121", + "id": "Battleground_Text_RileyDeclinedBattle2", "en_US": [ "Riley: Oh, all right.\n", "Then we’ll wait till you’re ready." ] }, { - "id": "pl_msg_00000593_00122", + "id": "Battleground_Text_RileyAskBattleAgain2", "en_US": [ "Riley: That look you have...\n", "I take it you’re ready for our battle?" ] }, { - "id": "pl_msg_00000593_00123", + "id": "Battleground_Text_RileyDefeat2", "en_US": [ "Riley: If I weren’t on Iron Island\n", "then...\r", @@ -1035,35 +1035,35 @@ ] }, { - "id": "pl_msg_00000593_00124", + "id": "Battleground_Text_MarleyAskBattle", "en_US": [ "Marley: I...\n", "Is it OK to battle?" ] }, { - "id": "pl_msg_00000593_00125", + "id": "Battleground_Text_MarleyIntro", "en_US": [ "Marley: ...OK.\n", "I’ll do my best.\r" ] }, { - "id": "pl_msg_00000593_00126", + "id": "Battleground_Text_MarleyDeclinedBattle", "en_US": [ "Marley: ...Oh?\n", "...You can be that mean?" ] }, { - "id": "pl_msg_00000593_00127", + "id": "Battleground_Text_MarleyAskBattleAgain", "en_US": [ "Marley: ...So?\n", "Are we battling?" ] }, { - "id": "pl_msg_00000593_00128", + "id": "Battleground_Text_MarleyDefeat", "en_US": [ "Marley: ...You’re so strong.\n", "It makes me feel happy.\r", @@ -1072,35 +1072,35 @@ ] }, { - "id": "pl_msg_00000593_00129", + "id": "Battleground_Text_MarleyAskBattle2", "en_US": [ "Marley: ...Oh?\n", "A battle? With me?" ] }, { - "id": "pl_msg_00000593_00130", + "id": "Battleground_Text_MarleyIntro2", "en_US": [ "Marley: ...OK.\n", "I...won’t lose...!\r" ] }, { - "id": "pl_msg_00000593_00131", + "id": "Battleground_Text_MarleyDeclinedBattle2", "en_US": [ "Marley: ...Oh, you.\n", "I’m getting to dislike you a little." ] }, { - "id": "pl_msg_00000593_00132", + "id": "Battleground_Text_MarleyAskBattleAgain2", "en_US": [ "Marley: ...If you won’t battle, I might\n", "not come back..." ] }, { - "id": "pl_msg_00000593_00133", + "id": "Battleground_Text_MarleyDefeat2", "en_US": [ "Marley: ...I might like battling with\n", "you.\r", @@ -1109,21 +1109,21 @@ ] }, { - "id": "pl_msg_00000593_00134", + "id": "Battleground_Text_BuckAskBattle", "en_US": [ "Buck: Ehehehe! You’re here at last!\n", "Let’s not waste time! Let’s do this!" ] }, { - "id": "pl_msg_00000593_00135", + "id": "Battleground_Text_BuckIntro", "en_US": [ "Buck: ...I’m telling you right now.\n", "I’m seriously tough. Act surprised!\r" ] }, { - "id": "pl_msg_00000593_00136", + "id": "Battleground_Text_BuckDeclinedBattle", "en_US": [ "Buck: Huh, what?\n", "That takes the wind out of my sails.\r", @@ -1132,14 +1132,14 @@ ] }, { - "id": "pl_msg_00000593_00137", + "id": "Battleground_Text_BuckAskBattleAgain", "en_US": [ "Buck: What? What?!\n", "So we are going to battle?" ] }, { - "id": "pl_msg_00000593_00138", + "id": "Battleground_Text_BuckDefeat", "en_US": [ "Buck: Fweh! Too much!\r", "I guess I’ll better my team\n", @@ -1147,7 +1147,7 @@ ] }, { - "id": "pl_msg_00000593_00139", + "id": "Battleground_Text_BuckAskBattle2", "en_US": [ "Buck: One, there’s no shortcuts in\n", "the way of Pokémon!\r", @@ -1156,7 +1156,7 @@ ] }, { - "id": "pl_msg_00000593_00140", + "id": "Battleground_Text_BuckIntro2", "en_US": [ "Buck: I can feel my Pokémon shivering\n", "inside their Poké Balls!\r", @@ -1164,21 +1164,21 @@ ] }, { - "id": "pl_msg_00000593_00141", + "id": "Battleground_Text_BuckDeclinedBattle2", "en_US": [ "Buck: Hey! This place! It’s named\n", "the Battleground for a reason!" ] }, { - "id": "pl_msg_00000593_00142", + "id": "Battleground_Text_BuckAskBattleAgain2", "en_US": [ "Buck: So?\n", "Do you feel like battling now?" ] }, { - "id": "pl_msg_00000593_00143", + "id": "Battleground_Text_BuckDefeat2", "en_US": [ "Buck: Fweh! Too much!\r", "I guess I’ll better my team on\n", diff --git a/src/game_records.c b/src/game_records.c index fe317f6878..1fd78d748d 100644 --- a/src/game_records.c +++ b/src/game_records.c @@ -144,7 +144,7 @@ static u8 sUsesHighLimit[MAX_RECORDS] = { [RECORD_TIMES_DRESSED_UP_POKEMON] = FALSE, [RECORD_UNK_055] = FALSE, [RECORD_TIMES_STUCK_IN_DEEP_MUD] = FALSE, - [RECORD_UNK_057] = TRUE, + [RECORD_TIMES_BATTLED_AT_BATTLEGROUND] = TRUE, [RECORD_UNK_058] = TRUE, [RECORD_UNK_059] = TRUE, [RECORD_UNK_060] = TRUE, diff --git a/src/map_object.c b/src/map_object.c index 074808c71c..eba057cfe4 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -4,6 +4,7 @@ #include #include "generated/movement_types.h" +#include "generated/object_events_gfx.h" #include "struct_decls/struct_02061830_sub1_decl.h" #include "struct_defs/struct_020EDF0C.h" @@ -909,8 +910,8 @@ static void sub_02062628(MapObject *mapObj) static int MapObject_GetFieldSystemGraphicsID(FieldSystem *fieldSystem, int graphicsID) { - if (graphicsID >= 0x65 && graphicsID <= 0x74) { - graphicsID -= 0x65; + if (graphicsID >= OBJ_EVENT_GFX_VAR_0 && graphicsID <= OBJ_EVENT_GFX_VAR_F) { + graphicsID -= OBJ_EVENT_GFX_VAR_0; graphicsID = FieldSystem_GetGraphicsID(fieldSystem, graphicsID); } diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index e3d1fe3f4d..4ff4c6ec5a 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -803,7 +803,7 @@ BOOL ScrCmd_30F(ScriptContext *param0) } break; case 16: - if (GameRecords_GetRecordValue(v1, RECORD_UNK_057) < 50) { + if (GameRecords_GetRecordValue(v1, RECORD_TIMES_BATTLED_AT_BATTLEGROUND) < 50) { *v4 = 0; } break; diff --git a/src/scrcmd.c b/src/scrcmd.c index 51dfbaeb7e..94e2c266df 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -716,9 +716,9 @@ static BOOL ScrCmd_OpenFrontierRecordsApp(ScriptContext *ctx); BOOL ScrCmd_2E2(ScriptContext *ctx); BOOL ScrCmd_2E3(ScriptContext *ctx); BOOL ScrCmd_2E4(ScriptContext *ctx); -BOOL ScrCmd_2F4(ScriptContext *ctx); -static u8 sub_02046524(u16 param0, u16 param1, u16 param2, u16 param3); -static u8 sub_02046568(u16 param0, u16 param1, u16 param2, u16 param3); +BOOL ScrCmd_GetRandomBattlegroundTrainers(ScriptContext *ctx); +static u8 GetRandomBattlegroundGymLeaderID(u16 trainer1ID, u16 trainer2ID, u16 trainer3ID, u16 trainer4ID); +static u8 GetRandomBattlegroundStatTrainerID(u16 trainer1ID, u16 trainer2ID, u16 trainer3ID, u16 trainer4ID); static BOOL ScrCmd_2F6(ScriptContext *ctx); static BOOL ScrCmd_2F7(ScriptContext *ctx); static BOOL ScrCmd_2FB(ScriptContext *ctx); @@ -6746,112 +6746,112 @@ BOOL ScrCmd_2E4(ScriptContext *ctx) return FALSE; } -static const u16 Unk_020EAB96[] = { - 0x7E, - 0x7f, - 0x80, - 0x81, - 0x82, - 0x83, - 0x84, - 0x85 +static const u16 sBattlegroundGymLeaders[] = { + OBJ_EVENT_GFX_ROARK, + OBJ_EVENT_GFX_GARDENIA, + OBJ_EVENT_GFX_CRASHER_WAKE, + OBJ_EVENT_GFX_MAYLENE, + OBJ_EVENT_GFX_FANTINA, + OBJ_EVENT_GFX_CANDICE, + OBJ_EVENT_GFX_BYRON, + OBJ_EVENT_GFX_VOLKNER }; -static const u16 Unk_020EAB8C[] = { - 0x8D, - 0x8E, - 0x8f, - 0x90, - 0x91 +static const u16 sBattlegroundStatTrainers[] = { + OBJ_EVENT_GFX_CHERYL, + OBJ_EVENT_GFX_RILEY, + OBJ_EVENT_GFX_MARLEY, + OBJ_EVENT_GFX_BUCK, + OBJ_EVENT_GFX_MIRA }; -BOOL ScrCmd_2F4(ScriptContext *ctx) +BOOL ScrCmd_GetRandomBattlegroundTrainers(ScriptContext *ctx) { - u16 *v5 = ScriptContext_GetVarPointer(ctx); - u16 *v6 = ScriptContext_GetVarPointer(ctx); - u16 *v7 = ScriptContext_GetVarPointer(ctx); - u16 *v8 = ScriptContext_GetVarPointer(ctx); + u16 *destVar1 = ScriptContext_GetVarPointer(ctx); + u16 *destVar2 = ScriptContext_GetVarPointer(ctx); + u16 *destVar3 = ScriptContext_GetVarPointer(ctx); + u16 *destVar4 = ScriptContext_GetVarPointer(ctx); - *v5 = 0xfff; - *v6 = 0xfff; - *v7 = 0xfff; - *v8 = 0xfff; - u16 v0 = (LCRNG_Next() % (NELEMS(Unk_020EAB96))); - *v5 = Unk_020EAB96[v0]; + *destVar1 = BATTLEGROUND_TRAINER_NONE; + *destVar2 = BATTLEGROUND_TRAINER_NONE; + *destVar3 = BATTLEGROUND_TRAINER_NONE; + *destVar4 = BATTLEGROUND_TRAINER_NONE; + u16 trainer1ID = LCRNG_Next() % NELEMS(sBattlegroundGymLeaders); + *destVar1 = sBattlegroundGymLeaders[trainer1ID]; - u16 v1 = sub_02046524(v0, 0xfff, 0xfff, 0xfff); + u16 trainer2ID = GetRandomBattlegroundGymLeaderID(trainer1ID, BATTLEGROUND_TRAINER_NONE, BATTLEGROUND_TRAINER_NONE, BATTLEGROUND_TRAINER_NONE); - if (v1 != (NELEMS(Unk_020EAB96))) { - *v6 = Unk_020EAB96[v1]; + if (trainer2ID != NELEMS(sBattlegroundGymLeaders)) { + *destVar2 = sBattlegroundGymLeaders[trainer2ID]; } - u16 v2 = sub_02046524(v0, v1, 0xfff, 0xfff); + u16 trainer3ID = GetRandomBattlegroundGymLeaderID(trainer1ID, trainer2ID, BATTLEGROUND_TRAINER_NONE, BATTLEGROUND_TRAINER_NONE); - if (v2 != (NELEMS(Unk_020EAB96))) { - *v7 = Unk_020EAB96[v2]; + if (trainer3ID != NELEMS(sBattlegroundGymLeaders)) { + *destVar3 = sBattlegroundGymLeaders[trainer3ID]; } - u16 v3 = sub_02046568(0xfff, 0xfff, 0xfff, 0xfff); + u16 trainer4ID = GetRandomBattlegroundStatTrainerID(BATTLEGROUND_TRAINER_NONE, BATTLEGROUND_TRAINER_NONE, BATTLEGROUND_TRAINER_NONE, BATTLEGROUND_TRAINER_NONE); - if (v3 != (NELEMS(Unk_020EAB8C))) { - *v8 = Unk_020EAB8C[v3]; + if (trainer4ID != NELEMS(sBattlegroundStatTrainers)) { + *destVar4 = sBattlegroundStatTrainers[trainer4ID]; } return FALSE; } -static u8 sub_02046524(u16 param0, u16 param1, u16 param2, u16 param3) +static u8 GetRandomBattlegroundGymLeaderID(u16 trainer1ID, u16 trainer2ID, u16 trainer3ID, u16 trainer4ID) { - u16 v0; - u8 v1 = 0; + u16 random; + u8 tries = 0; while (TRUE) { - v0 = (LCRNG_Next() % ((NELEMS(Unk_020EAB96)) + 1)); + random = LCRNG_Next() % (NELEMS(sBattlegroundGymLeaders) + 1); - if (v0 == (NELEMS(Unk_020EAB96))) { + if (random == NELEMS(sBattlegroundGymLeaders)) { break; } - v1++; + tries++; - if (v1 >= 8) { - v0 = (NELEMS(Unk_020EAB96)); + if (tries >= 8) { + random = NELEMS(sBattlegroundGymLeaders); break; } - if ((v0 != param0) && (v0 != param1) && (v0 != param2) && (v0 != param3)) { + if (random != trainer1ID && random != trainer2ID && random != trainer3ID && random != trainer4ID) { break; } } - return v0; + return random; } -static u8 sub_02046568(u16 param0, u16 param1, u16 param2, u16 param3) +static u8 GetRandomBattlegroundStatTrainerID(u16 trainer1ID, u16 trainer2ID, u16 trainer3ID, u16 trainer4ID) { - u16 v0; - u8 v1 = 0; + u16 random; + u8 tries = 0; while (TRUE) { - v0 = (LCRNG_Next() % ((NELEMS(Unk_020EAB8C)) + 1)); + random = LCRNG_Next() % (NELEMS(sBattlegroundStatTrainers) + 1); - if (v0 == (NELEMS(Unk_020EAB8C))) { + if (random == NELEMS(sBattlegroundStatTrainers)) { break; } - v1++; + tries++; - if (v1 >= 8) { - v0 = (NELEMS(Unk_020EAB8C)); + if (tries >= 8) { + random = NELEMS(sBattlegroundStatTrainers); break; } - if ((v0 != param0) && (v0 != param1) && (v0 != param2) && (v0 != param3)) { + if (random != trainer1ID && random != trainer2ID && random != trainer3ID && random != trainer4ID) { break; } } - return v0; + return random; } static BOOL ScrCmd_2F6(ScriptContext *ctx)