summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-10-17 17:11:34 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-10-17 17:11:34 -0400
commit97dc0a6903d0b08e26d18cac5713e0fc38727fd1 (patch)
tree6cb86dd190a6885ea4464ec5c2fe4efec5ba1c55
parent0b708aeadec55bcc0e9916e5c56ad50714995b98 (diff)
Trainer dump pass 2; flag refactoring
Diffstat
-rw-r--r--data/maps/CinnabarIsland_Gym/scripts.inc4
-rw-r--r--data/maps/FuchsiaCity_Gym/scripts.inc4
-rw-r--r--data/maps/PalletTown/scripts.inc2
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/scripts.inc2
-rw-r--r--data/maps/PewterCity_Gym/scripts.inc4
-rw-r--r--data/maps/ViridianCity/scripts.inc6
-rw-r--r--include/constants/flags.h358
-rw-r--r--include/constants/trainers.h1041
-rw-r--r--src/help_system_812B1E0.c6
-rw-r--r--src/main_menu.c2
-rw-r--r--src/pokemon.c10
-rw-r--r--src/trainers.c1060
-rw-r--r--src/vs_seeker.c8
13 files changed, 1503 insertions, 1004 deletions
diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc
index 20c00f117..26af36303 100644
--- a/data/maps/CinnabarIsland_Gym/scripts.inc
+++ b/data/maps/CinnabarIsland_Gym/scripts.inc
@@ -68,7 +68,7 @@ EventScript_16DA06:: @ 816DA06
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B6
- setflag FLAG_UNK826
+ setflag FLAG_0x826
setrespawn SPAWN_CINNABAR_ISLAND
setvar VAR_0x4071, 1
clearflag FLAG_0x062
@@ -208,7 +208,7 @@ EventScript_16DBC0:: @ 816DBC0
CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA
lockall
- checkflag FLAG_UNK826
+ checkflag FLAG_0x826
goto_if_eq EventScript_16DBDE
msgbox gUnknown_8199C29
releaseall
diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc
index 6b57f6377..930ccd463 100644
--- a/data/maps/FuchsiaCity_Gym/scripts.inc
+++ b/data/maps/FuchsiaCity_Gym/scripts.inc
@@ -18,7 +18,7 @@ EventScript_16D580:: @ 816D580
special SetFlavorTextFlagFromSpecialVars
clearflag FLAG_0x09F
setflag FLAG_0x4B4
- setflag FLAG_UNK824
+ setflag FLAG_0x824
setvar VAR_0x8008, 5
call EventScript_1A6B18
goto EventScript_16D5A6
@@ -90,7 +90,7 @@ EventScript_16D69D:: @ 816D69D
FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7
lockall
- checkflag FLAG_UNK824
+ checkflag FLAG_0x824
goto_if_eq EventScript_16D6BB
msgbox gUnknown_8198B4B
releaseall
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index ed53b8518..61e8eaf2d 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -50,7 +50,7 @@ EventScript_1654D8:: @ 81654D8
addobject 3
applymovement 3, Movement_1655AF
waitmovement 0
- checkflag FLAG_SYS_RIBBON_GET
+ checkflag FLAG_0x89B
goto_if 0, EventScript_1655A1
msgbox gUnknown_817D8BF
setvar VAR_0x8004, 0
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 64bec30b1..cd6747720 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -974,7 +974,7 @@ EventScript_1699CE:: @ 81699CE
closemessage
compare_var_to_value VAR_0x8009, 60
goto_if 0, EventScript_1699F9
- checkflag FLAG_SYS_RIBBON_GET
+ checkflag FLAG_0x89B
goto_if 0, EventScript_1699F9
delay 30
msgbox gUnknown_818EDF5
diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc
index 5990bf1e3..74aed695d 100644
--- a/data/maps/PewterCity_Gym/scripts.inc
+++ b/data/maps/PewterCity_Gym/scripts.inc
@@ -17,7 +17,7 @@ EventScript_16A5C5:: @ 816A5C5
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B0
- setflag FLAG_UNK820
+ setflag FLAG_0x820
setvar VAR_0x406C, 1
setflag FLAG_0x02E
clearflag FLAG_0x092
@@ -82,7 +82,7 @@ EventScript_16A6A5:: @ 816A6A5
PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF
lockall
- checkflag FLAG_UNK820
+ checkflag FLAG_0x820
goto_if_eq EventScript_16A6C3
msgbox gUnknown_819146E
releaseall
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index 5434fa1fa..2830c8f98 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -37,11 +37,11 @@ EventScript_165931:: @ 8165931
goto_if 0, EventScript_1A77A9
checkflag FLAG_0x823
goto_if 0, EventScript_1A77A9
- checkflag FLAG_UNK824
+ checkflag FLAG_0x824
goto_if 0, EventScript_1A77A9
checkflag FLAG_0x825
goto_if 0, EventScript_1A77A9
- checkflag FLAG_UNK826
+ checkflag FLAG_0x826
goto_if 0, EventScript_1A77A9
setvar VAR_0x405A, 1
return
@@ -107,7 +107,7 @@ EventScript_1659EC:: @ 81659EC
ViridianCity_EventScript_1659F6:: @ 81659F6
lock
faceplayer
- checkflag FLAG_UNK820
+ checkflag FLAG_0x820
goto_if_eq EventScript_165A23
compare_var_to_value VAR_0x4051, 2
goto_if 4, EventScript_165A4A
diff --git a/include/constants/flags.h b/include/constants/flags.h
index a4b891aca..a278429c2 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1,11 +1,42 @@
#ifndef GUARD_CONSTANTS_FLAGS_H
#define GUARD_CONSTANTS_FLAGS_H
+#include "constants/trainers.h"
+
// Sys Flags Maybe
#define FLAG_SYS_SAFARI_MODE 0x800
#define FLAG_WHITE_FLUTE_ACTIVE 0x803
#define FLAG_BLACK_FLUTE_ACTIVE 0x804
+#define FLAG_0x807 0x807
+// TODO: These three are badge flags
+#define FLAG_0x820 0x820
+#define FLAG_0x821 0x821
+#define FLAG_0x822 0x822
+#define FLAG_0x823 0x823
+#define FLAG_0x824 0x824
+#define FLAG_0x825 0x825
+#define FLAG_0x826 0x826
+#define FLAG_0x827 0x827
+#define FLAG_0x828 0x828
+#define FLAG_0x829 0x829
+#define FLAG_0x82C 0x82C
+#define FLAG_0x82F 0x82F
+#define FLAG_0x830 0x830
+#define FLAG_SYS_NOT_SOMEONES_PC 0x834
+#define FLAG_0x83C 0x83C
+#define FLAG_0x83E 0x83E
+#define FLAG_0x841 0x841
+#define FLAG_0x843 0x843
+#define FLAG_0x844 0x844
+#define FLAG_0x845 0x845
+#define FLAG_0x846 0x846
+#define FLAG_0x847 0x847
+#define FLAG_0x848 0x848
+#define FLAG_0x849 0x849
+#define FLAG_0x84A 0x84A
+#define FLAG_0x84B 0x84B
+
// World Map Flags
#define FLAG_WORLD_MAP_PALLET_TOWN 0x890
#define FLAG_WORLD_MAP_VIRIDIAN_CITY 0x891
@@ -61,30 +92,6 @@
// Unknown
-#define FLAG_0x807 0x807
-#define FLAG_0x821 0x821
-#define FLAG_0x822 0x822
-#define FLAG_0x823 0x823
-#define FLAG_0x825 0x825
-#define FLAG_0x827 0x827
-#define FLAG_0x828 0x828
-#define FLAG_0x829 0x829
-#define FLAG_0x82C 0x82C
-#define FLAG_0x82F 0x82F
-#define FLAG_0x830 0x830
-#define FLAG_SYS_NOT_SOMEONES_PC 0x834
-#define FLAG_0x83C 0x83C
-#define FLAG_0x83E 0x83E
-#define FLAG_0x841 0x841
-#define FLAG_0x844 0x844
-#define FLAG_0x845 0x845
-#define FLAG_0x846 0x846
-#define FLAG_0x847 0x847
-#define FLAG_0x848 0x848
-#define FLAG_0x849 0x849
-#define FLAG_0x84A 0x84A
-#define FLAG_0x84B 0x84B
-
// Emerald Flags
@@ -1374,297 +1381,44 @@
#define FLAG_TRAINER_FLAG_START 0x500
-#define TRAINERS_FLAG_NO 0x356
-#define CODE_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860
-
-// TODO: These three are badge flags
-#define FLAG_UNK820 0x820
-#define FLAG_UNK824 0x824
-#define FLAG_UNK826 0x826
+#define TRAINER_FLAG(name) (FLAG_TRAINER_FLAG_START + TRAINER_##name)
-#define FLAG_UNK843 0x843
+#define TRAINERS_FLAG_NO ((NUM_TRAINERS) & 15 ? (NUM_TRAINERS) + 16 - ((NUM_TRAINERS) & 15) : NUM_TRAINERS)
+#define CODE_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x800
// SYSTEM FLAGS
// 0x860
-#define FLAG_SYS_POKEMON_GET (CODE_FLAGS + 0)
-#define FLAG_SYS_POKEDEX_GET (CODE_FLAGS + 1)
-#define FLAG_SYS_POKENAV_GET (CODE_FLAGS + 2)
-// third one appears unused
-#define FLAG_SYS_GAME_CLEAR (CODE_FLAGS + 4)
-#define FLAG_SYS_CHAT_USED (CODE_FLAGS + 5)
-#define FLAG_SYS_HIPSTER_MEET (CODE_FLAGS + 6)
-
-// badges
-#define FLAG_BADGE01_GET (CODE_FLAGS + 7)
-#define FLAG_BADGE02_GET (CODE_FLAGS + 8)
-#define FLAG_BADGE03_GET (CODE_FLAGS + 9)
-#define FLAG_BADGE04_GET (CODE_FLAGS + 0xA)
-#define FLAG_BADGE05_GET (CODE_FLAGS + 0xB)
-#define FLAG_BADGE06_GET (CODE_FLAGS + 0xC)
-#define FLAG_BADGE07_GET (CODE_FLAGS + 0xD)
-#define FLAG_BADGE08_GET (CODE_FLAGS + 0xE)
-
-// cities and towns
-#define FLAG_VISITED_LITTLEROOT_TOWN (CODE_FLAGS + 0xF)
-#define FLAG_VISITED_OLDALE_TOWN (CODE_FLAGS + 0x10)
-#define FLAG_VISITED_DEWFORD_TOWN (CODE_FLAGS + 0x11)
-#define FLAG_VISITED_LAVARIDGE_TOWN (CODE_FLAGS + 0x12)
-#define FLAG_VISITED_FALLARBOR_TOWN (CODE_FLAGS + 0x13)
-#define FLAG_VISITED_VERDANTURF_TOWN (CODE_FLAGS + 0x14)
-#define FLAG_VISITED_PACIFIDLOG_TOWN (CODE_FLAGS + 0x15)
-#define FLAG_VISITED_PETALBURG_CITY (CODE_FLAGS + 0x16)
-#define FLAG_VISITED_SLATEPORT_CITY (CODE_FLAGS + 0x17)
-#define FLAG_VISITED_MAUVILLE_CITY (CODE_FLAGS + 0x18)
-#define FLAG_VISITED_RUSTBORO_CITY (CODE_FLAGS + 0x19)
-#define FLAG_VISITED_FORTREE_CITY (CODE_FLAGS + 0x1A)
-#define FLAG_VISITED_LILYCOVE_CITY (CODE_FLAGS + 0x1B)
-#define FLAG_VISITED_MOSSDEEP_CITY (CODE_FLAGS + 0x1C)
-#define FLAG_VISITED_SOOTOPOLIS_CITY (CODE_FLAGS + 0x1D)
-#define FLAG_VISITED_EVER_GRANDE_CITY (CODE_FLAGS + 0x1E)
-
-#define FLAG_0x87F (CODE_FLAGS + 0x1F)
-#define FLAG_0x880 (CODE_FLAGS + 0x20)
-#define FLAG_0x881 (CODE_FLAGS + 0x21)
-#define FLAG_0x882 (CODE_FLAGS + 0x22)
-#define FLAG_0x883 (CODE_FLAGS + 0x23)
-#define FLAG_0x884 (CODE_FLAGS + 0x24)
-#define FLAG_0x885 (CODE_FLAGS + 0x25)
-#define FLAG_0x886 (CODE_FLAGS + 0x26)
-#define FLAG_0x887 (CODE_FLAGS + 0x27)
-
-#define FLAG_SYS_USE_FLASH (CODE_FLAGS + 0x28)
-#define FLAG_SYS_USE_STRENGTH (CODE_FLAGS + 0x29)
-#define FLAG_SYS_WEATHER_CTRL (CODE_FLAGS + 0x2A)
-#define FLAG_SYS_CYCLING_ROAD (CODE_FLAGS + 0x2B)
-#define FLAG_0x88C (CODE_FLAGS + 0x2C)
-#define FLAG_SYS_CRUISE_MODE (CODE_FLAGS + 0x2D)
-
-#define FLAG_0x88E (CODE_FLAGS + 0x2E)
-#define FLAG_0x88F (CODE_FLAGS + 0x2F)
-
-#define FLAG_SYS_TV_HOME (CODE_FLAGS + 0x30)
-#define FLAG_SYS_TV_WATCH (CODE_FLAGS + 0x31)
-#define FLAG_SYS_TV_START (CODE_FLAGS + 0x32)
-#define FLAG_SYS_POPWORD_INPUT (CODE_FLAGS + 0x33)
-#define FLAG_SYS_MIX_RECORD (CODE_FLAGS + 0x34)
-#define FLAG_SYS_CLOCK_SET (CODE_FLAGS + 0x35)
-#define FLAG_SYS_NATIONAL_DEX (CODE_FLAGS + 0x36)
-#define FLAG_SYS_CAVE_SHIP (CODE_FLAGS + 0x37)
-#define FLAG_SYS_CAVE_WONDER (CODE_FLAGS + 0x38)
-#define FLAG_SYS_CAVE_BATTLE (CODE_FLAGS + 0x39)
-#define FLAG_SYS_SHOAL_TIDE (CODE_FLAGS + 0x3A)
-#define FLAG_SYS_RIBBON_GET (CODE_FLAGS + 0x3B)
-
-#define FLAG_0x89C (CODE_FLAGS + 0x3C)
-#define FLAG_0x89D (CODE_FLAGS + 0x3D)
-#define FLAG_0x89E (CODE_FLAGS + 0x3E)
-#define FLAG_0x89F (CODE_FLAGS + 0x3F)
-#define FLAG_0x8A0 (CODE_FLAGS + 0x40)
-#define FLAG_0x8A1 (CODE_FLAGS + 0x41)
-#define FLAG_0x8A2 (CODE_FLAGS + 0x42)
-#define FLAG_0x8A3 (CODE_FLAGS + 0x43)
-#define FLAG_0x8A4 (CODE_FLAGS + 0x44)
-#define FLAG_0x8A5 (CODE_FLAGS + 0x45)
-#define FLAG_0x8A6 (CODE_FLAGS + 0x46)
-#define FLAG_0x8A7 (CODE_FLAGS + 0x47)
-#define FLAG_UNLOCK_BATTLE_FRONTIER (CODE_FLAGS + 0x48)
-#define FLAG_UNLOCK_SOUTHERN_ISLAND (CODE_FLAGS + 0x49)
-#define FLAG_0x8AA (CODE_FLAGS + 0x4A)
-
-#define FLAG_SYS_PC_LANETTE (CODE_FLAGS + 0x4B)
-#define FLAG_SYS_MYSTERY_EVENT_ENABLE (CODE_FLAGS + 0x4C)
-#define FLAG_SYS_ENC_UP_ITEM (CODE_FLAGS + 0x4D)
-#define FLAG_SYS_ENC_DOWN_ITEM (CODE_FLAGS + 0x4E)
-#define FLAG_SYS_BRAILLE_DIG (CODE_FLAGS + 0x4F)
-#define FLAG_SYS_BRAILLE_STRENGTH (CODE_FLAGS + 0x50)
-#define FLAG_SYS_BRAILLE_WAIT (CODE_FLAGS + 0x51)
-#define FLAG_SYS_BRAILLE_FLY (CODE_FLAGS + 0x52)
-#define FLAG_SYS_HAS_EON_TICKET (CODE_FLAGS + 0x53)
-
-#define FLAG_SYS_POKEMON_LEAGUE_FLY (CODE_FLAGS + 0x54)
-
-#define FLAG_0x8B5 (CODE_FLAGS + 0x55)
-#define FLAG_0x8B6 (CODE_FLAGS + 0x56)
-#define FLAG_0x8B7 (CODE_FLAGS + 0x57)
-#define FLAG_0x8B8 (CODE_FLAGS + 0x58)
-#define FLAG_0x8B9 (CODE_FLAGS + 0x59)
-#define FLAG_0x8BA (CODE_FLAGS + 0x5A)
-#define FLAG_0x8BB (CODE_FLAGS + 0x5B)
-#define FLAG_0x8BC (CODE_FLAGS + 0x5C)
-
-#define FLAG_SYS_TV_LATI (CODE_FLAGS + 0x5D)
-
-#define FLAG_0x8BE (CODE_FLAGS + 0x5E)
-#define FLAG_SYS_SHOAL_ITEM (CODE_FLAGS + 0x5F)
-#define FLAG_SYS_B_DASH (CODE_FLAGS + 0x60) // got Running Shoes
-#define FLAG_SYS_CTRL_OBJ_DELETE (CODE_FLAGS + 0x61)
-#define FLAG_SYS_RESET_RTC_ENABLE (CODE_FLAGS + 0x62)
+#define FLAG_0x87F 0x87F
+#define FLAG_0x880 0x880
+#define FLAG_0x881 0x881
+#define FLAG_0x882 0x882
+#define FLAG_0x883 0x883
+#define FLAG_0x884 0x884
+#define FLAG_0x885 0x885
+#define FLAG_0x886 0x886
+#define FLAG_0x887 0x887
-#define FLAG_0x8C3 (CODE_FLAGS + 0x63)
+#define FLAG_0x88C 0x88C
-#define FLAG_SYS_TOWER_SILVER (CODE_FLAGS + 0x64)
-#define FLAG_SYS_TOWER_GOLD (CODE_FLAGS + 0x65)
-#define FLAG_SYS_DOME_SILVER (CODE_FLAGS + 0x66)
-#define FLAG_SYS_DOME_GOLD (CODE_FLAGS + 0x67)
-#define FLAG_SYS_PALACE_SILVER (CODE_FLAGS + 0x68)
-#define FLAG_SYS_PALACE_GOLD (CODE_FLAGS + 0x69)
-#define FLAG_SYS_ARENA_SILVER (CODE_FLAGS + 0x6A)
-#define FLAG_SYS_ARENA_GOLD (CODE_FLAGS + 0x6B)
-#define FLAG_SYS_FACTORY_SILVER (CODE_FLAGS + 0x6C)
-#define FLAG_SYS_FACTORY_GOLD (CODE_FLAGS + 0x6D)
-#define FLAG_SYS_PIKE_SILVER (CODE_FLAGS + 0x6E)
-#define FLAG_SYS_PIKE_GOLD (CODE_FLAGS + 0x6F)
-#define FLAG_SYS_PYRAMID_SILVER (CODE_FLAGS + 0x70)
-#define FLAG_SYS_PYRAMID_GOLD (CODE_FLAGS + 0x71)
-#define FLAG_SYS_FRONTIER_PASS (CODE_FLAGS + 0x72)
+#define FLAG_0x88E 0x88E
+#define FLAG_0x88F 0x88F
-#define FLAG_0x8D3 (CODE_FLAGS + 0x73)
-#define FLAG_0x8D4 (CODE_FLAGS + 0x74)
-#define FLAG_0x8D5 (CODE_FLAGS + 0x75)
-#define FLAG_0x8D6 (CODE_FLAGS + 0x76)
+#define FLAG_0x896 0x896
+#define FLAG_0x897 0x897
+#define FLAG_0x89B 0x89B
-#define FLAG_SYS_STORAGE_UNKNOWN_FLAG (CODE_FLAGS + 0x77)
+#define FLAG_0x8A4 0x8A4
-#define FLAG_0x8D8 (CODE_FLAGS + 0x78)
-#define FLAG_0x8D9 (CODE_FLAGS + 0x79)
-#define FLAG_0x8DA (CODE_FLAGS + 0x7A)
+#define FLAG_0x8D5 0x8D5
+#define FLAG_0x8D6 0x8D6
-#define FLAG_SYS_MYSTERY_GIFT_ENABLE (CODE_FLAGS + 0x7B)
+#define FLAG_0x8D8 0x8D8
+#define FLAG_0x8D9 0x8D9
+#define FLAG_0x8DA 0x8DA
-#define FLAG_0x8DC (CODE_FLAGS + 0x7C)
-#define FLAG_0x8DD (CODE_FLAGS + 0x7D)
-#define FLAG_0x8DE (CODE_FLAGS + 0x7E)
-#define FLAG_0x8DF (CODE_FLAGS + 0x7F)
-#define FLAG_0x8E0 (CODE_FLAGS + 0x80)
-#define FLAG_0x8E1 (CODE_FLAGS + 0x81)
-#define FLAG_0x8E2 (CODE_FLAGS + 0x82)
-#define FLAG_0x8E3 (CODE_FLAGS + 0x83)
-#define FLAG_0x8E4 (CODE_FLAGS + 0x84)
-#define FLAG_0x8E5 (CODE_FLAGS + 0x85)
-#define FLAG_0x8E6 (CODE_FLAGS + 0x86)
-#define FLAG_0x8E7 (CODE_FLAGS + 0x87)
-#define FLAG_0x8E8 (CODE_FLAGS + 0x88)
-#define FLAG_0x8E9 (CODE_FLAGS + 0x89)
-#define FLAG_0x8EA (CODE_FLAGS + 0x8A)
-#define FLAG_0x8EB (CODE_FLAGS + 0x8B)
-#define FLAG_0x8EC (CODE_FLAGS + 0x8C)
-#define FLAG_0x8ED (CODE_FLAGS + 0x8D)
-#define FLAG_0x8EE (CODE_FLAGS + 0x8E)
-#define FLAG_0x8EF (CODE_FLAGS + 0x8F)
-#define FLAG_0x8F0 (CODE_FLAGS + 0x90)
-#define FLAG_0x8F1 (CODE_FLAGS + 0x91)
-#define FLAG_0x8F2 (CODE_FLAGS + 0x92)
-#define FLAG_0x8F3 (CODE_FLAGS + 0x93)
-#define FLAG_0x8F4 (CODE_FLAGS + 0x94)
-#define FLAG_0x8F5 (CODE_FLAGS + 0x95)
-#define FLAG_0x8F6 (CODE_FLAGS + 0x96)
-#define FLAG_0x8F7 (CODE_FLAGS + 0x97)
-#define FLAG_0x8F8 (CODE_FLAGS + 0x98)
-#define FLAG_0x8F9 (CODE_FLAGS + 0x99)
-#define FLAG_0x8FA (CODE_FLAGS + 0x9A)
-#define FLAG_0x8FB (CODE_FLAGS + 0x9B)
-#define FLAG_0x8FC (CODE_FLAGS + 0x9C)
-#define FLAG_0x8FD (CODE_FLAGS + 0x9D)
-#define FLAG_0x8FE (CODE_FLAGS + 0x9E)
-#define FLAG_0x8FF (CODE_FLAGS + 0x9F)
-#define FLAG_0x900 (CODE_FLAGS + 0xA0)
-#define FLAG_0x901 (CODE_FLAGS + 0xA1)
-#define FLAG_0x902 (CODE_FLAGS + 0xA2)
-#define FLAG_0x903 (CODE_FLAGS + 0xA3)
-#define FLAG_0x904 (CODE_FLAGS + 0xA4)
-#define FLAG_0x905 (CODE_FLAGS + 0xA5)
-#define FLAG_0x906 (CODE_FLAGS + 0xA6)
-#define FLAG_0x907 (CODE_FLAGS + 0xA7)
-#define FLAG_0x908 (CODE_FLAGS + 0xA8)
-#define FLAG_0x909 (CODE_FLAGS + 0xA9)
-#define FLAG_0x90A (CODE_FLAGS + 0xAA)
-#define FLAG_0x90B (CODE_FLAGS + 0xAB)
-#define FLAG_0x90C (CODE_FLAGS + 0xAC)
-#define FLAG_0x90D (CODE_FLAGS + 0xAD)
-#define FLAG_0x90E (CODE_FLAGS + 0xAE)
-#define FLAG_0x90F (CODE_FLAGS + 0xAF)
-#define FLAG_0x910 (CODE_FLAGS + 0xB0)
-#define FLAG_0x911 (CODE_FLAGS + 0xB1)
-#define FLAG_0x912 (CODE_FLAGS + 0xB2)
-#define FLAG_0x913 (CODE_FLAGS + 0xB3)
-#define FLAG_0x914 (CODE_FLAGS + 0xB4)
-#define FLAG_0x915 (CODE_FLAGS + 0xB5)
-#define FLAG_0x916 (CODE_FLAGS + 0xB6)
-#define FLAG_0x917 (CODE_FLAGS + 0xB7)
-#define FLAG_0x918 (CODE_FLAGS + 0xB8)
-#define FLAG_0x919 (CODE_FLAGS + 0xB9)
-#define FLAG_0x91A (CODE_FLAGS + 0xBA)
-#define FLAG_0x91B (CODE_FLAGS + 0xBB)
-#define FLAG_0x91C (CODE_FLAGS + 0xBC)
-#define FLAG_0x91D (CODE_FLAGS + 0xBD)
-#define FLAG_0x91E (CODE_FLAGS + 0xBE)
-#define FLAG_0x91F (CODE_FLAGS + 0xBF)
-#define FLAG_0x920 (CODE_FLAGS + 0xC0)
-#define FLAG_0x921 (CODE_FLAGS + 0xC1)
-#define FLAG_0x922 (CODE_FLAGS + 0xC2)
-#define FLAG_0x923 (CODE_FLAGS + 0xC3)
-#define FLAG_0x924 (CODE_FLAGS + 0xC4)
-#define FLAG_0x925 (CODE_FLAGS + 0xC5)
-#define FLAG_0x926 (CODE_FLAGS + 0xC6)
-#define FLAG_0x927 (CODE_FLAGS + 0xC7)
-#define FLAG_0x928 (CODE_FLAGS + 0xC8)
-#define FLAG_0x929 (CODE_FLAGS + 0xC9)
-#define FLAG_0x92A (CODE_FLAGS + 0xCA)
-#define FLAG_0x92B (CODE_FLAGS + 0xCB)
-#define FLAG_0x92C (CODE_FLAGS + 0xCC)
-#define FLAG_0x92D (CODE_FLAGS + 0xCD)
-#define FLAG_0x92E (CODE_FLAGS + 0xCE)
-#define FLAG_0x92F (CODE_FLAGS + 0xCF)
-#define FLAG_0x930 (CODE_FLAGS + 0xD0)
-#define FLAG_0x931 (CODE_FLAGS + 0xD1)
-#define FLAG_0x932 (CODE_FLAGS + 0xD2)
-#define FLAG_0x933 (CODE_FLAGS + 0xD3)
-#define FLAG_0x934 (CODE_FLAGS + 0xD4)
-#define FLAG_0x935 (CODE_FLAGS + 0xD5)
-#define FLAG_0x936 (CODE_FLAGS + 0xD6)
-#define FLAG_0x937 (CODE_FLAGS + 0xD7)
-#define FLAG_0x938 (CODE_FLAGS + 0xD8)
-#define FLAG_0x939 (CODE_FLAGS + 0xD9)
-#define FLAG_0x93A (CODE_FLAGS + 0xDA)
-#define FLAG_0x93B (CODE_FLAGS + 0xDB)
-#define FLAG_0x93C (CODE_FLAGS + 0xDC)
-#define FLAG_0x93D (CODE_FLAGS + 0xDD)
-#define FLAG_0x93E (CODE_FLAGS + 0xDE)
-#define FLAG_0x93F (CODE_FLAGS + 0xDF)
-#define FLAG_0x940 (CODE_FLAGS + 0xE0)
-#define FLAG_0x941 (CODE_FLAGS + 0xE1)
-#define FLAG_0x942 (CODE_FLAGS + 0xE2)
-#define FLAG_0x943 (CODE_FLAGS + 0xE3)
-#define FLAG_0x944 (CODE_FLAGS + 0xE4)
-#define FLAG_0x945 (CODE_FLAGS + 0xE5)
-#define FLAG_0x946 (CODE_FLAGS + 0xE6)
-#define FLAG_0x947 (CODE_FLAGS + 0xE7)
-#define FLAG_0x948 (CODE_FLAGS + 0xE8)
-#define FLAG_0x949 (CODE_FLAGS + 0xE9)
-#define FLAG_0x94A (CODE_FLAGS + 0xEA)
-#define FLAG_0x94B (CODE_FLAGS + 0xEB)
-#define FLAG_0x94C (CODE_FLAGS + 0xEC)
-#define FLAG_0x94D (CODE_FLAGS + 0xED)
-#define FLAG_0x94E (CODE_FLAGS + 0xEE)
-#define FLAG_0x94F (CODE_FLAGS + 0xEF)
-#define FLAG_0x950 (CODE_FLAGS + 0xF0)
-#define FLAG_0x951 (CODE_FLAGS + 0xF1)
-#define FLAG_0x952 (CODE_FLAGS + 0xF2)
-#define FLAG_0x953 (CODE_FLAGS + 0xF3)
-#define FLAG_0x954 (CODE_FLAGS + 0xF4)
-#define FLAG_0x955 (CODE_FLAGS + 0xF5)
-#define FLAG_0x956 (CODE_FLAGS + 0xF6)
-#define FLAG_0x957 (CODE_FLAGS + 0xF7)
-#define FLAG_0x958 (CODE_FLAGS + 0xF8)
-#define FLAG_0x959 (CODE_FLAGS + 0xF9)
-#define FLAG_0x95A (CODE_FLAGS + 0xFA)
-#define FLAG_0x95B (CODE_FLAGS + 0xFB)
-#define FLAG_0x95C (CODE_FLAGS + 0xFC)
-#define FLAG_0x95D (CODE_FLAGS + 0xFD)
-#define FLAG_0x95E (CODE_FLAGS + 0xFE)
-#define FLAG_0x95F (CODE_FLAGS + 0xFF)
+#define FLAG_0x8E0 0x8E0
// SPECIAL FLAGS (unknown purpose)
#define FLAG_SPECIAL_FLAG_0x4000 0x4000
diff --git a/include/constants/trainers.h b/include/constants/trainers.h
index abc1a4f96..49cd94c1c 100644
--- a/include/constants/trainers.h
+++ b/include/constants/trainers.h
@@ -18,154 +18,899 @@
#define F_TRAINER_FEMALE (1 << 7)
-#define TRAINER_PIC_AQUA_LEADER 0
-#define TRAINER_PIC_TEAM_AQUA 1
-#define TRAINER_PIC_TEAM_AQUA_2 2
-#define TRAINER_PIC_AROMA_LADY 3
-#define TRAINER_PIC_RUIN_MANIAC 4
-#define TRAINER_PIC_INTERVIEWER 5
-#define TRAINER_PIC_TUBER 6
-#define TRAINER_PIC_TUBER_2 7
-#define TRAINER_PIC_COOLTRAINER 8
-#define TRAINER_PIC_COOLTRAINER_2 9
-#define TRAINER_PIC_HEX_MANIAC 10
-#define TRAINER_PIC_LADY 11
-#define TRAINER_PIC_BEAUTY 12
-#define TRAINER_PIC_RICH_BOY 13
-#define TRAINER_PIC_POKEMANIAC 14
-#define TRAINER_PIC_SWIMMER_MALE 15
-#define TRAINER_PIC_BLACK_BELT 16
-#define TRAINER_PIC_GUITARIST 17
-#define TRAINER_PIC_KINDLER 18
-#define TRAINER_PIC_CAMPER 19
-#define TRAINER_PIC_BUG_MANIAC 20
-#define TRAINER_PIC_PSYCHIC 21
-#define TRAINER_PIC_PSYCHIC_2 22
-#define TRAINER_PIC_GENTLEMAN 23
-#define TRAINER_PIC_SIDNEY 24
-#define TRAINER_PIC_PHOEBE 25
-#define TRAINER_PIC_ROXANNE 26
-#define TRAINER_PIC_BRAWLY 27
-#define TRAINER_PIC_TATE_LIZA 28
-#define TRAINER_PIC_SCHOOL_KID 29
-#define TRAINER_PIC_SCHOOL_KID_2 30
-#define TRAINER_PIC_SR_AND_JR 31
-#define TRAINER_PIC_POKEFAN 32
-#define TRAINER_PIC_POKEFAN_2 33
-#define TRAINER_PIC_EXPERT 34
-#define TRAINER_PIC_EXPERT_2 35
-#define TRAINER_PIC_BOARDER 36
-#define TRAINER_PIC_CHAMPION 37
-#define TRAINER_PIC_FISHERMAN 38
-#define TRAINER_PIC_TRIATHLETE 39
-#define TRAINER_PIC_TRIATHLETE_2 40
-#define TRAINER_PIC_TRIATHLETE_3 41
-#define TRAINER_PIC_TRIATHLETE_4 42
-#define TRAINER_PIC_TRIATHLETE_5 43
-#define TRAINER_PIC_TRIATHLETE_6 44
-#define TRAINER_PIC_DRAGON_TAMER 45
-#define TRAINER_PIC_BIRD_KEEPER 46
-#define TRAINER_PIC_NINJA_BOY 47
-#define TRAINER_PIC_BATTLE_GIRL 48
-#define TRAINER_PIC_PARASOL_LADY 49
-#define TRAINER_PIC_SWIMMER_FEMALE 50
-#define TRAINER_PIC_PICNICKER 51
-#define TRAINER_PIC_TWINS 52
-#define TRAINER_PIC_SAILOR 53
-#define TRAINER_PIC_COLLECTOR 54
-#define TRAINER_PIC_PKMN_TRAINER 55
-#define TRAINER_PIC_PKMN_TRAINER_2 56
-#define TRAINER_PIC_PKMN_TRAINER_3 57
-#define TRAINER_PIC_PKMN_BREEDER 58
-#define TRAINER_PIC_PKMN_BREEDER_2 59
-#define TRAINER_PIC_PKMN_RANGER 60
-#define TRAINER_PIC_PKMN_RANGER_2 61
-#define TRAINER_PIC_MAGMA_LEADER 62
-#define TRAINER_PIC_TEAM_MAGMA 63
-#define TRAINER_PIC_TEAM_MAGMA_2 64
-#define TRAINER_PIC_LASS 65
-#define TRAINER_PIC_BUG_CATCHER 66
-#define TRAINER_PIC_HIKER 67
-#define TRAINER_PIC_YOUNG_COUPLE 68
-#define TRAINER_PIC_OLD_COUPLE 69
-#define TRAINER_PIC_SIS_AND_BRO 70
-#define TRAINER_PIC_MATT 71
-#define TRAINER_PIC_SHELLY 72
-#define TRAINER_PIC_TABITHA 73
-#define TRAINER_PIC_COURTNEY 74
-#define TRAINER_PIC_WATTSON 75
-#define TRAINER_PIC_FLANNERY 76
-#define TRAINER_PIC_NORMAN 77
-#define TRAINER_PIC_WINONA 78
-#define TRAINER_PIC_WALLACE 79
-#define TRAINER_PIC_GLACIA 80
-#define TRAINER_PIC_DRAKE 81
-#define TRAINER_PIC_YOUNGSTER 82
-#define TRAINER_PIC_BUG_CATCHER_2 83
-#define TRAINER_PIC_LASS_2 84
-#define TRAINER_PIC_SAILOR_2 85
-#define TRAINER_PIC_CAMPER_2 86
-#define TRAINER_PIC_PICNICKER_2 87
-#define TRAINER_PIC_POKEMANIAC_2 88
-#define TRAINER_PIC_SUPER_NERD 89
-#define TRAINER_PIC_HIKER_2 90
-#define TRAINER_PIC_BIKER 91
-#define TRAINER_PIC_BURGLAR 92
-#define TRAINER_PIC_ENGINEER 93
-#define TRAINER_PIC_FISHERMAN_2 94
-#define TRAINER_PIC_SWIMMER_MALE_2 95
-#define TRAINER_PIC_CUE_BALL 96
-#define TRAINER_PIC_GAMER 97
-#define TRAINER_PIC_BEAUTY_2 98
-#define TRAINER_PIC_SWIMMER_FEMALE_2 99
-#define TRAINER_PIC_PSYCHIC_3 100
-#define TRAINER_PIC_ROCKER 101
-#define TRAINER_PIC_JUGGLER 102
-#define TRAINER_PIC_TAMER 103
-#define TRAINER_PIC_BIRD_KEEPER_2 104
-#define TRAINER_PIC_BLACK_BELT_2 105
-#define TRAINER_PIC_RIVAL 106
-#define TRAINER_PIC_SCIENTIST 107
-#define TRAINER_PIC_BOSS 108
-#define TRAINER_PIC_TEAM_ROCKET 109
-#define TRAINER_PIC_COOLTRAINER_3 110
-#define TRAINER_PIC_COOLTRAINER_4 111
-#define TRAINER_PIC_LORELEI 112
-#define TRAINER_PIC_BRUNO 113
-#define TRAINER_PIC_AGATHA 114
-#define TRAINER_PIC_LANCE 115
-#define TRAINER_PIC_BROCK 116
-#define TRAINER_PIC_MISTY 117
-#define TRAINER_PIC_LT_SURGE 118
-#define TRAINER_PIC_ERIKA 119
-#define TRAINER_PIC_KOGA 120
-#define TRAINER_PIC_BLAINE 121
-#define TRAINER_PIC_SABRINA 122
-#define TRAINER_PIC_GENTLEMAN_2 123
-#define TRAINER_PIC_RIVAL_2 124
-#define TRAINER_PIC_RIVAL_3 125
-#define TRAINER_PIC_CHANNELER 126
-#define TRAINER_PIC_TWINS_2 127
-#define TRAINER_PIC_COOL_COUPLE 128
-#define TRAINER_PIC_YOUNG_COUPLE_2 129
-#define TRAINER_PIC_CRUSH_KIN 130
-#define TRAINER_PIC_SIS_AND_BRO_2 131
-#define TRAINER_PIC_PROF_OAK 132
-#define TRAINER_PIC_BRENDAN 133
-#define TRAINER_PIC_MAY 134
-#define TRAINER_PIC_RED 135
-#define TRAINER_PIC_LEAF 136
-#define TRAINER_PIC_TEAM_ROCKET_2 137
-#define TRAINER_PIC_PSYCHIC_4 138
-#define TRAINER_PIC_CRUSH_GIRL 139
-#define TRAINER_PIC_TUBER_3 140
-#define TRAINER_PIC_PKMN_BREEDER_3 141
-#define TRAINER_PIC_PKMN_RANGER_3 142
-#define TRAINER_PIC_PKMN_RANGER_4 143
-#define TRAINER_PIC_AROMA_LADY_2 144
-#define TRAINER_PIC_RUIN_MANIAC_2 145
-#define TRAINER_PIC_LADY_2 146
-#define TRAINER_PIC_PAINTER 147
+#define TRAINER_PIC_AQUA_LEADER_ARCHIE 0
+#define TRAINER_PIC_AQUA_GRUNT_M 1
+#define TRAINER_PIC_AQUA_GRUNT_F 2
+#define TRAINER_PIC_RS_AROMA_LADY 3
+#define TRAINER_PIC_RS_RUIN_MANIAC 4
+#define TRAINER_PIC_INTERVIEWER 5
+#define TRAINER_PIC_RS_TUBER_F 6
+#define TRAINER_PIC_TUBER_M 7
+#define TRAINER_PIC_RS_COOLTRAINER_M 8
+#define TRAINER_PIC_RS_COOLTRAINER_F 9
+#define TRAINER_PIC_HEX_MANIAC 10
+#define TRAINER_PIC_RS_LADY 11
+#define TRAINER_PIC_RS_BEAUTY 12
+#define TRAINER_PIC_RICH_BOY 13
+#define TRAINER_PIC_RS_POKEMANIAC 14
+#define TRAINER_PIC_RS_SWIMMER_M 15
+#define TRAINER_PIC_RS_BLACK_BELT 16
+#define TRAINER_PIC_GUITARIST 17
+#define TRAINER_PIC_KINDLER 18
+#define TRAINER_PIC_RS_CAMPER 19
+#define TRAINER_PIC_BUG_MANIAC 20
+#define TRAINER_PIC_RS_PSYCHIC_M 21
+#define TRAINER_PIC_RS_PSYCHIC_F 22
+#define TRAINER_PIC_RS_GENTLEMAN 23
+#define TRAINER_PIC_ELITE_FOUR_SIDNEY 24
+#define TRAINER_PIC_ELITE_FOUR_PHOEBE 25
+#define TRAINER_PIC_LEADER_ROXANNE 26
+#define TRAINER_PIC_LEADER_BRAWLY 27
+#define TRAINER_PIC_LEADER_TATE_AND_LIZA 28
+#define TRAINER_PIC_SCHOOL_KID_M 29
+#define TRAINER_PIC_SCHOOL_KID_F 30
+#define TRAINER_PIC_SR_AND_JR 31
+#define TRAINER_PIC_POKEFAN_M 32
+#define TRAINER_PIC_POKEFAN_F 33
+#define TRAINER_PIC_EXPERT_M 34
+#define TRAINER_PIC_EXPERT_F 35
+#define TRAINER_PIC_RS_YOUNGSTER 36
+#define TRAINER_PIC_CHAMPION_STEVEN 37
+#define TRAINER_PIC_RS_FISHERMAN 38
+#define TRAINER_PIC_CYCLING_TRIATHLETE_M 39
+#define TRAINER_PIC_CYCLING_TRIATHLETE_F 40
+#define TRAINER_PIC_RUNNING_TRIATHLETE_M 41
+#define TRAINER_PIC_RUNNING_TRIATHLETE_F 42
+#define TRAINER_PIC_SWIMMING_TRIATHLETE_M 43
+#define TRAINER_PIC_SWIMMING_TRIATHLETE_F 44
+#define TRAINER_PIC_DRAGON_TAMER 45
+#define TRAINER_PIC_RS_BIRD_KEEPER 46
+#define TRAINER_PIC_NINJA_BOY 47
+#define TRAINER_PIC_BATTLE_GIRL 48
+#define TRAINER_PIC_PARASOL_LADY 49
+#define TRAINER_PIC_RS_SWIMMER_F 50
+#define TRAINER_PIC_RS_PICNICKER 51
+#define TRAINER_PIC_RS_TWINS 52
+#define TRAINER_PIC_RS_SAILOR 53
+#define TRAINER_PIC_COLLECTOR 54
+#define TRAINER_PIC_WALLY 55
+#define TRAINER_PIC_RS_BRENDAN_1 56
+#define TRAINER_PIC_RS_MAY_1 57
+#define TRAINER_PIC_POKEMON_BREEDER_M 58
+#define TRAINER_PIC_RS_POKEMON_BREEDER_F 59
+#define TRAINER_PIC_RS_POKEMON_RANGER_M 60
+#define TRAINER_PIC_RS_POKEMON_RANGER_F 61
+#define TRAINER_PIC_MAGMA_LEADER_MAXIE 62
+#define TRAINER_PIC_MAGMA_GRUNT_M 63
+#define TRAINER_PIC_MAGMA_GRUNT_F 64
+#define TRAINER_PIC_RS_LASS 65
+#define TRAINER_PIC_RS_BUG_CATCHER 66
+#define TRAINER_PIC_RS_HIKER 67
+#define TRAINER_PIC_RS_YOUNG_COUPLE 68
+#define TRAINER_PIC_OLD_COUPLE 69
+#define TRAINER_PIC_RS_SIS_AND_BRO 70
+#define TRAINER_PIC_AQUA_ADMIN_M 71
+#define TRAINER_PIC_AQUA_ADMIN_F 72
+#define TRAINER_PIC_MAGMA_ADMIN_M 73
+#define TRAINER_PIC_MAGMA_ADMIN_F 74
+#define TRAINER_PIC_LEADER_WATTSON 75
+#define TRAINER_PIC_LEADER_FLANNERY 76
+#define TRAINER_PIC_LEADER_NORMAN 77
+#define TRAINER_PIC_LEADER_WINONA 78
+#define TRAINER_PIC_LEADER_WALLACE 79
+#define TRAINER_PIC_ELITE_FOUR_GLACIA 80
+#define TRAINER_PIC_ELITE_FOUR_DRAKE 81
+#define TRAINER_PIC_YOUNGSTER 82
+#define TRAINER_PIC_BUG_CATCHER 83
+#define TRAINER_PIC_LASS 84
+#define TRAINER_PIC_SAILOR 85
+#define TRAINER_PIC_CAMPER 86
+#define TRAINER_PIC_PICNICKER 87
+#define TRAINER_PIC_POKEMANIAC 88
+#define TRAINER_PIC_SUPER_NERD 89
+#define TRAINER_PIC_HIKER 90
+#define TRAINER_PIC_BIKER 91
+#define TRAINER_PIC_BURGLAR 92
+#define TRAINER_PIC_ENGINEER 93
+#define TRAINER_PIC_FISHERMAN 94
+#define TRAINER_PIC_SWIMMER_M 95
+#define TRAINER_PIC_CUE_BALL 96
+#define TRAINER_PIC_GAMER 97
+#define TRAINER_PIC_BEAUTY 98
+#define TRAINER_PIC_SWIMMER_F 99
+#define TRAINER_PIC_PSYCHIC_M 100
+#define TRAINER_PIC_ROCKER 101
+#define TRAINER_PIC_JUGGLER 102
+#define TRAINER_PIC_TAMER 103
+#define TRAINER_PIC_BIRD_KEEPER 104
+#define TRAINER_PIC_BLACK_BELT 105
+#define TRAINER_PIC_RIVAL_1 106
+#define TRAINER_PIC_SCIENTIST 107
+#define TRAINER_PIC_LEADER_GIOVANNI 108
+#define TRAINER_PIC_ROCKET_GRUNT_M 109
+#define TRAINER_PIC_COOLTRAINER_M 110
+#define TRAINER_PIC_COOLTRAINER_F 111
+#define TRAINER_PIC_ELITE_FOUR_LORELEI 112
+#define TRAINER_PIC_ELITE_FOUR_BRUNO 113
+#define TRAINER_PIC_ELITE_FOUR_AGATHA 114
+#define TRAINER_PIC_ELITE_FOUR_LANCE 115
+#define TRAINER_PIC_LEADER_BROCK 116
+#define TRAINER_PIC_LEADER_MISTY 117
+#define TRAINER_PIC_LEADER_LT_SURGE 118
+#define TRAINER_PIC_LEADER_ERIKA 119
+#define TRAINER_PIC_LEADER_KOGA 120
+#define TRAINER_PIC_LEADER_BLAINE 121
+#define TRAINER_PIC_LEADER_SABRINA 122
+#define TRAINER_PIC_GENTLEMAN 123
+#define TRAINER_PIC_RIVAL_2 124
+#define TRAINER_PIC_CHAMPION_RIVAL 125
+#define TRAINER_PIC_CHANNELER 126
+#define TRAINER_PIC_TWINS 127
+#define TRAINER_PIC_COOL_COUPLE 128
+#define TRAINER_PIC_YOUNG_COUPLE 129
+#define TRAINER_PIC_CRUSH_KIN 130
+#define TRAINER_PIC_SIS_AND_BRO 131
+#define TRAINER_PIC_PROFESSOR_OAK 132
+#define TRAINER_PIC_RS_BRENDAN_2 133
+#define TRAINER_PIC_RS_MAY_2 134
+#define TRAINER_PIC_RED 135
+#define TRAINER_PIC_LEAF 136
+#define TRAINER_PIC_ROCKET_GRUNT_F 137
+#define TRAINER_PIC_PSYCHIC_F 138
+#define TRAINER_PIC_CRUSH_GIRL 139
+#define TRAINER_PIC_TUBER_F 140
+#define TRAINER_PIC_POKEMON_BREEDER_F 141
+#define TRAINER_PIC_POKEMON_RANGER_M 142
+#define TRAINER_PIC_POKEMON_RANGER_F 143
+#define TRAINER_PIC_AROMA_LADY 144
+#define TRAINER_PIC_RUIN_MANIAC 145
+#define TRAINER_PIC_LADY 146
+#define TRAINER_PIC_PAINTER 147
+
+#define TRAINER_PKMN_TRAINER_1 0
+#define TRAINER_AQUA_LEADER_1 1
+#define TRAINER_TEAM_AQUA_1 2
+#define TRAINER_TEAM_AQUA_2 3
+#define TRAINER_AROMA_LADY_1 4
+#define TRAINER_RUIN_MANIAC_1 5
+#define TRAINER_INTERVIEWER_1 6
+#define TRAINER_TUBER_1 7
+#define TRAINER_TUBER_2 8
+#define TRAINER_COOLTRAINER_1 9
+#define TRAINER_COOLTRAINER_2 10
+#define TRAINER_HEX_MANIAC_1 11
+#define TRAINER_LADY_1 12
+#define TRAINER_BEAUTY_1 13
+#define TRAINER_RICH_BOY_1 14
+#define TRAINER_POKEMANIAC_1 15
+#define TRAINER_SWIMMER_MALE_1 16
+#define TRAINER_BLACK_BELT_1 17
+#define TRAINER_GUITARIST_1 18
+#define TRAINER_KINDLER_1 19
+#define TRAINER_CAMPER_1 20
+#define TRAINER_BUG_MANIAC_1 21
+#define TRAINER_PSYCHIC_1 22
+#define TRAINER_PSYCHIC_2 23
+#define TRAINER_GENTLEMAN_1 24
+#define TRAINER_ELITE_FOUR_SIDNEY 25
+#define TRAINER_ELITE_FOUR_PHOEBE 26
+#define TRAINER_LEADER_ROXANNE 27
+#define TRAINER_LEADER_BRAWLY 28
+#define TRAINER_LEADER_TATE_LIZA 29
+#define TRAINER_SCHOOL_KID_1 30
+#define TRAINER_SCHOOL_KID_2 31
+#define TRAINER_SR_AND_JR_1 32
+#define TRAINER_POKEFAN_1 33
+#define TRAINER_POKEFAN_2 34
+#define TRAINER_EXPERT_1 35
+#define TRAINER_EXPERT_2 36
+#define TRAINER_YOUNGSTER_1 37
+#define TRAINER_CHAMPION_1 38
+#define TRAINER_FISHERMAN_1 39
+#define TRAINER_TRIATHLETE_1 40
+#define TRAINER_TRIATHLETE_2 41
+#define TRAINER_TRIATHLETE_3 42
+#define TRAINER_TRIATHLETE_4 43
+#define TRAINER_TRIATHLETE_5 44
+#define TRAINER_TRIATHLETE_6 45
+#define TRAINER_DRAGON_TAMER_1 46
+#define TRAINER_BIRD_KEEPER_1 47
+#define TRAINER_NINJA_BOY_1 48
+#define TRAINER_BATTLE_GIRL_1 49
+#define TRAINER_PARASOL_LADY_1 50
+#define TRAINER_SWIMMER_FEMALE_1 51
+#define TRAINER_PICNICKER_1 52
+#define TRAINER_TWINS_1 53
+#define TRAINER_SAILOR_1 54
+#define TRAINER_BOARDER_1 55
+#define TRAINER_BOARDER_2 56
+#define TRAINER_COLLECTOR_1 57
+#define TRAINER_PKMN_TRAINER_2 58
+#define TRAINER_PKMN_TRAINER_3 59
+#define TRAINER_PKMN_TRAINER_4 60
+#define TRAINER_PKMN_TRAINER_5 61
+#define TRAINER_PKMN_TRAINER_6 62
+#define TRAINER_PKMN_TRAINER_7 63
+#define TRAINER_PKMN_TRAINER_8 64
+#define TRAINER_PKMN_BREEDER_1 65
+#define TRAINER_PKMN_BREEDER_2 66
+#define TRAINER_PKMN_RANGER_1 67
+#define TRAINER_PKMN_RANGER_2 68
+#define TRAINER_MAGMA_LEADER_1 69
+#define TRAINER_TEAM_MAGMA_1 70
+#define TRAINER_TEAM_MAGMA_2 71
+#define TRAINER_LASS_1 72
+#define TRAINER_BUG_CATCHER_1 73
+#define TRAINER_HIKER_1 74
+#define TRAINER_YOUNG_COUPLE_1 75
+#define TRAINER_OLD_COUPLE_1 76
+#define TRAINER_SIS_AND_BRO_1 77
+#define TRAINER_AQUA_ADMIN_MATT 78
+#define TRAINER_AQUA_ADMIN_SHELLY 79
+#define TRAINER_MAGMA_ADMIN_TABITHA 80
+#define TRAINER_MAGMA_ADMIN_COURTNEY 81
+#define TRAINER_LEADER_WATTSON 82
+#define TRAINER_LEADER_FLANNERY 83
+#define TRAINER_LEADER_NORMAN 84
+#define TRAINER_LEADER_WINONA 85
+#define TRAINER_LEADER_WALLACE 86
+#define TRAINER_ELITE_FOUR_GLACIA 87
+#define TRAINER_ELITE_FOUR_DRAKE 88
+#define TRAINER_YOUNGSTER_BEN 89
+#define TRAINER_YOUNGSTER_CALVIN 90
+#define TRAINER_YOUNGSTER_JOSH 91
+#define TRAINER_YOUNGSTER_TIMMY 92
+#define TRAINER_YOUNGSTER_JOEY 93
+#define TRAINER_YOUNGSTER_DAN 94
+#define TRAINER_YOUNGSTER_CHAD 95
+#define TRAINER_YOUNGSTER_TYLER 96
+#define TRAINER_YOUNGSTER_EDDIE 97
+#define TRAINER_YOUNGSTER_DILLON 98
+#define TRAINER_YOUNGSTER_YASU 99
+#define TRAINER_YOUNGSTER_DAVE 100
+#define TRAINER_YOUNGSTER_BEN_2 101
+#define TRAINER_BUG_CATCHER_RICK 102
+#define TRAINER_BUG_CATCHER_DOUG 103
+#define TRAINER_BUG_CATCHER_SAMMY 104
+#define TRAINER_BUG_CATCHER_COLTON 105
+#define TRAINER_BUG_CATCHER_GREG 106
+#define TRAINER_BUG_CATCHER_JAMES 107
+#define TRAINER_BUG_CATCHER_KENT 108
+#define TRAINER_BUG_CATCHER_ROBBY 109
+#define TRAINER_BUG_CATCHER_CALE 110
+#define TRAINER_BUG_CATCHER_KEIGO 111
+#define TRAINER_BUG_CATCHER_ELIJAH 112
+#define TRAINER_BUG_CATCHER_2 113
+#define TRAINER_BUG_CATCHER_BRENT 114
+#define TRAINER_BUG_CATCHER_CONNER 115
+#define TRAINER_LASS_JANICE 116
+#define TRAINER_LASS_SALLY 117
+#define TRAINER_LASS_ROBIN 118
+#define TRAINER_LASS_CRISSY 119
+#define TRAINER_LASS_MIRIAM 120
+#define TRAINER_LASS_IRIS 121
+#define TRAINER_LASS_RELI 122
+#define TRAINER_LASS_ALI 123
+#define TRAINER_LASS_2 124
+#define TRAINER_LASS_HALEY 125
+#define TRAINER_LASS_ANN 126
+#define TRAINER_LASS_DAWN 127
+#define TRAINER_LASS_PAIGE 128
+#define TRAINER_LASS_ANDREA 129
+#define TRAINER_LASS_MEGAN 130
+#define TRAINER_LASS_JULIA 131
+#define TRAINER_LASS_KAY 132
+#define TRAINER_LASS_LISA 133
+#define TRAINER_SAILOR_EDMOND 134
+#define TRAINER_SAILOR_TREVOR 135
+#define TRAINER_SAILOR_LEONARD 136
+#define TRAINER_SAILOR_DUNCAN 137
+#define TRAINER_SAILOR_HUEY 138
+#define TRAINER_SAILOR_DYLAN 139
+#define TRAINER_SAILOR_PHILLIP 140
+#define TRAINER_SAILOR_DWAYNE 141
+#define TRAINER_CAMPER_LIAM 142
+#define TRAINER_CAMPER_SHANE 143
+#define TRAINER_CAMPER_ETHAN 144
+#define TRAINER_CAMPER_RICKY 145
+#define TRAINER_CAMPER_JEFF 146
+#define TRAINER_CAMPER_2 147
+#define TRAINER_CAMPER_CHRIS 148
+#define TRAINER_CAMPER_DREW 149
+#define TRAINER_PICNICKER_DIANA 150
+#define TRAINER_PICNICKER_NANCY 151
+#define TRAINER_PICNICKER_ISABELLE 152
+#define TRAINER_PICNICKER_KELSEY 153
+#define TRAINER_PICNICKER_ALICIA 154
+#define TRAINER_PICNICKER_CAITLIN 155
+#define TRAINER_PICNICKER_HEIDI 156
+#define TRAINER_PICNICKER_CAROL 157
+#define TRAINER_PICNICKER_SOFIA 158
+#define TRAINER_PICNICKER_MARTHA 159
+#define TRAINER_PICNICKER_TINA 160
+#define TRAINER_PICNICKER_HANNAH 161
+#define TRAINER_POKEMANIAC_MARK 162
+#define TRAINER_POKEMANIAC_HERMAN 163
+#define TRAINER_POKEMANIAC_COOPER 164
+#define TRAINER_POKEMANIAC_STEVE 165
+#define TRAINER_POKEMANIAC_WINSTON 166
+#define TRAINER_POKEMANIAC_DAWSON 167
+#define TRAINER_POKEMANIAC_ASHTON 168
+#define TRAINER_SUPER_NERD_JOVAN 169
+#define TRAINER_SUPER_NERD_MIGUEL 170
+#define TRAINER_SUPER_NERD_AIDAN 171
+#define TRAINER_SUPER_NERD_GLENN 172
+#define TRAINER_SUPER_NERD_LESLIE 173
+#define TRAINER_SUPER_NERD_1 174
+#define TRAINER_SUPER_NERD_2 175
+#define TRAINER_SUPER_NERD_3 176
+#define TRAINER_SUPER_NERD_ERIK 177
+#define TRAINER_SUPER_NERD_AVERY 178
+#define TRAINER_SUPER_NERD_DEREK 179
+#define TRAINER_SUPER_NERD_ZAC 180
+#define TRAINER_HIKER_MARCOS 181
+#define TRAINER_HIKER_FRANKLIN 182
+#define TRAINER_HIKER_NOB 183
+#define TRAINER_HIKER_WAYNE 184
+#define TRAINER_HIKER_ALAN 185
+#define TRAINER_HIKER_BRICE 186
+#define TRAINER_HIKER_CLARK 187
+#define TRAINER_HIKER_TRENT 188
+#define TRAINER_HIKER_DUDLEY 189
+#define TRAINER_HIKER_ALLEN 190
+#define TRAINER_HIKER_ERIC 191
+#define TRAINER_HIKER_LENNY 192
+#define TRAINER_HIKER_OLIVER 193
+#define TRAINER_HIKER_LUCAS 194
+#define TRAINER_BIKER_JARED 195
+#define TRAINER_BIKER_MALIK 196
+#define TRAINER_BIKER_ERNEST 197
+#define TRAINER_BIKER_ALEX 198
+#define TRAINER_BIKER_LAO 199
+#define TRAINER_BIKER_1 200
+#define TRAINER_BIKER_HIDEO 201
+#define TRAINER_BIKER_RUBEN 202
+#define TRAINER_BIKER_BILLY 203
+#define TRAINER_BIKER_NIKOLAS 204
+#define TRAINER_BIKER_JAXON 205
+#define TRAINER_BIKER_WILLIAM 206
+#define TRAINER_BIKER_LUKAS 207
+#define TRAINER_BIKER_ISAAC 208
+#define TRAINER_BIKER_GERALD 209
+#define TRAINER_BURGLAR_1 210
+#define TRAINER_BURGLAR_2 211
+#define TRAINER_BURGLAR_3 212
+#define TRAINER_BURGLAR_QUINN 213
+#define TRAINER_BURGLAR_RAMON 214
+#define TRAINER_BURGLAR_DUSTY 215
+#define TRAINER_BURGLAR_ARNIE 216
+#define TRAINER_BURGLAR_4 217
+#define TRAINER_BURGLAR_SIMON 218
+#define TRAINER_BURGLAR_LEWIS 219
+#define TRAINER_ENGINEER_BAILY 220
+#define TRAINER_ENGINEER_BRAXTON 221
+#define TRAINER_ENGINEER_BERNIE 222
+#define TRAINER_FISHERMAN_DALE 223
+#define TRAINER_FISHERMAN_BARNY 224
+#define TRAINER_FISHERMAN_NED 225
+#define TRAINER_FISHERMAN_CHIP 226
+#define TRAINER_FISHERMAN_HANK 227
+#define TRAINER_FISHERMAN_ELLIOT 228
+#define TRAINER_FISHERMAN_RONALD 229
+#define TRAINER_FISHERMAN_CLAUDE 230
+#define TRAINER_FISHERMAN_WADE 231
+#define TRAINER_FISHERMAN_NOLAN 232
+#define TRAINER_FISHERMAN_ANDREW 233
+#define TRAINER_SWIMMER_MALE_LUIS 234
+#define TRAINER_SWIMMER_MALE_RICHARD 235
+#define TRAINER_SWIMMER_MALE_REECE 236
+#define TRAINER_SWIMMER_MALE_MATTHEW 237
+#define TRAINER_SWIMMER_MALE_DOUGLAS 238
+#define TRAINER_SWIMMER_MALE_DAVID 239
+#define TRAINER_SWIMMER_MALE_TONY 240
+#define TRAINER_SWIMMER_MALE_AXLE 241
+#define TRAINER_SWIMMER_MALE_BARRY 242
+#define TRAINER_SWIMMER_MALE_DEAN 243
+#define TRAINER_SWIMMER_MALE_DARRIN 244
+#define TRAINER_SWIMMER_MALE_SPENCER 245
+#define TRAINER_SWIMMER_MALE_JACK 246
+#define TRAINER_SWIMMER_MALE_JEROME 247
+#define TRAINER_SWIMMER_MALE_ROLAND 248
+#define TRAINER_CUE_BALL_KOJI 249
+#define TRAINER_CUE_BALL_LUKE 250
+#define TRAINER_CUE_BALL_CAMRON 251
+#define TRAINER_CUE_BALL_RAUL 252
+#define TRAINER_CUE_BALL_ISAIAH 253
+#define TRAINER_CUE_BALL_ZEEK 254
+#define TRAINER_CUE_BALL_JAMAL 255
+#define TRAINER_CUE_BALL_COREY 256
+#define TRAINER_CUE_BALL_CHASE 257
+#define TRAINER_GAMER_HUGO 258
+#define TRAINER_GAMER_JASPER 259
+#define TRAINER_GAMER_DIRK 260
+#define TRAINER_GAMER_DARIAN 261
+#define TRAINER_GAMER_STAN 262
+#define TRAINER_GAMER_1 263
+#define TRAINER_GAMER_RICH 264
+#define TRAINER_BEAUTY_BRIDGET 265
+#define TRAINER_BEAUTY_TAMIA 266
+#define TRAINER_BEAUTY_LORI 267
+#define TRAINER_BEAUTY_LOLA 268
+#define TRAINER_BEAUTY_SHEILA 269
+#define TRAINER_SWIMMER_FEMALE_TIFFANY 270
+#define TRAINER_SWIMMER_FEMALE_NORA 271
+#define TRAINER_SWIMMER_FEMALE_MELISSA 272
+#define TRAINER_BEAUTY_GRACE 273
+#define TRAINER_BEAUTY_OLIVIA 274
+#define TRAINER_BEAUTY_LAUREN 275
+#define TRAINER_SWIMMER_FEMALE_ANYA 276
+#define TRAINER_SWIMMER_FEMALE_ALICE 277
+#define TRAINER_SWIMMER_FEMALE_CONNIE 278
+#define TRAINER_SWIMMER_FEMALE_SHIRLEY 279
+#define TRAINER_PSYCHIC_JOHAN 280
+#define TRAINER_PSYCHIC_TYRON 281
+#define TRAINER_PSYCHIC_CAMERON 282
+#define TRAINER_PSYCHIC_PRESTON 283
+#define TRAINER_ROCKER_RANDALL 284
+#define TRAINER_ROCKER_LUCA 285
+#define TRAINER_JUGGLER_DALTON 286
+#define TRAINER_JUGGLER_NELSON 287
+#define TRAINER_JUGGLER_KIRK 288
+#define TRAINER_JUGGLER_SHAWN 289
+#define TRAINER_JUGGLER_GREGORY 290
+#define TRAINER_JUGGLER_EDWARD 291
+#define TRAINER_JUGGLER_KAYDEN 292
+#define TRAINER_JUGGLER_NATE 293
+#define TRAINER_TAMER_PHIL 294
+#define TRAINER_TAMER_EDGAR 295
+#define TRAINER_TAMER_JASON 296
+#define TRAINER_TAMER_COLE 297
+#define TRAINER_TAMER_VINCENT 298
+#define TRAINER_TAMER_JOHN 299
+#define TRAINER_BIRD_KEEPER_SEBASTIAN 300
+#define TRAINER_BIRD_KEEPER_PERRY 301
+#define TRAINER_BIRD_KEEPER_ROBERT 302
+#define TRAINER_BIRD_KEEPER_DONALD 303
+#define TRAINER_BIRD_KEEPER_BENNY 304
+#define TRAINER_BIRD_KEEPER_EDWIN 305
+#define TRAINER_BIRD_KEEPER_CHESTER 306
+#define TRAINER_BIRD_KEEPER_WILTON 307
+#define TRAINER_BIRD_KEEPER_RAMIRO 308
+#define TRAINER_BIRD_KEEPER_JACOB 309
+#define TRAINER_BIRD_KEEPER_ROGER 310
+#define TRAINER_BIRD_KEEPER_REED 311
+#define TRAINER_BIRD_KEEPER_KEITH 312
+#define TRAINER_BIRD_KEEPER_CARTER 313
+#define TRAINER_BIRD_KEEPER_MITCH 314
+#define TRAINER_BIRD_KEEPER_BECK 315
+#define TRAINER_BIRD_KEEPER_MARLON 316
+#define TRAINER_BLACK_BELT_KOICHI 317
+#define TRAINER_BLACK_BELT_MIKE 318
+#define TRAINER_BLACK_BELT_HIDEKI 319
+#define TRAINER_BLACK_BELT_AARON 320
+#define TRAINER_BLACK_BELT_HITOSHI 321
+#define TRAINER_BLACK_BELT_ATSUSHI 322
+#define TRAINER_BLACK_BELT_KIYO 323
+#define TRAINER_BLACK_BELT_TAKASHI 324
+#define TRAINER_BLACK_BELT_DAISUKE 325
+#define TRAINER_RIVAL_TERRY 326
+#define TRAINER_RIVAL_TERRY_2 327
+#define TRAINER_RIVAL_TERRY_3 328
+#define TRAINER_RIVAL_TERRY_4 329
+#define TRAINER_RIVAL_TERRY_5 330
+#define TRAINER_RIVAL_TERRY_6 331
+#define TRAINER_RIVAL_TERRY_7 332
+#define TRAINER_RIVAL_TERRY_8 333
+#define TRAINER_RIVAL_TERRY_9 334
+#define TRAINER_SCIENTIST_TED 335
+#define TRAINER_SCIENTIST_CONNOR 336
+#define TRAINER_SCIENTIST_JERRY 337
+#define TRAINER_SCIENTIST_JOSE 338
+#define TRAINER_SCIENTIST_RODNEY 339
+#define TRAINER_SCIENTIST_BEAU 340
+#define TRAINER_SCIENTIST_TAYLOR 341
+#define TRAINER_SCIENTIST_JOSHUA 342
+#define TRAINER_SCIENTIST_PARKER 343
+#define TRAINER_SCIENTIST_ED 344
+#define TRAINER_SCIENTIST_TRAVIS 345
+#define TRAINER_SCIENTIST_BRAYDON 346
+#define TRAINER_SCIENTIST_IVAN 347
+#define TRAINER_BOSS_GIOVANNI 348
+#define TRAINER_BOSS_GIOVANNI_2 349
+#define TRAINER_LEADER_GIOVANNI 350
+#define TRAINER_TEAM_ROCKET_GRUNT 351
+#define TRAINER_TEAM_ROCKET_GRUNT_2 352
+#define TRAINER_TEAM_ROCKET_GRUNT_3 353
+#define TRAINER_TEAM_ROCKET_GRUNT_4 354
+#define TRAINER_TEAM_ROCKET_GRUNT_5 355
+#define TRAINER_TEAM_ROCKET_GRUNT_6 356
+#define TRAINER_TEAM_ROCKET_GRUNT_7 357
+#define TRAINER_TEAM_ROCKET_GRUNT_8 358
+#define TRAINER_TEAM_ROCKET_GRUNT_9 359
+#define TRAINER_TEAM_ROCKET_GRUNT_10 360
+#define TRAINER_TEAM_ROCKET_GRUNT_11 361
+#define TRAINER_TEAM_ROCKET_GRUNT_12 362
+#define TRAINER_TEAM_ROCKET_GRUNT_13 363
+#define TRAINER_TEAM_ROCKET_GRUNT_14 364
+#define TRAINER_TEAM_ROCKET_GRUNT_15 365
+#define TRAINER_TEAM_ROCKET_GRUNT_16 366
+#define TRAINER_TEAM_ROCKET_GRUNT_17 367
+#define TRAINER_TEAM_ROCKET_GRUNT_18 368
+#define TRAINER_TEAM_ROCKET_GRUNT_19 369
+#define TRAINER_TEAM_ROCKET_GRUNT_20 370
+#define TRAINER_TEAM_ROCKET_GRUNT_21 371
+#define TRAINER_TEAM_ROCKET_GRUNT_22 372
+#define TRAINER_TEAM_ROCKET_GRUNT_23 373
+#define TRAINER_TEAM_ROCKET_GRUNT_24 374
+#define TRAINER_TEAM_ROCKET_GRUNT_25 375
+#define TRAINER_TEAM_ROCKET_GRUNT_26 376
+#define TRAINER_TEAM_ROCKET_GRUNT_27 377
+#define TRAINER_TEAM_ROCKET_GRUNT_28 378
+#define TRAINER_TEAM_ROCKET_GRUNT_29 379
+#define TRAINER_TEAM_ROCKET_GRUNT_30 380
+#define TRAINER_TEAM_ROCKET_GRUNT_31 381
+#define TRAINER_TEAM_ROCKET_GRUNT_32 382
+#define TRAINER_TEAM_ROCKET_GRUNT_33 383
+#define TRAINER_TEAM_ROCKET_GRUNT_34 384
+#define TRAINER_TEAM_ROCKET_GRUNT_35 385
+#define TRAINER_TEAM_ROCKET_GRUNT_36 386
+#define TRAINER_TEAM_ROCKET_GRUNT_37 387
+#define TRAINER_TEAM_ROCKET_GRUNT_38 388
+#define TRAINER_TEAM_ROCKET_GRUNT_39 389
+#define TRAINER_TEAM_ROCKET_GRUNT_40 390
+#define TRAINER_TEAM_ROCKET_GRUNT_41 391
+#define TRAINER_COOLTRAINER_SAMUEL 392
+#define TRAINER_COOLTRAINER_GEORGE 393
+#define TRAINER_COOLTRAINER_COLBY 394
+#define TRAINER_COOLTRAINER_PAUL 395
+#define TRAINER_COOLTRAINER_ROLANDO 396
+#define TRAINER_COOLTRAINER_GILBERT 397
+#define TRAINER_COOLTRAINER_OWEN 398
+#define TRAINER_COOLTRAINER_BERKE 399
+#define TRAINER_COOLTRAINER_YUJI 400
+#define TRAINER_COOLTRAINER_WARREN 401
+#define TRAINER_COOLTRAINER_MARY 402
+#define TRAINER_COOLTRAINER_CAROLINE 403
+#define TRAINER_COOLTRAINER_ALEXA 404
+#define TRAINER_COOLTRAINER_SHANNON 405
+#define TRAINER_COOLTRAINER_NAOMI 406
+#define TRAINER_COOLTRAINER_BROOKE 407
+#define TRAINER_COOLTRAINER_AUSTINA 408
+#define TRAINER_COOLTRAINER_JULIE 409
+#define TRAINER_ELITE_FOUR_LORELEI 410
+#define TRAINER_ELITE_FOUR_BRUNO 411
+#define TRAINER_ELITE_FOUR_AGATHA 412
+#define TRAINER_ELITE_FOUR_LANCE 413
+#define TRAINER_LEADER_BROCK 414
+#define TRAINER_LEADER_MISTY 415
+#define TRAINER_LEADER_LT_SURGE 416
+#define TRAINER_LEADER_ERIKA 417
+#define TRAINER_LEADER_KOGA 418
+#define TRAINER_LEADER_BLAINE 419
+#define TRAINER_LEADER_SABRINA 420
+#define TRAINER_GENTLEMAN_THOMAS 421
+#define TRAINER_GENTLEMAN_ARTHUR 422
+#define TRAINER_GENTLEMAN_TUCKER 423
+#define TRAINER_GENTLEMAN_NORTON 424
+#define TRAINER_GENTLEMAN_WALTER 425
+#define TRAINER_RIVAL_TERRY_10 426
+#define TRAINER_RIVAL_TERRY_11 427
+#define TRAINER_RIVAL_TERRY_12 428
+#define TRAINER_RIVAL_TERRY_13 429
+#define TRAINER_RIVAL_TERRY_14 430
+#define TRAINER_RIVAL_TERRY_15 431
+#define TRAINER_RIVAL_TERRY_16 432
+#define TRAINER_RIVAL_TERRY_17 433
+#define TRAINER_RIVAL_TERRY_18 434
+#define TRAINER_RIVAL_TERRY_19 435
+#define TRAINER_RIVAL_TERRY_20 436
+#define TRAINER_RIVAL_TERRY_21 437
+#define TRAINER_CHAMPION_TERRY 438
+#define TRAINER_CHAMPION_TERRY_2 439
+#define TRAINER_CHAMPION_TERRY_3 440
+#define TRAINER_CHANNELER_PATRICIA 441
+#define TRAINER_CHANNELER_CARLY 442
+#define TRAINER_CHANNELER_HOPE 443
+#define TRAINER_CHANNELER_PAULA 444
+#define TRAINER_CHANNELER_LAUREL 445
+#define TRAINER_CHANNELER_JODY 446
+#define TRAINER_CHANNELER_TAMMY 447
+#define TRAINER_CHANNELER_RUTH 448
+#define TRAINER_CHANNELER_KARINA 449
+#define TRAINER_CHANNELER_JANAE 450
+#define TRAINER_CHANNELER_ANGELICA 451
+#define TRAINER_CHANNELER_EMILIA 452
+#define TRAINER_CHANNELER_JENNIFER 453
+#define TRAINER_CHANNELER_1 454
+#define TRAINER_CHANNELER_2 455
+#define TRAINER_CHANNELER_3 456
+#define TRAINER_CHANNELER_4 457
+#define TRAINER_CHANNELER_5 458
+#define TRAINER_CHANNELER_6 459
+#define TRAINER_CHANNELER_7 460
+#define TRAINER_CHANNELER_8 461
+#define TRAINER_CHANNELER_AMANDA 462
+#define TRAINER_CHANNELER_STACY 463
+#define TRAINER_CHANNELER_TASHA 464
+#define TRAINER_HIKER_JEREMY 465
+#define TRAINER_PICNICKER_ALMA 466
+#define TRAINER_PICNICKER_SUSIE 467
+#define TRAINER_PICNICKER_VALERIE 468
+#define TRAINER_PICNICKER_GWEN 469
+#define TRAINER_BIKER_VIRGIL 470
+#define TRAINER_CAMPER_FLINT 471
+#define TRAINER_PICNICKER_MISSY 472
+#define TRAINER_PICNICKER_IRENE 473
+#define TRAINER_PICNICKER_DANA 474
+#define TRAINER_PICNICKER_ARIANA 475
+#define TRAINER_PICNICKER_LEAH 476
+#define TRAINER_CAMPER_JUSTIN 477
+#define TRAINER_PICNICKER_YAZMIN 478
+#define TRAINER_PICNICKER_KINDRA 479
+#define TRAINER_PICNICKER_BECKY 480
+#define TRAINER_PICNICKER_CELIA 481
+#define TRAINER_GENTLEMAN_BROOKS 482
+#define TRAINER_GENTLEMAN_LAMAR 483
+#define TRAINER_TWINS_ELI_ANNE 484
+#define TRAINER_COOL_COUPLE_RAY_TYRA 485
+#define TRAINER_YOUNG_COUPLE_GIA_JES 486
+#define TRAINER_TWINS_KIRI_JAN 487
+#define TRAINER_CRUSH_KIN_RON_MYA 488
+#define TRAINER_YOUNG_COUPLE_LEA_JED 489
+#define TRAINER_SIS_AND_BRO_LIA_LUC 490
+#define TRAINER_SIS_AND_BRO_LIL_IAN 491
+#define TRAINER_BUG_CATCHER_3 492
+#define TRAINER_BUG_CATCHER_4 493
+#define TRAINER_BUG_CATCHER_5 494
+#define TRAINER_BUG_CATCHER_6 495
+#define TRAINER_BUG_CATCHER_7 496
+#define TRAINER_BUG_CATCHER_8 497
+#define TRAINER_YOUNGSTER_BEN_3 498
+#define TRAINER_YOUNGSTER_BEN_4 499
+#define TRAINER_YOUNGSTER_CHAD_2 500
+#define TRAINER_LASS_RELI_2 501
+#define TRAINER_LASS_RELI_3 502
+#define TRAINER_YOUNGSTER_TIMMY_2 503
+#define TRAINER_YOUNGSTER_TIMMY_3 504
+#define TRAINER_YOUNGSTER_TIMMY_4 505
+#define TRAINER_YOUNGSTER_CHAD_3 506
+#define TRAINER_LASS_JANICE_2 507
+#define TRAINER_LASS_JANICE_3 508
+#define TRAINER_YOUNGSTER_CHAD_4 509
+#define TRAINER_HIKER_FRANKLIN_2 510
+#define TRAINER_PKMN_PROF_PROF_OAK 511
+#define TRAINER_PLAYER_BRENDAN 512
+#define TRAINER_PLAYER_MAY 513
+#define TRAINER_PLAYER_RED 514
+#define TRAINER_PLAYER_LEAF 515
+#define TRAINER_TEAM_ROCKET_GRUNT_42 516
+#define TRAINER_PSYCHIC_JACLYN 517
+#define TRAINER_CRUSH_GIRL_SHARON 518
+#define TRAINER_TUBER_AMIRA 519
+#define TRAINER_PKMN_BREEDER_ALIZE 520
+#define TRAINER_PKMN_RANGER_NICOLAS 521
+#define TRAINER_PKMN_RANGER_MADELINE 522
+#define TRAINER_AROMA_LADY_NIKKI 523
+#define TRAINER_RUIN_MANIAC_STANLY 524
+#define TRAINER_LADY_JACKI 525
+#define TRAINER_PAINTER_DAISY 526
+#define TRAINER_BIKER_GOON 527
+#define TRAINER_BIKER_GOON_2 528
+#define TRAINER_BIKER_GOON_3 529
+#define TRAINER_BIKER_2 530
+#define TRAINER_BUG_CATCHER_ANTHONY 531
+#define TRAINER_BUG_CATCHER_CHARLIE 532
+#define TRAINER_TWINS_ELI_ANNE_2 533
+#define TRAINER_YOUNGSTER_JOHNSON 534
+#define TRAINER_BIKER_RICARDO 535
+#define TRAINER_BIKER_JAREN 536
+#define TRAINER_TEAM_ROCKET_GRUNT_43 537
+#define TRAINER_TEAM_ROCKET_GRUNT_44 538
+#define TRAINER_TEAM_ROCKET_GRUNT_45 539
+#define TRAINER_TEAM_ROCKET_GRUNT_46 540
+#define TRAINER_TEAM_ROCKET_GRUNT_47 541
+#define TRAINER_TEAM_ROCKET_GRUNT_48 542
+#define TRAINER_TEAM_ROCKET_ADMIN 543
+#define TRAINER_TEAM_ROCKET_ADMIN_2 544
+#define TRAINER_SCIENTIST_GIDEON 545
+#define TRAINER_SWIMMER_FEMALE_AMARA 546
+#define TRAINER_SWIMMER_FEMALE_MARIA 547
+#define TRAINER_SWIMMER_FEMALE_ABIGAIL 548
+#define TRAINER_SWIMMER_MALE_FINN 549
+#define TRAINER_SWIMMER_MALE_GARRETT 550
+#define TRAINER_FISHERMAN_TOMMY 551
+#define TRAINER_CRUSH_GIRL_TANYA 552
+#define TRAINER_BLACK_BELT_SHEA 553
+#define TRAINER_BLACK_BELT_HUGH 554
+#define TRAINER_CAMPER_BRYCE 555
+#define TRAINER_PICNICKER_CLAIRE 556
+#define TRAINER_CRUSH_KIN_MIK_KIA 557
+#define TRAINER_AROMA_LADY_VIOLET 558
+#define TRAINER_TUBER_ALEXIS 559
+#define TRAINER_TWINS_JOY_MEG 560
+#define TRAINER_SWIMMER_FEMALE_TISHA 561
+#define TRAINER_PAINTER_CELINA 562
+#define TRAINER_PAINTER_RAYNA 563
+#define TRAINER_LADY_GILLIAN 564
+#define TRAINER_YOUNGSTER_DESTIN 565
+#define TRAINER_SWIMMER_MALE_TOBY 566
+#define TRAINER_TEAM_ROCKET_GRUNT_49 567
+#define TRAINER_TEAM_ROCKET_GRUNT_50 568
+#define TRAINER_TEAM_ROCKET_GRUNT_51 569
+#define TRAINER_BIRD_KEEPER_MILO 570
+#define TRAINER_BIRD_KEEPER_CHAZ 571
+#define TRAINER_BIRD_KEEPER_HAROLD 572
+#define TRAINER_FISHERMAN_TYLOR 573
+#define TRAINER_SWIMMER_MALE_MYMO 574
+#define TRAINER_SWIMMER_FEMALE_NICOLE 575
+#define TRAINER_SIS_AND_BRO_AVA_GEB 576
+#define TRAINER_AROMA_LADY_ROSE 577
+#define TRAINER_SWIMMER_MALE_SAMIR 578
+#define TRAINER_SWIMMER_FEMALE_DENISE 579
+#define TRAINER_TWINS_MIU_MIA 580
+#define TRAINER_HIKER_EARL 581
+#define TRAINER_RUIN_MANIAC_FOSTER 582
+#define TRAINER_RUIN_MANIAC_LARRY 583
+#define TRAINER_HIKER_DARYL 584
+#define TRAINER_POKEMANIAC_HECTOR 585
+#define TRAINER_PSYCHIC_DARIO 586
+#define TRAINER_PSYCHIC_RODETTE 587
+#define TRAINER_AROMA_LADY_MIAH 588
+#define TRAINER_YOUNG_COUPLE_EVE_JON 589
+#define TRAINER_JUGGLER_MASON 590
+#define TRAINER_CRUSH_GIRL_CYNDY 591
+#define TRAINER_CRUSH_GIRL_JOCELYN 592
+#define TRAINER_TAMER_EVAN 593
+#define TRAINER_POKEMANIAC_MARK_2 594
+#define TRAINER_PKMN_RANGER_LOGAN 595
+#define TRAINER_PKMN_RANGER_JACKSON 596
+#define TRAINER_PKMN_RANGER_BETH 597
+#define TRAINER_PKMN_RANGER_KATELYN 598
+#define TRAINER_COOLTRAINER_LEROY 599
+#define TRAINER_COOLTRAINER_MICHELLE 600
+#define TRAINER_COOL_COUPLE_LEX_NYA 601
+#define TRAINER_RUIN_MANIAC_BRANDON 602
+#define TRAINER_RUIN_MANIAC_BENJAMIN 603
+#define TRAINER_PAINTER_EDNA 604
+#define TRAINER_GENTLEMAN_CLIFFORD 605
+#define TRAINER_LADY_SELPHY 606
+#define TRAINER_RUIN_MANIAC_LAWSON 607
+#define TRAINER_PSYCHIC_LAURA 608
+#define TRAINER_PKMN_BREEDER_BETHANY 609
+#define TRAINER_PKMN_BREEDER_ALLISON 610
+#define TRAINER_BUG_CATCHER_GARRET 611
+#define TRAINER_BUG_CATCHER_JONAH 612
+#define TRAINER_BUG_CATCHER_VANCE 613
+#define TRAINER_YOUNGSTER_NASH 614
+#define TRAINER_YOUNGSTER_CORDELL 615
+#define TRAINER_LASS_DALIA 616
+#define TRAINER_LASS_JOANA 617
+#define TRAINER_CAMPER_RILEY 618
+#define TRAINER_PICNICKER_MARCY 619
+#define TRAINER_RUIN_MANIAC_LAYTON 620
+#define TRAINER_PICNICKER_KELSEY_2 621
+#define TRAINER_PICNICKER_KELSEY_3 622
+#define TRAINER_PICNICKER_KELSEY_4 623
+#define TRAINER_CAMPER_RICKY_2 624
+#define TRAINER_CAMPER_RICKY_3 625
+#define TRAINER_CAMPER_RICKY_4 626
+#define TRAINER_CAMPER_JEFF_2 627
+#define TRAINER_CAMPER_JEFF_3 628
+#define TRAINER_CAMPER_JEFF_4 629
+#define TRAINER_PICNICKER_ISABELLE_2 630
+#define TRAINER_PICNICKER_ISABELLE_3 631
+#define TRAINER_PICNICKER_ISABELLE_4 632
+#define TRAINER_YOUNGSTER_YASU_2 633
+#define TRAINER_YOUNGSTER_YASU_3 634
+#define TRAINER_ENGINEER_BERNIE_2 635
+#define TRAINER_GAMER_DARIAN_2 636
+#define TRAINER_CAMPER_CHRIS_2 637
+#define TRAINER_CAMPER_CHRIS_3 638
+#define TRAINER_CAMPER_CHRIS_4 639
+#define TRAINER_PICNICKER_ALICIA_2 640
+#define TRAINER_PICNICKER_ALICIA_3 641
+#define TRAINER_PICNICKER_ALICIA_4 642
+#define TRAINER_HIKER_JEREMY_2 643
+#define TRAINER_POKEMANIAC_MARK_3 644
+#define TRAINER_POKEMANIAC_HERMAN_2 645
+#define TRAINER_POKEMANIAC_HERMAN_3 646
+#define TRAINER_HIKER_TRENT_2 647
+#define TRAINER_LASS_MEGAN_2 648
+#define TRAINER_LASS_MEGAN_3 649
+#define TRAINER_SUPER_NERD_GLENN_2 650
+#define TRAINER_GAMER_RICH_2 651
+#define TRAINER_BIKER_JAREN_2 652
+#define TRAINER_FISHERMAN_ELLIOT_2 653
+#define TRAINER_ROCKER_LUCA_2 654
+#define TRAINER_BEAUTY_SHEILA_2 655
+#define TRAINER_BIRD_KEEPER_ROBERT_2 656
+#define TRAINER_BIRD_KEEPER_ROBERT_3 657
+#define TRAINER_PICNICKER_SUSIE_2 658
+#define TRAINER_PICNICKER_SUSIE_3 659
+#define TRAINER_PICNICKER_SUSIE_4 660
+#define TRAINER_BIKER_LUKAS_2 661
+#define TRAINER_BIRD_KEEPER_BENNY_2 662
+#define TRAINER_BIRD_KEEPER_BENNY_3 663
+#define TRAINER_BIRD_KEEPER_MARLON_2 664
+#define TRAINER_BIRD_KEEPER_MARLON_3 665
+#define TRAINER_BEAUTY_GRACE_2 666
+#define TRAINER_BIRD_KEEPER_CHESTER_2 667
+#define TRAINER_BIRD_KEEPER_CHESTER_3 668
+#define TRAINER_PICNICKER_BECKY_2 669
+#define TRAINER_PICNICKER_BECKY_3 670
+#define TRAINER_PICNICKER_BECKY_4 671
+#define TRAINER_CRUSH_KIN_RON_MYA_2 672
+#define TRAINER_CRUSH_KIN_RON_MYA_3 673
+#define TRAINER_CRUSH_KIN_RON_MYA_4 674
+#define TRAINER_BIKER_RUBEN_2 675
+#define TRAINER_CUE_BALL_CAMRON_2 676
+#define TRAINER_BIKER_JAXON_2 677
+#define TRAINER_CUE_BALL_ISAIAH_2 678
+#define TRAINER_CUE_BALL_COREY_2 679
+#define TRAINER_BIRD_KEEPER_JACOB_2 680
+#define TRAINER_BIRD_KEEPER_JACOB_3 681
+#define TRAINER_SWIMMER_FEMALE_ALICE_2 682
+#define TRAINER_SWIMMER_MALE_DARRIN_2 683
+#define TRAINER_PICNICKER_MISSY_2 684
+#define TRAINER_PICNICKER_MISSY_3 685
+#define TRAINER_FISHERMAN_WADE_2 686
+#define TRAINER_SWIMMER_MALE_JACK_2 687
+#define TRAINER_SIS_AND_BRO_LIL_IAN_2 688
+#define TRAINER_SIS_AND_BRO_LIL_IAN_3 689
+#define TRAINER_SWIMMER_MALE_FINN_2 690
+#define TRAINER_CRUSH_GIRL_SHARON_2 691
+#define TRAINER_CRUSH_GIRL_SHARON_3 692
+#define TRAINER_CRUSH_GIRL_TANYA_2 693
+#define TRAINER_CRUSH_GIRL_TANYA_3 694
+#define TRAINER_BLACK_BELT_SHEA_2 695
+#define TRAINER_BLACK_BELT_SHEA_3 696
+#define TRAINER_BLACK_BELT_HUGH_2 697
+#define TRAINER_BLACK_BELT_HUGH_3 698
+#define TRAINER_CRUSH_KIN_MIK_KIA_2 699
+#define TRAINER_CRUSH_KIN_MIK_KIA_3 700
+#define TRAINER_TUBER_AMIRA_2 701
+#define TRAINER_TWINS_JOY_MEG_2 702
+#define TRAINER_PAINTER_RAYNA_2 703
+#define TRAINER_YOUNGSTER_DESTIN_2 704
+#define TRAINER_PKMN_BREEDER_ALIZE_2 705
+#define TRAINER_YOUNG_COUPLE_GIA_JES_2 706
+#define TRAINER_YOUNG_COUPLE_GIA_JES_3 707
+#define TRAINER_BIRD_KEEPER_MILO_2 708
+#define TRAINER_BIRD_KEEPER_CHAZ_2 709
+#define TRAINER_BIRD_KEEPER_HAROLD_2 710
+#define TRAINER_SWIMMER_FEMALE_NICOLE_2 711
+#define TRAINER_PSYCHIC_JACLYN_2 712
+#define TRAINER_SWIMMER_MALE_SAMIR_2 713
+#define TRAINER_HIKER_EARL_2 714
+#define TRAINER_RUIN_MANIAC_LARRY_2 715
+#define TRAINER_POKEMANIAC_HECTOR_2 716
+#define TRAINER_PSYCHIC_DARIO_2 717
+#define TRAINER_PSYCHIC_RODETTE_2 718
+#define TRAINER_JUGGLER_MASON_2 719
+#define TRAINER_PKMN_RANGER_NICOLAS_2 720
+#define TRAINER_PKMN_RANGER_MADELINE_2 721
+#define TRAINER_CRUSH_GIRL_CYNDY_2 722
+#define TRAINER_TAMER_EVAN_2 723
+#define TRAINER_PKMN_RANGER_JACKSON_2 724
+#define TRAINER_PKMN_RANGER_KATELYN_2 725
+#define TRAINER_COOLTRAINER_LEROY_2 726
+#define TRAINER_COOLTRAINER_MICHELLE_2 727
+#define TRAINER_COOL_COUPLE_LEX_NYA_2 728
+#define TRAINER_BUG_CATCHER_COLTON_2 729
+#define TRAINER_BUG_CATCHER_COLTON_3 730
+#define TRAINER_BUG_CATCHER_COLTON_4 731
+#define TRAINER_SWIMMER_MALE_MATTHEW_2 732
+#define TRAINER_SWIMMER_MALE_TONY_2 733
+#define TRAINER_SWIMMER_FEMALE_MELISSA_2 734
+#define TRAINER_ELITE_FOUR_LORELEI_2 735
+#define TRAINER_ELITE_FOUR_BRUNO_2 736
+#define TRAINER_ELITE_FOUR_AGATHA_2 737
+#define TRAINER_ELITE_FOUR_LANCE_2 738
+#define TRAINER_CHAMPION_TERRY_4 739
+#define TRAINER_CHAMPION_TERRY_5 740
+#define TRAINER_CHAMPION_TERRY_6 741
+#define TRAINER_CUE_BALL_PAXTON 742
+#define NUM_TRAINERS 743
// All trainer parties specify the IV, level, and species for each Pokémon in the
// party. Some trainer parties also specify held items and custom moves for each
diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c
index afb792072..51b9c2762 100644
--- a/src/help_system_812B1E0.c
+++ b/src/help_system_812B1E0.c
@@ -1185,7 +1185,7 @@ static bool8 sub_812B780(u8 id)
case 30:
case 32:
case 33:
- return FlagGet(FLAG_UNK820);
+ return FlagGet(FLAG_0x820);
case 28:
case 40:
return sub_812BB10();
@@ -1251,7 +1251,7 @@ static bool8 sub_812B780(u8 id)
return TRUE;
return FALSE;
case 15:
- return FlagGet(FLAG_UNK820);
+ return FlagGet(FLAG_0x820);
case 16:
case 17:
return sub_812BB10();
@@ -1325,7 +1325,7 @@ static bool8 sub_812B780(u8 id)
switch (id)
{
case 5:
- return FlagGet(FLAG_UNK820);
+ return FlagGet(FLAG_0x820);
case 6:
return FlagGet(FLAG_0x821);
}
diff --git a/src/main_menu.c b/src/main_menu.c
index 72056d750..edb84afa2 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -671,7 +671,7 @@ static void PrintBadgeCount(void)
u8 *ptr;
u32 flagId;
u8 nbadges = 0;
- for (flagId = FLAG_UNK820; flagId < FLAG_UNK820 + 8; flagId++)
+ for (flagId = FLAG_0x820; flagId < FLAG_0x820 + 8; flagId++)
{
if (FlagGet(flagId))
nbadges++;
diff --git a/src/pokemon.c b/src/pokemon.c
index 5433dd593..20a3d10b7 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2362,25 +2362,25 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
// In FRLG, the Battle Tower and opponent checks are stubbed here.
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
- if (FlagGet(FLAG_UNK820)
+ if (FlagGet(FLAG_0x820)
&& !GetBattlerSide(battlerIdAtk))
attack = (110 * attack) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
- if (FlagGet(FLAG_UNK824)
+ if (FlagGet(FLAG_0x824)
&& !GetBattlerSide(battlerIdDef))
defense = (110 * defense) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
- if (FlagGet(FLAG_UNK826)
+ if (FlagGet(FLAG_0x826)
&& !GetBattlerSide(battlerIdAtk))
spAttack = (110 * spAttack) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
- if (FlagGet(FLAG_UNK826)
+ if (FlagGet(FLAG_0x826)
&& !GetBattlerSide(battlerIdDef))
spDefense = (110 * spDefense) / 100;
}
@@ -3634,7 +3634,7 @@ static u8 SendMonToPC(struct Pokemon* mon)
gSpecialVar_MonBoxId = boxNo;
gSpecialVar_MonBoxPos = boxPos;
if (get_unknown_box_id() != boxNo)
- FlagClear(FLAG_UNK843);
+ FlagClear(FLAG_0x843);
VarSet(VAR_0x4037, boxNo);
return MON_GIVEN_TO_PC;
}
diff --git a/src/trainers.c b/src/trainers.c
index 9b90ae294..cf778d297 100644
--- a/src/trainers.c
+++ b/src/trainers.c
@@ -11678,7 +11678,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_TRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_AQUA_LEADER,
+ .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11690,7 +11690,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_AQUA_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_AQUA_LEADER,
+ .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11702,7 +11702,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_AQUA,
+ .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11714,7 +11714,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_AQUA_2,
+ .trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11726,7 +11726,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_AROMA_LADY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_AROMA_LADY,
+ .trainerPic = TRAINER_PIC_RS_AROMA_LADY,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11738,7 +11738,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_RUIN_MANIAC,
+ .trainerPic = TRAINER_PIC_RS_RUIN_MANIAC,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11762,7 +11762,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TUBER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_TUBER,
+ .trainerPic = TRAINER_PIC_RS_TUBER_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11774,7 +11774,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TUBER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_TUBER_2,
+ .trainerPic = TRAINER_PIC_TUBER_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11786,7 +11786,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER,
+ .trainerPic = TRAINER_PIC_RS_COOLTRAINER_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11798,7 +11798,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_2,
+ .trainerPic = TRAINER_PIC_RS_COOLTRAINER_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11822,7 +11822,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LADY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_LADY,
+ .trainerPic = TRAINER_PIC_RS_LADY,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11834,7 +11834,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY,
+ .trainerPic = TRAINER_PIC_RS_BEAUTY,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11858,7 +11858,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC,
+ .trainerPic = TRAINER_PIC_RS_POKEMANIAC,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11870,7 +11870,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE,
+ .trainerPic = TRAINER_PIC_RS_SWIMMER_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11882,7 +11882,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT,
+ .trainerPic = TRAINER_PIC_RS_BLACK_BELT,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11918,7 +11918,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER,
+ .trainerPic = TRAINER_PIC_RS_CAMPER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11942,7 +11942,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_PSYCHIC,
+ .trainerPic = TRAINER_PIC_RS_PSYCHIC_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11954,7 +11954,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_PSYCHIC_2,
+ .trainerPic = TRAINER_PIC_RS_PSYCHIC_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11966,7 +11966,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
- .trainerPic = TRAINER_PIC_GENTLEMAN,
+ .trainerPic = TRAINER_PIC_RS_GENTLEMAN,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -11978,7 +11978,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_ELITE_FOUR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_SIDNEY,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_SIDNEY,
.trainerName = _("SIDNEY"),
.items = {},
.doubleBattle = FALSE,
@@ -11990,7 +11990,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_ELITE_FOUR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_PHOEBE,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_PHOEBE,
.trainerName = _("PHOEBE"),
.items = {},
.doubleBattle = FALSE,
@@ -12002,7 +12002,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_ROXANNE,
+ .trainerPic = TRAINER_PIC_LEADER_ROXANNE,
.trainerName = _("ROXANNE"),
.items = {},
.doubleBattle = FALSE,
@@ -12014,7 +12014,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BRAWLY,
+ .trainerPic = TRAINER_PIC_LEADER_BRAWLY,
.trainerName = _("BRAWLY"),
.items = {},
.doubleBattle = FALSE,
@@ -12026,7 +12026,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_TATE_LIZA,
+ .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
.trainerName = _("TATE&LIZA"),
.items = {},
.doubleBattle = TRUE,
@@ -12038,7 +12038,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SCHOOL_KID,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SCHOOL_KID,
+ .trainerPic = TRAINER_PIC_SCHOOL_KID_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12050,7 +12050,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SCHOOL_KID,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SCHOOL_KID_2,
+ .trainerPic = TRAINER_PIC_SCHOOL_KID_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12074,7 +12074,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
- .trainerPic = TRAINER_PIC_POKEFAN,
+ .trainerPic = TRAINER_PIC_POKEFAN_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12086,7 +12086,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
- .trainerPic = TRAINER_PIC_POKEFAN_2,
+ .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12098,7 +12098,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_EXPERT,
+ .trainerPic = TRAINER_PIC_EXPERT_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12110,7 +12110,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_EXPERT_2,
+ .trainerPic = TRAINER_PIC_EXPERT_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12122,7 +12122,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BOARDER,
+ .trainerPic = TRAINER_PIC_RS_YOUNGSTER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12134,7 +12134,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CHAMPION,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CHAMPION,
+ .trainerPic = TRAINER_PIC_CHAMPION_STEVEN,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12146,7 +12146,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN,
+ .trainerPic = TRAINER_PIC_RS_FISHERMAN,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12158,7 +12158,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_TRIATHLETE,
+ .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12170,7 +12170,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_TRIATHLETE_2,
+ .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12182,7 +12182,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_TRIATHLETE_3,
+ .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12194,7 +12194,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_TRIATHLETE_4,
+ .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12206,7 +12206,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_TRIATHLETE_5,
+ .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12218,7 +12218,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_TRIATHLETE_6,
+ .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12242,7 +12242,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER,
+ .trainerPic = TRAINER_PIC_RS_BIRD_KEEPER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12290,7 +12290,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE,
+ .trainerPic = TRAINER_PIC_RS_SWIMMER_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12302,7 +12302,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_PICNICKER,
+ .trainerPic = TRAINER_PIC_RS_PICNICKER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12314,7 +12314,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
- .trainerPic = TRAINER_PIC_TWINS,
+ .trainerPic = TRAINER_PIC_RS_TWINS,
.trainerName = _(""),
.items = {},
.doubleBattle = TRUE,
@@ -12326,7 +12326,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SAILOR,
+ .trainerPic = TRAINER_PIC_RS_SAILOR,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12338,7 +12338,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BOARDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BOARDER,
+ .trainerPic = TRAINER_PIC_RS_YOUNGSTER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12350,7 +12350,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BOARDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BOARDER,
+ .trainerPic = TRAINER_PIC_RS_YOUNGSTER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12374,7 +12374,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_TRAINER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_PKMN_TRAINER,
+ .trainerPic = TRAINER_PIC_WALLY,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12386,7 +12386,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_TRAINER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_PKMN_TRAINER_2,
+ .trainerPic = TRAINER_PIC_RS_BRENDAN_1,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12398,7 +12398,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_TRAINER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_PKMN_TRAINER_2,
+ .trainerPic = TRAINER_PIC_RS_BRENDAN_1,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12410,7 +12410,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_TRAINER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_PKMN_TRAINER_2,
+ .trainerPic = TRAINER_PIC_RS_BRENDAN_1,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12422,7 +12422,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_TRAINER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_TRAINER_3,
+ .trainerPic = TRAINER_PIC_RS_MAY_1,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12434,7 +12434,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_TRAINER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_TRAINER_3,
+ .trainerPic = TRAINER_PIC_RS_MAY_1,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12446,7 +12446,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_TRAINER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_TRAINER_3,
+ .trainerPic = TRAINER_PIC_RS_MAY_1,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12458,7 +12458,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_BREEDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_PKMN_BREEDER,
+ .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12470,7 +12470,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_BREEDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_BREEDER_2,
+ .trainerPic = TRAINER_PIC_RS_POKEMON_BREEDER_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12482,7 +12482,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_PKMN_RANGER,
+ .trainerPic = TRAINER_PIC_RS_POKEMON_RANGER_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12494,7 +12494,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_2,
+ .trainerPic = TRAINER_PIC_RS_POKEMON_RANGER_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12506,7 +12506,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_MAGMA_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
- .trainerPic = TRAINER_PIC_MAGMA_LEADER,
+ .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12518,7 +12518,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
- .trainerPic = TRAINER_PIC_TEAM_MAGMA,
+ .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12530,7 +12530,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
- .trainerPic = TRAINER_PIC_TEAM_MAGMA_2,
+ .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12542,7 +12542,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_LASS,
+ .trainerPic = TRAINER_PIC_RS_LASS,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12554,7 +12554,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER,
+ .trainerPic = TRAINER_PIC_RS_BUG_CATCHER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12566,7 +12566,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER,
+ .trainerPic = TRAINER_PIC_RS_HIKER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -12578,7 +12578,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_YOUNG_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
+ .trainerPic = TRAINER_PIC_RS_YOUNG_COUPLE,
.trainerName = _(""),
.items = {},
.doubleBattle = TRUE,
@@ -12602,7 +12602,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SIS_AND_BRO,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SIS_AND_BRO,
+ .trainerPic = TRAINER_PIC_RS_SIS_AND_BRO,
.trainerName = _(""),
.items = {},
.doubleBattle = TRUE,
@@ -12614,7 +12614,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_AQUA_ADMIN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_MATT,
+ .trainerPic = TRAINER_PIC_AQUA_ADMIN_M,
.trainerName = _("MATT"),
.items = {},
.doubleBattle = FALSE,
@@ -12626,7 +12626,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_AQUA_ADMIN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_SHELLY,
+ .trainerPic = TRAINER_PIC_AQUA_ADMIN_F,
.trainerName = _("SHELLY"),
.items = {},
.doubleBattle = FALSE,
@@ -12638,7 +12638,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_MAGMA_ADMIN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
- .trainerPic = TRAINER_PIC_TABITHA,
+ .trainerPic = TRAINER_PIC_MAGMA_ADMIN_M,
.trainerName = _("TABITHA"),
.items = {},
.doubleBattle = FALSE,
@@ -12650,7 +12650,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_MAGMA_ADMIN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
- .trainerPic = TRAINER_PIC_COURTNEY,
+ .trainerPic = TRAINER_PIC_MAGMA_ADMIN_F,
.trainerName = _("COURTNEY"),
.items = {},
.doubleBattle = FALSE,
@@ -12662,7 +12662,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_WATTSON,
+ .trainerPic = TRAINER_PIC_LEADER_WATTSON,
.trainerName = _("WATTSON"),
.items = {},
.doubleBattle = FALSE,
@@ -12674,7 +12674,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_FLANNERY,
+ .trainerPic = TRAINER_PIC_LEADER_FLANNERY,
.trainerName = _("FLANNERY"),
.items = {},
.doubleBattle = FALSE,
@@ -12686,7 +12686,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_NORMAN,
+ .trainerPic = TRAINER_PIC_LEADER_NORMAN,
.trainerName = _("NORMAN"),
.items = {},
.doubleBattle = FALSE,
@@ -12698,7 +12698,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_WINONA,
+ .trainerPic = TRAINER_PIC_LEADER_WINONA,
.trainerName = _("WINONA"),
.items = {},
.doubleBattle = FALSE,
@@ -12710,7 +12710,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_WALLACE,
+ .trainerPic = TRAINER_PIC_LEADER_WALLACE,
.trainerName = _("WALLACE"),
.items = {},
.doubleBattle = FALSE,
@@ -12722,7 +12722,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_ELITE_FOUR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_GLACIA,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_GLACIA,
.trainerName = _("GLACIA"),
.items = {},
.doubleBattle = FALSE,
@@ -12734,7 +12734,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_ELITE_FOUR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_DRAKE,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_DRAKE,
.trainerName = _("DRAKE"),
.items = {},
.doubleBattle = FALSE,
@@ -12902,7 +12902,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("RICK"),
.items = {},
.doubleBattle = FALSE,
@@ -12914,7 +12914,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("DOUG"),
.items = {},
.doubleBattle = FALSE,
@@ -12926,7 +12926,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("SAMMY"),
.items = {},
.doubleBattle = FALSE,
@@ -12938,7 +12938,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("COLTON"),
.items = {},
.doubleBattle = FALSE,
@@ -12950,7 +12950,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("GREG"),
.items = {},
.doubleBattle = FALSE,
@@ -12962,7 +12962,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("JAMES"),
.items = {},
.doubleBattle = FALSE,
@@ -12974,7 +12974,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("KENT"),
.items = {},
.doubleBattle = FALSE,
@@ -12986,7 +12986,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("ROBBY"),
.items = {},
.doubleBattle = FALSE,
@@ -12998,7 +12998,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("CALE"),
.items = {},
.doubleBattle = FALSE,
@@ -13010,7 +13010,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("KEIGO"),
.items = {},
.doubleBattle = FALSE,
@@ -13022,7 +13022,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("ELIJAH"),
.items = {},
.doubleBattle = FALSE,
@@ -13034,7 +13034,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -13046,7 +13046,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("BRENT"),
.items = {},
.doubleBattle = FALSE,
@@ -13058,7 +13058,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("CONNER"),
.items = {},
.doubleBattle = FALSE,
@@ -13070,7 +13070,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("JANICE"),
.items = {},
.doubleBattle = FALSE,
@@ -13082,7 +13082,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("SALLY"),
.items = {},
.doubleBattle = FALSE,
@@ -13094,7 +13094,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("ROBIN"),
.items = {},
.doubleBattle = FALSE,
@@ -13106,7 +13106,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("CRISSY"),
.items = {},
.doubleBattle = FALSE,
@@ -13118,7 +13118,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("MIRIAM"),
.items = {},
.doubleBattle = FALSE,
@@ -13130,7 +13130,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("IRIS"),
.items = {},
.doubleBattle = FALSE,
@@ -13142,7 +13142,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("RELI"),
.items = {},
.doubleBattle = FALSE,
@@ -13154,7 +13154,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("ALI"),
.items = {},
.doubleBattle = FALSE,
@@ -13166,7 +13166,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -13178,7 +13178,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("HALEY"),
.items = {},
.doubleBattle = FALSE,
@@ -13190,7 +13190,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("ANN"),
.items = {},
.doubleBattle = FALSE,
@@ -13202,7 +13202,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("DAWN"),
.items = {},
.doubleBattle = FALSE,
@@ -13214,7 +13214,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("PAIGE"),
.items = {},
.doubleBattle = FALSE,
@@ -13226,7 +13226,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("ANDREA"),
.items = {},
.doubleBattle = FALSE,
@@ -13238,7 +13238,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("MEGAN"),
.items = {},
.doubleBattle = FALSE,
@@ -13250,7 +13250,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("JULIA"),
.items = {},
.doubleBattle = FALSE,
@@ -13262,7 +13262,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("KAY"),
.items = {},
.doubleBattle = FALSE,
@@ -13274,7 +13274,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("LISA"),
.items = {},
.doubleBattle = FALSE,
@@ -13286,7 +13286,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SAILOR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SAILOR_2,
+ .trainerPic = TRAINER_PIC_SAILOR,
.trainerName = _("EDMOND"),
.items = {},
.doubleBattle = FALSE,
@@ -13298,7 +13298,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SAILOR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SAILOR_2,
+ .trainerPic = TRAINER_PIC_SAILOR,
.trainerName = _("TREVOR"),
.items = {},
.doubleBattle = FALSE,
@@ -13310,7 +13310,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SAILOR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SAILOR_2,
+ .trainerPic = TRAINER_PIC_SAILOR,
.trainerName = _("LEONARD"),
.items = {},
.doubleBattle = FALSE,
@@ -13322,7 +13322,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SAILOR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SAILOR_2,
+ .trainerPic = TRAINER_PIC_SAILOR,
.trainerName = _("DUNCAN"),
.items = {},
.doubleBattle = FALSE,
@@ -13334,7 +13334,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SAILOR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SAILOR_2,
+ .trainerPic = TRAINER_PIC_SAILOR,
.trainerName = _("HUEY"),
.items = {},
.doubleBattle = FALSE,
@@ -13346,7 +13346,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SAILOR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SAILOR_2,
+ .trainerPic = TRAINER_PIC_SAILOR,
.trainerName = _("DYLAN"),
.items = {},
.doubleBattle = FALSE,
@@ -13358,7 +13358,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SAILOR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SAILOR_2,
+ .trainerPic = TRAINER_PIC_SAILOR,
.trainerName = _("PHILLIP"),
.items = {},
.doubleBattle = FALSE,
@@ -13370,7 +13370,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SAILOR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_SAILOR_2,
+ .trainerPic = TRAINER_PIC_SAILOR,
.trainerName = _("DWAYNE"),
.items = {},
.doubleBattle = FALSE,
@@ -13382,7 +13382,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("LIAM"),
.items = {},
.doubleBattle = FALSE,
@@ -13394,7 +13394,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("SHANE"),
.items = {},
.doubleBattle = FALSE,
@@ -13406,7 +13406,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("ETHAN"),
.items = {},
.doubleBattle = FALSE,
@@ -13418,7 +13418,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("RICKY"),
.items = {},
.doubleBattle = FALSE,
@@ -13430,7 +13430,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("JEFF"),
.items = {},
.doubleBattle = FALSE,
@@ -13442,7 +13442,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -13454,7 +13454,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("CHRIS"),
.items = {},
.doubleBattle = FALSE,
@@ -13466,7 +13466,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("DREW"),
.items = {},
.doubleBattle = FALSE,
@@ -13478,7 +13478,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("DIANA"),
.items = {},
.doubleBattle = FALSE,
@@ -13490,7 +13490,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("NANCY"),
.items = {},
.doubleBattle = FALSE,
@@ -13502,7 +13502,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ISABELLE"),
.items = {},
.doubleBattle = FALSE,
@@ -13514,7 +13514,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("KELSEY"),
.items = {},
.doubleBattle = FALSE,
@@ -13526,7 +13526,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ALICIA"),
.items = {},
.doubleBattle = FALSE,
@@ -13538,7 +13538,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("CAITLIN"),
.items = {},
.doubleBattle = FALSE,
@@ -13550,7 +13550,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("HEIDI"),
.items = {},
.doubleBattle = FALSE,
@@ -13562,7 +13562,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("CAROL"),
.items = {},
.doubleBattle = FALSE,
@@ -13574,7 +13574,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("SOFIA"),
.items = {},
.doubleBattle = FALSE,
@@ -13586,7 +13586,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("MARTHA"),
.items = {},
.doubleBattle = FALSE,
@@ -13598,7 +13598,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("TINA"),
.items = {},
.doubleBattle = FALSE,
@@ -13610,7 +13610,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("HANNAH"),
.items = {},
.doubleBattle = FALSE,
@@ -13622,7 +13622,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("MARK"),
.items = {},
.doubleBattle = FALSE,
@@ -13634,7 +13634,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("HERMAN"),
.items = {},
.doubleBattle = FALSE,
@@ -13646,7 +13646,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("COOPER"),
.items = {},
.doubleBattle = FALSE,
@@ -13658,7 +13658,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("STEVE"),
.items = {},
.doubleBattle = FALSE,
@@ -13670,7 +13670,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("WINSTON"),
.items = {},
.doubleBattle = FALSE,
@@ -13682,7 +13682,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("DAWSON"),
.items = {},
.doubleBattle = FALSE,
@@ -13694,7 +13694,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("ASHTON"),
.items = {},
.doubleBattle = FALSE,
@@ -13850,7 +13850,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("MARCOS"),
.items = {},
.doubleBattle = FALSE,
@@ -13862,7 +13862,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("FRANKLIN"),
.items = {},
.doubleBattle = FALSE,
@@ -13874,7 +13874,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("NOB"),
.items = {},
.doubleBattle = FALSE,
@@ -13886,7 +13886,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("WAYNE"),
.items = {},
.doubleBattle = FALSE,
@@ -13898,7 +13898,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("ALAN"),
.items = {},
.doubleBattle = FALSE,
@@ -13910,7 +13910,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("BRICE"),
.items = {},
.doubleBattle = FALSE,
@@ -13922,7 +13922,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("CLARK"),
.items = {},
.doubleBattle = FALSE,
@@ -13934,7 +13934,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("TRENT"),
.items = {},
.doubleBattle = FALSE,
@@ -13946,7 +13946,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("DUDLEY"),
.items = {},
.doubleBattle = FALSE,
@@ -13958,7 +13958,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("ALLEN"),
.items = {},
.doubleBattle = FALSE,
@@ -13970,7 +13970,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("ERIC"),
.items = {},
.doubleBattle = FALSE,
@@ -13982,7 +13982,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("LENNY"),
.items = {},
.doubleBattle = FALSE,
@@ -13994,7 +13994,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("OLIVER"),
.items = {},
.doubleBattle = FALSE,
@@ -14006,7 +14006,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("LUCAS"),
.items = {},
.doubleBattle = FALSE,
@@ -14354,7 +14354,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("DALE"),
.items = {},
.doubleBattle = FALSE,
@@ -14366,7 +14366,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("BARNY"),
.items = {},
.doubleBattle = FALSE,
@@ -14378,7 +14378,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("NED"),
.items = {},
.doubleBattle = FALSE,
@@ -14390,7 +14390,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("CHIP"),
.items = {},
.doubleBattle = FALSE,
@@ -14402,7 +14402,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("HANK"),
.items = {},
.doubleBattle = FALSE,
@@ -14414,7 +14414,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("ELLIOT"),
.items = {},
.doubleBattle = FALSE,
@@ -14426,7 +14426,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("RONALD"),
.items = {},
.doubleBattle = FALSE,
@@ -14438,7 +14438,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("CLAUDE"),
.items = {},
.doubleBattle = FALSE,
@@ -14450,7 +14450,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("WADE"),
.items = {},
.doubleBattle = FALSE,
@@ -14462,7 +14462,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("NOLAN"),
.items = {},
.doubleBattle = FALSE,
@@ -14474,7 +14474,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("ANDREW"),
.items = {},
.doubleBattle = FALSE,
@@ -14486,7 +14486,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("LUIS"),
.items = {},
.doubleBattle = FALSE,
@@ -14498,7 +14498,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("RICHARD"),
.items = {},
.doubleBattle = FALSE,
@@ -14510,7 +14510,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("REECE"),
.items = {},
.doubleBattle = FALSE,
@@ -14522,7 +14522,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("MATTHEW"),
.items = {},
.doubleBattle = FALSE,
@@ -14534,7 +14534,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("DOUGLAS"),
.items = {},
.doubleBattle = FALSE,
@@ -14546,7 +14546,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("DAVID"),
.items = {},
.doubleBattle = FALSE,
@@ -14558,7 +14558,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("TONY"),
.items = {},
.doubleBattle = FALSE,
@@ -14570,7 +14570,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("AXLE"),
.items = {},
.doubleBattle = FALSE,
@@ -14582,7 +14582,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("BARRY"),
.items = {},
.doubleBattle = FALSE,
@@ -14594,7 +14594,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("DEAN"),
.items = {},
.doubleBattle = FALSE,
@@ -14606,7 +14606,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("DARRIN"),
.items = {},
.doubleBattle = FALSE,
@@ -14618,7 +14618,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("SPENCER"),
.items = {},
.doubleBattle = FALSE,
@@ -14630,7 +14630,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("JACK"),
.items = {},
.doubleBattle = FALSE,
@@ -14642,7 +14642,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("JEROME"),
.items = {},
.doubleBattle = FALSE,
@@ -14654,7 +14654,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("ROLAND"),
.items = {},
.doubleBattle = FALSE,
@@ -14858,7 +14858,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY_2,
+ .trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("BRIDGET"),
.items = {},
.doubleBattle = FALSE,
@@ -14870,7 +14870,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY_2,
+ .trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("TAMIA"),
.items = {},
.doubleBattle = FALSE,
@@ -14882,7 +14882,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY_2,
+ .trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("LORI"),
.items = {},
.doubleBattle = FALSE,
@@ -14894,7 +14894,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY_2,
+ .trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("LOLA"),
.items = {},
.doubleBattle = FALSE,
@@ -14906,7 +14906,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY_2,
+ .trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("SHEILA"),
.items = {},
.doubleBattle = FALSE,
@@ -14918,7 +14918,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("TIFFANY"),
.items = {},
.doubleBattle = FALSE,
@@ -14930,7 +14930,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("NORA"),
.items = {},
.doubleBattle = FALSE,
@@ -14942,7 +14942,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("MELISSA"),
.items = {},
.doubleBattle = FALSE,
@@ -14954,7 +14954,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY_2,
+ .trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("GRACE"),
.items = {},
.doubleBattle = FALSE,
@@ -14966,7 +14966,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY_2,
+ .trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("OLIVIA"),
.items = {},
.doubleBattle = FALSE,
@@ -14978,7 +14978,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("LAUREN"),
.items = {},
.doubleBattle = FALSE,
@@ -14990,7 +14990,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("ANYA"),
.items = {},
.doubleBattle = FALSE,
@@ -15002,7 +15002,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("ALICE"),
.items = {},
.doubleBattle = FALSE,
@@ -15014,7 +15014,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("CONNIE"),
.items = {},
.doubleBattle = FALSE,
@@ -15026,7 +15026,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("SHIRLEY"),
.items = {},
.doubleBattle = FALSE,
@@ -15038,7 +15038,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_PSYCHIC_3,
+ .trainerPic = TRAINER_PIC_PSYCHIC_M,
.trainerName = _("JOHAN"),
.items = {},
.doubleBattle = FALSE,
@@ -15050,7 +15050,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_PSYCHIC_3,
+ .trainerPic = TRAINER_PIC_PSYCHIC_M,
.trainerName = _("TYRON"),
.items = {},
.doubleBattle = FALSE,
@@ -15062,7 +15062,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_PSYCHIC_3,
+ .trainerPic = TRAINER_PIC_PSYCHIC_M,
.trainerName = _("CAMERON"),
.items = {},
.doubleBattle = FALSE,
@@ -15074,7 +15074,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_PSYCHIC_3,
+ .trainerPic = TRAINER_PIC_PSYCHIC_M,
.trainerName = _("PRESTON"),
.items = {},
.doubleBattle = FALSE,
@@ -15278,7 +15278,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("SEBASTIAN"),
.items = {},
.doubleBattle = FALSE,
@@ -15290,7 +15290,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("PERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15302,7 +15302,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("ROBERT"),
.items = {},
.doubleBattle = FALSE,
@@ -15314,7 +15314,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("DONALD"),
.items = {},
.doubleBattle = FALSE,
@@ -15326,7 +15326,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("BENNY"),
.items = {},
.doubleBattle = FALSE,
@@ -15338,7 +15338,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("EDWIN"),
.items = {},
.doubleBattle = FALSE,
@@ -15350,7 +15350,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("CHESTER"),
.items = {},
.doubleBattle = FALSE,
@@ -15362,7 +15362,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("WILTON"),
.items = {},
.doubleBattle = FALSE,
@@ -15374,7 +15374,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("RAMIRO"),
.items = {},
.doubleBattle = FALSE,
@@ -15386,7 +15386,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("JACOB"),
.items = {},
.doubleBattle = FALSE,
@@ -15398,7 +15398,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("ROGER"),
.items = {},
.doubleBattle = FALSE,
@@ -15410,7 +15410,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("REED"),
.items = {},
.doubleBattle = FALSE,
@@ -15422,7 +15422,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("KEITH"),
.items = {},
.doubleBattle = FALSE,
@@ -15434,7 +15434,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("CARTER"),
.items = {},
.doubleBattle = FALSE,
@@ -15446,7 +15446,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("MITCH"),
.items = {},
.doubleBattle = FALSE,
@@ -15458,7 +15458,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("BECK"),
.items = {},
.doubleBattle = FALSE,
@@ -15470,7 +15470,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("MARLON"),
.items = {},
.doubleBattle = FALSE,
@@ -15482,7 +15482,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("KOICHI"),
.items = {},
.doubleBattle = FALSE,
@@ -15494,7 +15494,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("MIKE"),
.items = {},
.doubleBattle = FALSE,
@@ -15506,7 +15506,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("HIDEKI"),
.items = {},
.doubleBattle = FALSE,
@@ -15518,7 +15518,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("AARON"),
.items = {},
.doubleBattle = FALSE,
@@ -15530,7 +15530,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("HITOSHI"),
.items = {},
.doubleBattle = FALSE,
@@ -15542,7 +15542,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("ATSUSHI"),
.items = {},
.doubleBattle = FALSE,
@@ -15554,7 +15554,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("KIYO"),
.items = {},
.doubleBattle = FALSE,
@@ -15566,7 +15566,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("TAKASHI"),
.items = {},
.doubleBattle = FALSE,
@@ -15578,7 +15578,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("DAISUKE"),
.items = {},
.doubleBattle = FALSE,
@@ -15590,7 +15590,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL,
+ .trainerPic = TRAINER_PIC_RIVAL_1,
.trainerName = _("TERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15602,7 +15602,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL,
+ .trainerPic = TRAINER_PIC_RIVAL_1,
.trainerName = _("TERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15614,7 +15614,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL,
+ .trainerPic = TRAINER_PIC_RIVAL_1,
.trainerName = _("TERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15626,7 +15626,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL,
+ .trainerPic = TRAINER_PIC_RIVAL_1,
.trainerName = _("TERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15638,7 +15638,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL,
+ .trainerPic = TRAINER_PIC_RIVAL_1,
.trainerName = _("TERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15650,7 +15650,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL,
+ .trainerPic = TRAINER_PIC_RIVAL_1,
.trainerName = _("TERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15662,7 +15662,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL,
+ .trainerPic = TRAINER_PIC_RIVAL_1,
.trainerName = _("TERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15674,7 +15674,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL,
+ .trainerPic = TRAINER_PIC_RIVAL_1,
.trainerName = _("TERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15686,7 +15686,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL,
+ .trainerPic = TRAINER_PIC_RIVAL_1,
.trainerName = _("TERRY"),
.items = {},
.doubleBattle = FALSE,
@@ -15854,7 +15854,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BOSS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_BOSS,
+ .trainerPic = TRAINER_PIC_LEADER_GIOVANNI,
.trainerName = _("GIOVANNI"),
.items = {},
.doubleBattle = FALSE,
@@ -15866,7 +15866,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BOSS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_BOSS,
+ .trainerPic = TRAINER_PIC_LEADER_GIOVANNI,
.trainerName = _("GIOVANNI"),
.items = {},
.doubleBattle = FALSE,
@@ -15878,7 +15878,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_LEADER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_BOSS,
+ .trainerPic = TRAINER_PIC_LEADER_GIOVANNI,
.trainerName = _("GIOVANNI"),
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL},
.doubleBattle = FALSE,
@@ -15890,7 +15890,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -15902,7 +15902,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -15914,7 +15914,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -15926,7 +15926,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -15938,7 +15938,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -15950,7 +15950,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -15962,7 +15962,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -15974,7 +15974,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -15986,7 +15986,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -15998,7 +15998,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16010,7 +16010,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16022,7 +16022,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16034,7 +16034,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16046,7 +16046,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16058,7 +16058,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16070,7 +16070,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16082,7 +16082,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16094,7 +16094,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16106,7 +16106,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16118,7 +16118,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16130,7 +16130,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16142,7 +16142,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16154,7 +16154,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16166,7 +16166,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16178,7 +16178,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16190,7 +16190,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16202,7 +16202,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16214,7 +16214,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16226,7 +16226,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16238,7 +16238,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16250,7 +16250,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16262,7 +16262,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16274,7 +16274,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16286,7 +16286,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16298,7 +16298,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16310,7 +16310,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16322,7 +16322,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16334,7 +16334,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16346,7 +16346,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16358,7 +16358,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16370,7 +16370,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -16382,7 +16382,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("SAMUEL"),
.items = {ITEM_SUPER_POTION},
.doubleBattle = FALSE,
@@ -16394,7 +16394,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("GEORGE"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16406,7 +16406,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("COLBY"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16418,7 +16418,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("PAUL"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16430,7 +16430,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("ROLANDO"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16442,7 +16442,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("GILBERT"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16454,7 +16454,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("OWEN"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16466,7 +16466,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("BERKE"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16478,7 +16478,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("YUJI"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16490,7 +16490,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("WARREN"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16502,7 +16502,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("MARY"),
.items = {ITEM_SUPER_POTION},
.doubleBattle = FALSE,
@@ -16514,7 +16514,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("CAROLINE"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16526,7 +16526,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("ALEXA"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16538,7 +16538,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("SHANNON"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16550,7 +16550,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("NAOMI"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16562,7 +16562,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("BROOKE"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16574,7 +16574,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("AUSTINA"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16586,7 +16586,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("JULIE"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -16598,7 +16598,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_ELITE_FOUR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LORELEI,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_LORELEI,
.trainerName = _("LORELEI"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16610,7 +16610,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_ELITE_FOUR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_BRUNO,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_BRUNO,
.trainerName = _("BRUNO"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16622,7 +16622,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_ELITE_FOUR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_AGATHA,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_AGATHA,
.trainerName = _("AGATHA"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16634,7 +16634,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_ELITE_FOUR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_LANCE,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_LANCE,
.trainerName = _("LANCE"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16646,7 +16646,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_LEADER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BROCK,
+ .trainerPic = TRAINER_PIC_LEADER_BROCK,
.trainerName = _("BROCK"),
.items = {},
.doubleBattle = FALSE,
@@ -16658,7 +16658,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_LEADER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_MISTY,
+ .trainerPic = TRAINER_PIC_LEADER_MISTY,
.trainerName = _("MISTY"),
.items = {ITEM_SUPER_POTION},
.doubleBattle = FALSE,
@@ -16670,7 +16670,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_LEADER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_LT_SURGE,
+ .trainerPic = TRAINER_PIC_LEADER_LT_SURGE,
.trainerName = _("LT. SURGE"),
.items = {ITEM_SUPER_POTION, ITEM_FULL_HEAL},
.doubleBattle = FALSE,
@@ -16682,7 +16682,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_LEADER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_ERIKA,
+ .trainerPic = TRAINER_PIC_LEADER_ERIKA,
.trainerName = _("ERIKA"),
.items = {ITEM_HYPER_POTION, ITEM_FULL_HEAL},
.doubleBattle = FALSE,
@@ -16694,7 +16694,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_LEADER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_KOGA,
+ .trainerPic = TRAINER_PIC_LEADER_KOGA,
.trainerName = _("KOGA"),
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL},
.doubleBattle = FALSE,
@@ -16706,7 +16706,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_LEADER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BLAINE,
+ .trainerPic = TRAINER_PIC_LEADER_BLAINE,
.trainerName = _("BLAINE"),
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL},
.doubleBattle = FALSE,
@@ -16718,7 +16718,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_LEADER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SABRINA,
+ .trainerPic = TRAINER_PIC_LEADER_SABRINA,
.trainerName = _("SABRINA"),
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL},
.doubleBattle = FALSE,
@@ -16730,7 +16730,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_GENTLEMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
- .trainerPic = TRAINER_PIC_GENTLEMAN_2,
+ .trainerPic = TRAINER_PIC_GENTLEMAN,
.trainerName = _("THOMAS"),
.items = {},
.doubleBattle = FALSE,
@@ -16742,7 +16742,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_GENTLEMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
- .trainerPic = TRAINER_PIC_GENTLEMAN_2,
+ .trainerPic = TRAINER_PIC_GENTLEMAN,
.trainerName = _("ARTHUR"),
.items = {},
.doubleBattle = FALSE,
@@ -16754,7 +16754,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_GENTLEMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
- .trainerPic = TRAINER_PIC_GENTLEMAN_2,
+ .trainerPic = TRAINER_PIC_GENTLEMAN,
.trainerName = _("TUCKER"),
.items = {},
.doubleBattle = FALSE,
@@ -16766,7 +16766,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_GENTLEMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
- .trainerPic = TRAINER_PIC_GENTLEMAN_2,
+ .trainerPic = TRAINER_PIC_GENTLEMAN,
.trainerName = _("NORTON"),
.items = {},
.doubleBattle = FALSE,
@@ -16778,7 +16778,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_GENTLEMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
- .trainerPic = TRAINER_PIC_GENTLEMAN_2,
+ .trainerPic = TRAINER_PIC_GENTLEMAN,
.trainerName = _("WALTER"),
.items = {},
.doubleBattle = FALSE,
@@ -16934,7 +16934,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_CHAMPION_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL_3,
+ .trainerPic = TRAINER_PIC_CHAMPION_RIVAL,
.trainerName = _("TERRY"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16946,7 +16946,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_CHAMPION_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL_3,
+ .trainerPic = TRAINER_PIC_CHAMPION_RIVAL,
.trainerName = _("TERRY"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -16958,7 +16958,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_CHAMPION_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL_3,
+ .trainerPic = TRAINER_PIC_CHAMPION_RIVAL,
.trainerName = _("TERRY"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -17258,7 +17258,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("JEREMY"),
.items = {},
.doubleBattle = FALSE,
@@ -17270,7 +17270,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ALMA"),
.items = {},
.doubleBattle = FALSE,
@@ -17282,7 +17282,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("SUSIE"),
.items = {},
.doubleBattle = FALSE,
@@ -17294,7 +17294,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("VALERIE"),
.items = {},
.doubleBattle = FALSE,
@@ -17306,7 +17306,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("GWEN"),
.items = {},
.doubleBattle = FALSE,
@@ -17330,7 +17330,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("FLINT"),
.items = {},
.doubleBattle = FALSE,
@@ -17342,7 +17342,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("MISSY"),
.items = {},
.doubleBattle = FALSE,
@@ -17354,7 +17354,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("IRENE"),
.items = {},
.doubleBattle = FALSE,
@@ -17366,7 +17366,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("DANA"),
.items = {},
.doubleBattle = FALSE,
@@ -17378,7 +17378,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ARIANA"),
.items = {},
.doubleBattle = FALSE,
@@ -17390,7 +17390,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("LEAH"),
.items = {},
.doubleBattle = FALSE,
@@ -17402,7 +17402,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("JUSTIN"),
.items = {},
.doubleBattle = FALSE,
@@ -17414,7 +17414,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("YAZMIN"),
.items = {},
.doubleBattle = FALSE,
@@ -17426,7 +17426,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("KINDRA"),
.items = {},
.doubleBattle = FALSE,
@@ -17438,7 +17438,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("BECKY"),
.items = {},
.doubleBattle = FALSE,
@@ -17450,7 +17450,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("CELIA"),
.items = {},
.doubleBattle = FALSE,
@@ -17462,7 +17462,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_GENTLEMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
- .trainerPic = TRAINER_PIC_GENTLEMAN_2,
+ .trainerPic = TRAINER_PIC_GENTLEMAN,
.trainerName = _("BROOKS"),
.items = {},
.doubleBattle = FALSE,
@@ -17474,7 +17474,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_GENTLEMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
- .trainerPic = TRAINER_PIC_GENTLEMAN_2,
+ .trainerPic = TRAINER_PIC_GENTLEMAN,
.trainerName = _("LAMAR"),
.items = {},
.doubleBattle = FALSE,
@@ -17486,7 +17486,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TWINS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
- .trainerPic = TRAINER_PIC_TWINS_2,
+ .trainerPic = TRAINER_PIC_TWINS,
.trainerName = _("ELI & ANNE"),
.items = {},
.doubleBattle = TRUE,
@@ -17510,7 +17510,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_YOUNG_COUPLE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2,
+ .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
.trainerName = _("GIA & JES"),
.items = {},
.doubleBattle = TRUE,
@@ -17522,7 +17522,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TWINS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
- .trainerPic = TRAINER_PIC_TWINS_2,
+ .trainerPic = TRAINER_PIC_TWINS,
.trainerName = _("KIRI & JAN"),
.items = {},
.doubleBattle = TRUE,
@@ -17546,7 +17546,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_YOUNG_COUPLE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2,
+ .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
.trainerName = _("LEA & JED"),
.items = {},
.doubleBattle = TRUE,
@@ -17558,7 +17558,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SIS_AND_BRO_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SIS_AND_BRO_2,
+ .trainerPic = TRAINER_PIC_SIS_AND_BRO,
.trainerName = _("LIA & LUC"),
.items = {},
.doubleBattle = TRUE,
@@ -17570,7 +17570,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SIS_AND_BRO_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SIS_AND_BRO_2,
+ .trainerPic = TRAINER_PIC_SIS_AND_BRO,
.trainerName = _("LIL & IAN"),
.items = {},
.doubleBattle = TRUE,
@@ -17582,7 +17582,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -17594,7 +17594,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -17606,7 +17606,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -17618,7 +17618,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -17630,7 +17630,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -17642,7 +17642,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _(""),
.items = {},
.doubleBattle = FALSE,
@@ -17690,7 +17690,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("RELI"),
.items = {},
.doubleBattle = FALSE,
@@ -17702,7 +17702,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("RELI"),
.items = {},
.doubleBattle = FALSE,
@@ -17762,7 +17762,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("JANICE"),
.items = {},
.doubleBattle = FALSE,
@@ -17774,7 +17774,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("JANICE"),
.items = {},
.doubleBattle = FALSE,
@@ -17798,7 +17798,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("FRANKLIN"),
.items = {},
.doubleBattle = FALSE,
@@ -17810,7 +17810,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_PROF,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_PROF_OAK,
+ .trainerPic = TRAINER_PIC_PROFESSOR_OAK,
.trainerName = _("PROF. OAK"),
.items = {},
.doubleBattle = FALSE,
@@ -17822,7 +17822,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PLAYER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BRENDAN,
+ .trainerPic = TRAINER_PIC_RS_BRENDAN_2,
.trainerName = _("BRENDAN"),
.items = {},
.doubleBattle = FALSE,
@@ -17834,7 +17834,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PLAYER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_MAY,
+ .trainerPic = TRAINER_PIC_RS_MAY_2,
.trainerName = _("MAY"),
.items = {},
.doubleBattle = FALSE,
@@ -17870,7 +17870,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET_2,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -17882,7 +17882,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PSYCHIC_4,
+ .trainerPic = TRAINER_PIC_PSYCHIC_F,
.trainerName = _("JACLYN"),
.items = {},
.doubleBattle = FALSE,
@@ -17906,7 +17906,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TUBER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_TUBER_3,
+ .trainerPic = TRAINER_PIC_TUBER_F,
.trainerName = _("AMIRA"),
.items = {},
.doubleBattle = FALSE,
@@ -17918,7 +17918,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_BREEDER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_BREEDER_3,
+ .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
.trainerName = _("ALIZE"),
.items = {},
.doubleBattle = FALSE,
@@ -17930,7 +17930,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_3,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
.trainerName = _("NICOLAS"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -17942,7 +17942,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_4,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
.trainerName = _("MADELINE"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -17954,7 +17954,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_AROMA_LADY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_AROMA_LADY_2,
+ .trainerPic = TRAINER_PIC_AROMA_LADY,
.trainerName = _("NIKKI"),
.items = {},
.doubleBattle = FALSE,
@@ -17966,7 +17966,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RUIN_MANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_RUIN_MANIAC_2,
+ .trainerPic = TRAINER_PIC_RUIN_MANIAC,
.trainerName = _("STANLY"),
.items = {},
.doubleBattle = FALSE,
@@ -17978,7 +17978,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_LADY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_LADY_2,
+ .trainerPic = TRAINER_PIC_LADY,
.trainerName = _("JACKI"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -18050,7 +18050,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("ANTHONY"),
.items = {},
.doubleBattle = FALSE,
@@ -18062,7 +18062,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("CHARLIE"),
.items = {},
.doubleBattle = FALSE,
@@ -18074,7 +18074,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TWINS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
- .trainerPic = TRAINER_PIC_TWINS_2,
+ .trainerPic = TRAINER_PIC_TWINS,
.trainerName = _("ELI & ANNE"),
.items = {},
.doubleBattle = TRUE,
@@ -18122,7 +18122,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -18134,7 +18134,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -18146,7 +18146,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -18158,7 +18158,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -18170,7 +18170,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -18182,7 +18182,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -18194,7 +18194,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET_2,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F,
.trainerName = _("ADMIN"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -18206,7 +18206,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("ADMIN"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -18230,7 +18230,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("AMARA"),
.items = {},
.doubleBattle = FALSE,
@@ -18242,7 +18242,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("MARIA"),
.items = {},
.doubleBattle = FALSE,
@@ -18254,7 +18254,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("ABIGAIL"),
.items = {},
.doubleBattle = FALSE,
@@ -18266,7 +18266,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("FINN"),
.items = {},
.doubleBattle = FALSE,
@@ -18278,7 +18278,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("GARRETT"),
.items = {},
.doubleBattle = FALSE,
@@ -18290,7 +18290,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("TOMMY"),
.items = {},
.doubleBattle = FALSE,
@@ -18314,7 +18314,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("SHEA"),
.items = {},
.doubleBattle = FALSE,
@@ -18326,7 +18326,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("HUGH"),
.items = {},
.doubleBattle = FALSE,
@@ -18338,7 +18338,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("BRYCE"),
.items = {},
.doubleBattle = FALSE,
@@ -18350,7 +18350,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("CLAIRE"),
.items = {},
.doubleBattle = FALSE,
@@ -18374,7 +18374,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_AROMA_LADY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_AROMA_LADY_2,
+ .trainerPic = TRAINER_PIC_AROMA_LADY,
.trainerName = _("VIOLET"),
.items = {},
.doubleBattle = FALSE,
@@ -18386,7 +18386,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TUBER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_TUBER_3,
+ .trainerPic = TRAINER_PIC_TUBER_F,
.trainerName = _("ALEXIS"),
.items = {},
.doubleBattle = FALSE,
@@ -18398,7 +18398,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TWINS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
- .trainerPic = TRAINER_PIC_TWINS_2,
+ .trainerPic = TRAINER_PIC_TWINS,
.trainerName = _("JOY & MEG"),
.items = {},
.doubleBattle = TRUE,
@@ -18410,7 +18410,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("TISHA"),
.items = {},
.doubleBattle = FALSE,
@@ -18446,7 +18446,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_LADY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_LADY_2,
+ .trainerPic = TRAINER_PIC_LADY,
.trainerName = _("GILLIAN"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -18470,7 +18470,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("TOBY"),
.items = {},
.doubleBattle = FALSE,
@@ -18482,7 +18482,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -18494,7 +18494,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -18506,7 +18506,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TEAM_ROCKET,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
- .trainerPic = TRAINER_PIC_TEAM_ROCKET_2,
+ .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F,
.trainerName = _("GRUNT"),
.items = {},
.doubleBattle = FALSE,
@@ -18518,7 +18518,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("MILO"),
.items = {},
.doubleBattle = FALSE,
@@ -18530,7 +18530,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("CHAZ"),
.items = {},
.doubleBattle = FALSE,
@@ -18542,7 +18542,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("HAROLD"),
.items = {},
.doubleBattle = FALSE,
@@ -18554,7 +18554,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("TYLOR"),
.items = {},
.doubleBattle = FALSE,
@@ -18566,7 +18566,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("MYMO"),
.items = {},
.doubleBattle = FALSE,
@@ -18578,7 +18578,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("NICOLE"),
.items = {},
.doubleBattle = FALSE,
@@ -18590,7 +18590,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SIS_AND_BRO_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SIS_AND_BRO_2,
+ .trainerPic = TRAINER_PIC_SIS_AND_BRO,
.trainerName = _("AVA & GEB"),
.items = {},
.doubleBattle = TRUE,
@@ -18602,7 +18602,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_AROMA_LADY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_AROMA_LADY_2,
+ .trainerPic = TRAINER_PIC_AROMA_LADY,
.trainerName = _("ROSE"),
.items = {},
.doubleBattle = FALSE,
@@ -18614,7 +18614,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("SAMIR"),
.items = {},
.doubleBattle = FALSE,
@@ -18626,7 +18626,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("DENISE"),
.items = {},
.doubleBattle = FALSE,
@@ -18638,7 +18638,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TWINS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
- .trainerPic = TRAINER_PIC_TWINS_2,
+ .trainerPic = TRAINER_PIC_TWINS,
.trainerName = _("MIU & MIA"),
.items = {},
.doubleBattle = TRUE,
@@ -18650,7 +18650,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("EARL"),
.items = {},
.doubleBattle = FALSE,
@@ -18662,7 +18662,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RUIN_MANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_RUIN_MANIAC_2,
+ .trainerPic = TRAINER_PIC_RUIN_MANIAC,
.trainerName = _("FOSTER"),
.items = {},
.doubleBattle = FALSE,
@@ -18674,7 +18674,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RUIN_MANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_RUIN_MANIAC_2,
+ .trainerPic = TRAINER_PIC_RUIN_MANIAC,
.trainerName = _("LARRY"),
.items = {},
.doubleBattle = FALSE,
@@ -18686,7 +18686,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("DARYL"),
.items = {},
.doubleBattle = FALSE,
@@ -18698,7 +18698,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("HECTOR"),
.items = {},
.doubleBattle = FALSE,
@@ -18710,7 +18710,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_PSYCHIC_3,
+ .trainerPic = TRAINER_PIC_PSYCHIC_M,
.trainerName = _("DARIO"),
.items = {},
.doubleBattle = FALSE,
@@ -18722,7 +18722,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PSYCHIC_4,
+ .trainerPic = TRAINER_PIC_PSYCHIC_F,
.trainerName = _("RODETTE"),
.items = {},
.doubleBattle = FALSE,
@@ -18734,7 +18734,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_AROMA_LADY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_AROMA_LADY_2,
+ .trainerPic = TRAINER_PIC_AROMA_LADY,
.trainerName = _("MIAH"),
.items = {},
.doubleBattle = FALSE,
@@ -18746,7 +18746,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_YOUNG_COUPLE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2,
+ .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
.trainerName = _("EVE & JON"),
.items = {},
.doubleBattle = TRUE,
@@ -18806,7 +18806,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("MARK"),
.items = {},
.doubleBattle = FALSE,
@@ -18818,7 +18818,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_3,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
.trainerName = _("LOGAN"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -18830,7 +18830,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_3,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
.trainerName = _("JACKSON"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -18842,7 +18842,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_4,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
.trainerName = _("BETH"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -18854,7 +18854,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_4,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
.trainerName = _("KATELYN"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -18866,7 +18866,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("LEROY"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -18878,7 +18878,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("MICHELLE"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -18902,7 +18902,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RUIN_MANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_RUIN_MANIAC_2,
+ .trainerPic = TRAINER_PIC_RUIN_MANIAC,
.trainerName = _("BRANDON"),
.items = {},
.doubleBattle = FALSE,
@@ -18914,7 +18914,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_RUIN_MANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_RUIN_MANIAC_2,
+ .trainerPic = TRAINER_PIC_RUIN_MANIAC,
.trainerName = _("BENJAMIN"),
.items = {},
.doubleBattle = FALSE,
@@ -18938,7 +18938,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_GENTLEMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
- .trainerPic = TRAINER_PIC_GENTLEMAN_2,
+ .trainerPic = TRAINER_PIC_GENTLEMAN,
.trainerName = _("CLIFFORD"),
.items = {},
.doubleBattle = FALSE,
@@ -18950,7 +18950,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_LADY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_LADY_2,
+ .trainerPic = TRAINER_PIC_LADY,
.trainerName = _("SELPHY"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -18962,7 +18962,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RUIN_MANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_RUIN_MANIAC_2,
+ .trainerPic = TRAINER_PIC_RUIN_MANIAC,
.trainerName = _("LAWSON"),
.items = {},
.doubleBattle = FALSE,
@@ -18974,7 +18974,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PSYCHIC_4,
+ .trainerPic = TRAINER_PIC_PSYCHIC_F,
.trainerName = _("LAURA"),
.items = {},
.doubleBattle = FALSE,
@@ -18986,7 +18986,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_BREEDER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_BREEDER_3,
+ .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
.trainerName = _("BETHANY"),
.items = {},
.doubleBattle = FALSE,
@@ -18998,7 +18998,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_BREEDER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_BREEDER_3,
+ .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
.trainerName = _("ALLISON"),
.items = {},
.doubleBattle = FALSE,
@@ -19010,7 +19010,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("GARRET"),
.items = {},
.doubleBattle = FALSE,
@@ -19022,7 +19022,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("JONAH"),
.items = {},
.doubleBattle = FALSE,
@@ -19034,7 +19034,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("VANCE"),
.items = {},
.doubleBattle = FALSE,
@@ -19070,7 +19070,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("DALIA"),
.items = {},
.doubleBattle = FALSE,
@@ -19082,7 +19082,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("JOANA"),
.items = {},
.doubleBattle = FALSE,
@@ -19094,7 +19094,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("RILEY"),
.items = {},
.doubleBattle = FALSE,
@@ -19106,7 +19106,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("MARCY"),
.items = {},
.doubleBattle = FALSE,
@@ -19118,7 +19118,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RUIN_MANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_RUIN_MANIAC_2,
+ .trainerPic = TRAINER_PIC_RUIN_MANIAC,
.trainerName = _("LAYTON"),
.items = {},
.doubleBattle = FALSE,
@@ -19130,7 +19130,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("KELSEY"),
.items = {},
.doubleBattle = FALSE,
@@ -19142,7 +19142,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("KELSEY"),
.items = {},
.doubleBattle = FALSE,
@@ -19154,7 +19154,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("KELSEY"),
.items = {},
.doubleBattle = FALSE,
@@ -19166,7 +19166,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("RICKY"),
.items = {},
.doubleBattle = FALSE,
@@ -19178,7 +19178,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("RICKY"),
.items = {},
.doubleBattle = FALSE,
@@ -19190,7 +19190,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("RICKY"),
.items = {},
.doubleBattle = FALSE,
@@ -19202,7 +19202,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("JEFF"),
.items = {},
.doubleBattle = FALSE,
@@ -19214,7 +19214,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("JEFF"),
.items = {},
.doubleBattle = FALSE,
@@ -19226,7 +19226,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("JEFF"),
.items = {},
.doubleBattle = FALSE,
@@ -19238,7 +19238,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ISABELLE"),
.items = {},
.doubleBattle = FALSE,
@@ -19250,7 +19250,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ISABELLE"),
.items = {},
.doubleBattle = FALSE,
@@ -19262,7 +19262,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ISABELLE"),
.items = {},
.doubleBattle = FALSE,
@@ -19322,7 +19322,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("CHRIS"),
.items = {},
.doubleBattle = FALSE,
@@ -19334,7 +19334,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("CHRIS"),
.items = {},
.doubleBattle = FALSE,
@@ -19346,7 +19346,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_CAMPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_CAMPER_2,
+ .trainerPic = TRAINER_PIC_CAMPER,
.trainerName = _("CHRIS"),
.items = {},
.doubleBattle = FALSE,
@@ -19358,7 +19358,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ALICIA"),
.items = {},
.doubleBattle = FALSE,
@@ -19370,7 +19370,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ALICIA"),
.items = {},
.doubleBattle = FALSE,
@@ -19382,7 +19382,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("ALICIA"),
.items = {},
.doubleBattle = FALSE,
@@ -19394,7 +19394,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("JEREMY"),
.items = {},
.doubleBattle = FALSE,
@@ -19406,7 +19406,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("MARK"),
.items = {},
.doubleBattle = FALSE,
@@ -19418,7 +19418,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("HERMAN"),
.items = {},
.doubleBattle = FALSE,
@@ -19430,7 +19430,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("HERMAN"),
.items = {},
.doubleBattle = FALSE,
@@ -19442,7 +19442,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("TRENT"),
.items = {},
.doubleBattle = FALSE,
@@ -19454,7 +19454,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("MEGAN"),
.items = {},
.doubleBattle = FALSE,
@@ -19466,7 +19466,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_LASS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_LASS_2,
+ .trainerPic = TRAINER_PIC_LASS,
.trainerName = _("MEGAN"),
.items = {},
.doubleBattle = FALSE,
@@ -19514,7 +19514,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("ELLIOT"),
.items = {},
.doubleBattle = FALSE,
@@ -19538,7 +19538,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY_2,
+ .trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("SHEILA"),
.items = {},
.doubleBattle = FALSE,
@@ -19550,7 +19550,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("ROBERT"),
.items = {},
.doubleBattle = FALSE,
@@ -19562,7 +19562,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("ROBERT"),
.items = {},
.doubleBattle = FALSE,
@@ -19574,7 +19574,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("SUSIE"),
.items = {},
.doubleBattle = FALSE,
@@ -19586,7 +19586,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("SUSIE"),
.items = {},
.doubleBattle = FALSE,
@@ -19598,7 +19598,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("SUSIE"),
.items = {},
.doubleBattle = FALSE,
@@ -19622,7 +19622,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("BENNY"),
.items = {},
.doubleBattle = FALSE,
@@ -19634,7 +19634,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("BENNY"),
.items = {},
.doubleBattle = FALSE,
@@ -19646,7 +19646,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("MARLON"),
.items = {},
.doubleBattle = FALSE,
@@ -19658,7 +19658,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("MARLON"),
.items = {},
.doubleBattle = FALSE,
@@ -19670,7 +19670,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BEAUTY_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_BEAUTY_2,
+ .trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("GRACE"),
.items = {},
.doubleBattle = FALSE,
@@ -19682,7 +19682,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("CHESTER"),
.items = {},
.doubleBattle = FALSE,
@@ -19694,7 +19694,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("CHESTER"),
.items = {},
.doubleBattle = FALSE,
@@ -19706,7 +19706,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("BECKY"),
.items = {},
.doubleBattle = FALSE,
@@ -19718,7 +19718,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("BECKY"),
.items = {},
.doubleBattle = FALSE,
@@ -19730,7 +19730,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("BECKY"),
.items = {},
.doubleBattle = FALSE,
@@ -19838,7 +19838,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("JACOB"),
.items = {},
.doubleBattle = FALSE,
@@ -19850,7 +19850,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("JACOB"),
.items = {},
.doubleBattle = FALSE,
@@ -19862,7 +19862,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("ALICE"),
.items = {},
.doubleBattle = FALSE,
@@ -19874,7 +19874,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("DARRIN"),
.items = {},
.doubleBattle = FALSE,
@@ -19886,7 +19886,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("MISSY"),
.items = {},
.doubleBattle = FALSE,
@@ -19898,7 +19898,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PICNICKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PICNICKER_2,
+ .trainerPic = TRAINER_PIC_PICNICKER,
.trainerName = _("MISSY"),
.items = {},
.doubleBattle = FALSE,
@@ -19910,7 +19910,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_FISHERMAN_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_FISHERMAN_2,
+ .trainerPic = TRAINER_PIC_FISHERMAN,
.trainerName = _("WADE"),
.items = {},
.doubleBattle = FALSE,
@@ -19922,7 +19922,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("JACK"),
.items = {},
.doubleBattle = FALSE,
@@ -19934,7 +19934,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SIS_AND_BRO_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SIS_AND_BRO_2,
+ .trainerPic = TRAINER_PIC_SIS_AND_BRO,
.trainerName = _("LIL & IAN"),
.items = {},
.doubleBattle = TRUE,
@@ -19946,7 +19946,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SIS_AND_BRO_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SIS_AND_BRO_2,
+ .trainerPic = TRAINER_PIC_SIS_AND_BRO,
.trainerName = _("LIL & IAN"),
.items = {},
.doubleBattle = TRUE,
@@ -19958,7 +19958,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("FINN"),
.items = {},
.doubleBattle = FALSE,
@@ -20018,7 +20018,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("SHEA"),
.items = {},
.doubleBattle = FALSE,
@@ -20030,7 +20030,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("SHEA"),
.items = {},
.doubleBattle = FALSE,
@@ -20042,7 +20042,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("HUGH"),
.items = {},
.doubleBattle = FALSE,
@@ -20054,7 +20054,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_BLACK_BELT_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_BLACK_BELT_2,
+ .trainerPic = TRAINER_PIC_BLACK_BELT,
.trainerName = _("HUGH"),
.items = {},
.doubleBattle = FALSE,
@@ -20090,7 +20090,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TUBER_3,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_TUBER_3,
+ .trainerPic = TRAINER_PIC_TUBER_F,
.trainerName = _("AMIRA"),
.items = {},
.doubleBattle = FALSE,
@@ -20102,7 +20102,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_TWINS_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
- .trainerPic = TRAINER_PIC_TWINS_2,
+ .trainerPic = TRAINER_PIC_TWINS,
.trainerName = _("JOY & MEG"),
.items = {},
.doubleBattle = TRUE,
@@ -20138,7 +20138,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_PKMN_BREEDER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_BREEDER_3,
+ .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
.trainerName = _("ALIZE"),
.items = {},
.doubleBattle = FALSE,
@@ -20150,7 +20150,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_YOUNG_COUPLE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2,
+ .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
.trainerName = _("GIA & JES"),
.items = {},
.doubleBattle = TRUE,
@@ -20162,7 +20162,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_YOUNG_COUPLE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
- .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2,
+ .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
.trainerName = _("GIA & JES"),
.items = {},
.doubleBattle = TRUE,
@@ -20174,7 +20174,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("MILO"),
.items = {},
.doubleBattle = FALSE,
@@ -20186,7 +20186,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("CHAZ"),
.items = {},
.doubleBattle = FALSE,
@@ -20198,7 +20198,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BIRD_KEEPER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_BIRD_KEEPER_2,
+ .trainerPic = TRAINER_PIC_BIRD_KEEPER,
.trainerName = _("HAROLD"),
.items = {},
.doubleBattle = FALSE,
@@ -20210,7 +20210,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("NICOLE"),
.items = {},
.doubleBattle = FALSE,
@@ -20222,7 +20222,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PSYCHIC_4,
+ .trainerPic = TRAINER_PIC_PSYCHIC_F,
.trainerName = _("JACLYN"),
.items = {},
.doubleBattle = FALSE,
@@ -20234,7 +20234,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("SAMIR"),
.items = {},
.doubleBattle = FALSE,
@@ -20246,7 +20246,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_HIKER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_HIKER_2,
+ .trainerPic = TRAINER_PIC_HIKER,
.trainerName = _("EARL"),
.items = {},
.doubleBattle = FALSE,
@@ -20258,7 +20258,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_RUIN_MANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
- .trainerPic = TRAINER_PIC_RUIN_MANIAC_2,
+ .trainerPic = TRAINER_PIC_RUIN_MANIAC,
.trainerName = _("LARRY"),
.items = {},
.doubleBattle = FALSE,
@@ -20270,7 +20270,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_POKEMANIAC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
- .trainerPic = TRAINER_PIC_POKEMANIAC_2,
+ .trainerPic = TRAINER_PIC_POKEMANIAC,
.trainerName = _("HECTOR"),
.items = {},
.doubleBattle = FALSE,
@@ -20282,7 +20282,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
- .trainerPic = TRAINER_PIC_PSYCHIC_3,
+ .trainerPic = TRAINER_PIC_PSYCHIC_M,
.trainerName = _("DARIO"),
.items = {},
.doubleBattle = FALSE,
@@ -20294,7 +20294,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PSYCHIC_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PSYCHIC_4,
+ .trainerPic = TRAINER_PIC_PSYCHIC_F,
.trainerName = _("RODETTE"),
.items = {},
.doubleBattle = FALSE,
@@ -20318,7 +20318,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_3,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
.trainerName = _("NICOLAS"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20330,7 +20330,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_4,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
.trainerName = _("MADELINE"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20366,7 +20366,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_3,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
.trainerName = _("JACKSON"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20378,7 +20378,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_PKMN_RANGER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_PKMN_RANGER_4,
+ .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
.trainerName = _("KATELYN"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20390,7 +20390,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
- .trainerPic = TRAINER_PIC_COOLTRAINER_3,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_M,
.trainerName = _("LEROY"),
.items = {ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20402,7 +20402,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = CLASS_COOLTRAINER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_COOLTRAINER_4,
+ .trainerPic = TRAINER_PIC_COOLTRAINER_F,
.trainerName = _("MICHELLE"),
.items = {ITEM_HYPER_POTION},
.doubleBattle = FALSE,
@@ -20426,7 +20426,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("COLTON"),
.items = {},
.doubleBattle = FALSE,
@@ -20438,7 +20438,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("COLTON"),
.items = {},
.doubleBattle = FALSE,
@@ -20450,7 +20450,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_BUG_CATCHER_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_BUG_CATCHER_2,
+ .trainerPic = TRAINER_PIC_BUG_CATCHER,
.trainerName = _("COLTON"),
.items = {},
.doubleBattle = FALSE,
@@ -20462,7 +20462,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("MATTHEW"),
.items = {},
.doubleBattle = FALSE,
@@ -20474,7 +20474,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_MALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
- .trainerPic = TRAINER_PIC_SWIMMER_MALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_M,
.trainerName = _("TONY"),
.items = {},
.doubleBattle = FALSE,
@@ -20486,7 +20486,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = 0,
.trainerClass = CLASS_SWIMMER_FEMALE_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE,
- .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2,
+ .trainerPic = TRAINER_PIC_SWIMMER_F,
.trainerName = _("MELISSA"),
.items = {},
.doubleBattle = FALSE,
@@ -20498,7 +20498,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_ELITE_FOUR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_LORELEI,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_LORELEI,
.trainerName = _("LORELEI"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20510,7 +20510,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_ELITE_FOUR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_BRUNO,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_BRUNO,
.trainerName = _("BRUNO"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20522,7 +20522,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_ELITE_FOUR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_AGATHA,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_AGATHA,
.trainerName = _("AGATHA"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20534,7 +20534,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_ELITE_FOUR_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
- .trainerPic = TRAINER_PIC_LANCE,
+ .trainerPic = TRAINER_PIC_ELITE_FOUR_LANCE,
.trainerName = _("LANCE"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20546,7 +20546,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_CHAMPION_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL_3,
+ .trainerPic = TRAINER_PIC_CHAMPION_RIVAL,
.trainerName = _("TERRY"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20558,7 +20558,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_CHAMPION_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL_3,
+ .trainerPic = TRAINER_PIC_CHAMPION_RIVAL,
.trainerName = _("TERRY"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
@@ -20570,7 +20570,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = CLASS_CHAMPION_2,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
- .trainerPic = TRAINER_PIC_RIVAL_3,
+ .trainerPic = TRAINER_PIC_CHAMPION_RIVAL,
.trainerName = _("TERRY"),
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index cfc99551a..fee473451 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -1258,19 +1258,19 @@ static void TryGetRematchTrainerIdGivenGameState(const u16 * a0, u8 * a1)
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 2:
- if (!FlagGet(FLAG_SYS_NATIONAL_DEX))
+ if (!FlagGet(FLAG_0x896))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 3:
- if (!FlagGet(FLAG_SYS_CAVE_SHIP))
+ if (!FlagGet(FLAG_0x897))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 4:
- if (!FlagGet(FLAG_TRAINER_FLAG_START + 0x32c))
+ if (!FlagGet(FLAG_0x82C))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 5:
- if (!FlagGet(FLAG_TRAINER_FLAG_START + 0x344))
+ if (!FlagGet(FLAG_0x844))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 07:53:59 +0000