18 files changed, 494 insertions, 1070 deletions

diff --git a/asmdiff_de.sh b/asmdiff_de.sh
index aa42daa5e..31673d136 100755
--- a/asmdiff_de.sh
+++ b/asmdiff_de.sh
@@ -4,4 +4,4 @@ OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb
 OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
 $OBJDUMP $OPTIONS baserom_de.gba > baserom_de.dump
 $OBJDUMP $OPTIONS pokeruby_de.gba > pokeruby_de.dump
-diff baserom_de.dump pokeruby_de.dump
+diff -u baserom_de.dump pokeruby_de.dump
diff --git a/data-de/contest_opponents.inc b/data-de/contest_opponents.inc
deleted file mode 100644
index 1bdf7027e..000000000
--- a/data-de/contest_opponents.inc
+++ /dev/null
@@ -1,663 +0,0 @@
-	.align 2
-gContestOpponents:: @ 83C9408
-	.2byte 286 @ SPECIES_ID
-	.string "FIFFI$", 11 @ POKE_NICKNAME
-	.string "JIMMY$", 8 @ TRAINER_NAME
-	.byte 7 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x0c000fff @ FLAGS
-	.2byte 68 @ RANK
-	.2byte MOVE_ROAR, MOVE_BITE, MOVE_TAKE_DOWN, MOVE_HOWL
-	.byte 10, 4, 10, 3, 4, 50 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 288 @ SPECIES_ID
-	.string "ZIGGY$", 11 @ POKE_NICKNAME
-	.string "KLARA$", 8 @ TRAINER_NAME
-	.byte 8 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x82000fff @ FLAGS
-	.2byte 16 @ RANK
-	.2byte MOVE_REST, MOVE_TAIL_WHIP, MOVE_TACKLE, MOVE_COVET
-	.byte 10, 10, 6, 1, 2, 60 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 294 @ SPECIES_ID
-	.string "DOXU$", 11 @ POKE_NICKNAME
-	.string "KARLO$", 8 @ TRAINER_NAME
-	.byte 11 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x21000fff @ FLAGS
-	.2byte 8 @ RANK
-	.2byte MOVE_SILVER_WIND, MOVE_MOONLIGHT, MOVE_LIGHT_SCREEN, MOVE_GUST
-	.byte 2, 10, 10, 12, 4, 70 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 298 @ SPECIES_ID
-	.string "SAMINI$", 11 @ POKE_NICKNAME
-	.string "TRUDI$", 8 @ TRAINER_NAME
-	.byte 16 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x20800fff @ FLAGS
-	.2byte 96 @ RANK
-	.2byte MOVE_BIDE, MOVE_SYNTHESIS, MOVE_BULLET_SEED, MOVE_GROWTH
-	.byte 3, 3, 5, 2, 7, 80 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 304 @ SPECIES_ID
-	.string "SCHWALBI$", 11 @ POKE_NICKNAME
-	.string "HELENA$", 8 @ TRAINER_NAME
-	.byte 18 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80400fff @ FLAGS
-	.2byte 4 @ RANK
-	.2byte MOVE_WING_ATTACK, MOVE_AGILITY, MOVE_AERIAL_ACE, MOVE_GROWL
-	.byte 1, 3, 3, 5, 4, 90 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 301 @ SPECIES_ID
-	.string "CADINJA$", 11 @ POKE_NICKNAME
-	.string "WILLI$", 8 @ TRAINER_NAME
-	.byte 44 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x10200fff @ FLAGS
-	.2byte 32 @ RANK
-	.2byte MOVE_LEECH_LIFE, MOVE_FALSE_SWIPE, MOVE_FURY_SWIPES, MOVE_MIND_READER
-	.byte 5, 2, 10, 7, 8, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 306 @ SPECIES_ID
-	.string "KNILZLI$", 11 @ POKE_NICKNAME
-	.string "HARTMUT$", 8 @ TRAINER_NAME
-	.byte 35 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x20100fff @ FLAGS
-	.2byte 32 @ RANK
-	.2byte MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_ATTRACT
-	.byte 3, 3, 10, 2, 2, 50 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 309 @ SPECIES_ID
-	.string "WINGI$", 11 @ POKE_NICKNAME
-	.string "CLAUDIA$", 8 @ TRAINER_NAME
-	.byte 26 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x08080fff @ FLAGS
-	.2byte 24 @ RANK
-	.2byte MOVE_MIST, MOVE_WATER_GUN, MOVE_GROWL, MOVE_PURSUIT
-	.byte 3, 5, 1, 10, 10, 60 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 364 @ SPECIES_ID
-	.string "BLUMPI$", 11 @ POKE_NICKNAME
-	.string "ALEC$", 8 @ TRAINER_NAME
-	.byte 31 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x40040fff @ FLAGS
-	.2byte 88 @ RANK
-	.2byte MOVE_STRENGTH, MOVE_COUNTER, MOVE_YAWN, MOVE_ENCORE
-	.byte 10, 4, 4, 5, 18, 70 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 370 @ SPECIES_ID
-	.string "FLURMI$", 11 @ POKE_NICKNAME
-	.string "SILKE$", 8 @ TRAINER_NAME
-	.byte 47 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80020fff @ FLAGS
-	.2byte 36 @ RANK
-	.2byte MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_HYPER_VOICE
-	.byte 2, 2, 7, 2, 7, 80 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 335 @ SPECIES_ID
-	.string "MAHITA$", 11 @ POKE_NICKNAME
-	.string "PEER$", 8 @ TRAINER_NAME
-	.byte 38 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x08010fff @ FLAGS
-	.2byte 68 @ RANK
-	.2byte MOVE_SEISMIC_TOSS, MOVE_VITAL_THROW, MOVE_TACKLE, MOVE_REVERSAL
-	.byte 9, 1, 1, 8, 1, 90 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 382 @ SPECIES_ID
-	.string "STOLLI$", 11 @ POKE_NICKNAME
-	.string "MARIA$", 8 @ TRAINER_NAME
-	.byte 10 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x08008fff @ FLAGS
-	.2byte 68 @ RANK
-	.2byte MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_HEADBUTT, MOVE_TAKE_DOWN
-	.byte 5, 10, 2, 10, 2, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 41 @ SPECIES_ID
-	.string "BLUTBAT$", 11 @ POKE_NICKNAME
-	.string "RUDOLF$", 8 @ TRAINER_NAME
-	.byte 33 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x90004fff @ FLAGS
-	.2byte 56 @ RANK
-	.2byte MOVE_HAZE, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY, MOVE_LEECH_LIFE
-	.byte 4, 2, 2, 2, 10, 50 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 367 @ SPECIES_ID
-	.string "SCHLUPPI$", 11 @ POKE_NICKNAME
-	.string "MELANIE$", 8 @ TRAINER_NAME
-	.byte 6 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x40002fff @ FLAGS
-	.2byte 16 @ RANK
-	.2byte MOVE_SLUDGE, MOVE_AMNESIA, MOVE_TOXIC, MOVE_YAWN
-	.byte 1, 10, 1, 10, 5, 60 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 337 @ SPECIES_ID
-	.string "FRIZZZEL$", 11 @ POKE_NICKNAME
-	.string "BERTRAM$", 8 @ TRAINER_NAME
-	.byte 15 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80001fff @ FLAGS
-	.2byte 12 @ RANK
-	.2byte MOVE_SPARK, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_ROAR
-	.byte 20, 10, 1, 1, 1, 70 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 363 @ SPECIES_ID
-	.string "ROSALI$", 11 @ POKE_NICKNAME
-	.string "KARINA$", 8 @ TRAINER_NAME
-	.byte 32 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x24000fff @ FLAGS
-	.2byte 41 @ RANK
-	.2byte MOVE_PETAL_DANCE, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_INGRAIN
-	.byte 50, 15, 75, 10, 20, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 84 @ SPECIES_ID
-	.string "DOLDI$", 11 @ POKE_NICKNAME
-	.string "BOBBY$", 8 @ TRAINER_NAME
-	.byte 51 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x82000fff @ FLAGS
-	.2byte 125 @ RANK
-	.2byte MOVE_PECK, MOVE_FURY_ATTACK, MOVE_RETURN, MOVE_GROWL
-	.byte 15, 21, 15, 85, 35, 110 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 332 @ SPECIES_ID
-	.string "KNACKI$", 11 @ POKE_NICKNAME
-	.string "JUDITH$", 8 @ TRAINER_NAME
-	.byte 8 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x81000fff @ FLAGS
-	.2byte 113 @ RANK
-	.2byte MOVE_BITE, MOVE_SAND_ATTACK, MOVE_DIG, MOVE_FAINT_ATTACK
-	.byte 75, 25, 25, 10, 25, 120 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 344 @ SPECIES_ID
-	.string "KOTUS$", 11 @ POKE_NICKNAME
-	.string "HELMUT$", 8 @ TRAINER_NAME
-	.byte 11 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80800fff @ FLAGS
-	.2byte 37 @ RANK
-	.2byte MOVE_SPIKES, MOVE_LEER, MOVE_POISON_STING, MOVE_SAND_ATTACK
-	.byte 10, 30, 25, 65, 25, 130 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 27 @ SPECIES_ID
-	.string "SADAN$", 11 @ POKE_NICKNAME
-	.string "BRITTA$", 8 @ TRAINER_NAME
-	.byte 18 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x10400fff @ FLAGS
-	.2byte 69 @ RANK
-	.2byte MOVE_SLASH, MOVE_DEFENSE_CURL, MOVE_SWIFT, MOVE_FURY_SWIPES
-	.byte 30, 90, 30, 10, 100, 140 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 318 @ SPECIES_ID
-	.string "PUPPIBAL$", 11 @ POKE_NICKNAME
-	.string "TORBEN$", 8 @ TRAINER_NAME
-	.byte 44 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x08200fff @ FLAGS
-	.2byte 41 @ RANK
-	.2byte MOVE_SELF_DESTRUCT, MOVE_ROCK_TOMB, MOVE_PSYBEAM, MOVE_CONFUSION
-	.byte 50, 40, 10, 35, 35, 150 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 339 @ SPECIES_ID
-	.string "CLAMAUK$", 11 @ POKE_NICKNAME
-	.string "BIANKA$", 8 @ TRAINER_NAME
-	.byte 26 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x10100fff @ FLAGS
-	.2byte 77 @ RANK
-	.2byte MOVE_MAGNITUDE, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY, MOVE_FLAMETHROWER
-	.byte 40, 5, 40, 40, 40, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 308 @ SPECIES_ID
-	.string "SPIRRWIRR$", 11 @ POKE_NICKNAME
-	.string "ALEX$", 8 @ TRAINER_NAME
-	.byte 31 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80080fff @ FLAGS
-	.2byte 49 @ RANK
-	.2byte MOVE_TEETER_DANCE, MOVE_PSYCH_UP, MOVE_HYPNOSIS, MOVE_UPROAR
-	.byte 25, 75, 25, 10, 25, 110 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 358 @ SPECIES_ID
-	.string "BLUPPF$", 11 @ POKE_NICKNAME
-	.string "SABINE$", 8 @ TRAINER_NAME
-	.byte 47 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0xa0040fff @ FLAGS
-	.2byte 41 @ RANK
-	.2byte MOVE_MIRROR_MOVE, MOVE_PERISH_SONG, MOVE_SAFEGUARD, MOVE_MIST
-	.byte 30, 30, 40, 30, 25, 120 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 289 @ SPECIES_ID
-	.string "DAKSIRAD$", 11 @ POKE_NICKNAME
-	.string "AUGUST$", 8 @ TRAINER_NAME
-	.byte 38 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80020fff @ FLAGS
-	.2byte 25 @ RANK
-	.2byte MOVE_GROWL, MOVE_COVET, MOVE_SAND_ATTACK, MOVE_REST
-	.byte 40, 40, 30, 10, 30, 130 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 317 @ SPECIES_ID
-	.string "KECLI$", 11 @ POKE_NICKNAME
-	.string "ARIANA$", 8 @ TRAINER_NAME
-	.byte 10 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80010fff @ FLAGS
-	.2byte 97 @ RANK
-	.2byte MOVE_THIEF, MOVE_SCREECH, MOVE_ANCIENT_POWER, MOVE_BIND
-	.byte 10, 10, 40, 75, 35, 140 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 118 @ SPECIES_ID
-	.string "GOLDINCHEN$", 11 @ POKE_NICKNAME
-	.string "TONI$", 8 @ TRAINER_NAME
-	.byte 33 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80008fff @ FLAGS
-	.2byte 13 @ RANK
-	.2byte MOVE_HORN_ATTACK, MOVE_FURY_ATTACK, MOVE_HORN_DRILL, MOVE_TAIL_WHIP
-	.byte 70, 30, 5, 30, 25, 150 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 323 @ SPECIES_ID
-	.string "SCHMERBSE$", 11 @ POKE_NICKNAME
-	.string "SUSI$", 8 @ TRAINER_NAME
-	.byte 6 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80004fff @ FLAGS
-	.2byte 113 @ RANK
-	.2byte MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_EARTHQUAKE, MOVE_FUTURE_SIGHT
-	.byte 45, 45, 60, 25, 15, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 227 @ SPECIES_ID
-	.string "KREBSILI$", 11 @ POKE_NICKNAME
-	.string "CLEMENS$", 8 @ TRAINER_NAME
-	.byte 35 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x08002fff @ FLAGS
-	.2byte 77 @ RANK
-	.2byte MOVE_SWIFT, MOVE_DOUBLE_TEAM, MOVE_AGILITY, MOVE_CUT
-	.byte 40, 30, 25, 60, 20, 110 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 295 @ SPECIES_ID
-	.string "URLOTZO$", 11 @ POKE_NICKNAME
-	.string "KATRIN$", 8 @ TRAINER_NAME
-	.byte 16 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x08001fff @ FLAGS
-	.2byte 57 @ RANK
-	.2byte MOVE_ASTONISH, MOVE_GROWL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE
-	.byte 15, 15, 30, 15, 75, 120 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 383 @ SPECIES_ID
-	.string "STROLLAK$", 11 @ POKE_NICKNAME
-	.string "ACHIM$", 8 @ TRAINER_NAME
-	.byte 55 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x84000fff @ FLAGS
-	.2byte 98 @ RANK
-	.2byte MOVE_METAL_SOUND, MOVE_METAL_CLAW, MOVE_HARDEN, MOVE_TAKE_DOWN
-	.byte 30, 50, 35, 100, 90, 200 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 299 @ SPECIES_ID
-	.string "BLASNI$", 11 @ POKE_NICKNAME
-	.string "GABI$", 8 @ TRAINER_NAME
-	.byte 8 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x82000fff @ FLAGS
-	.2byte 14 @ RANK
-	.2byte MOVE_GROWTH, MOVE_RAZOR_WIND, MOVE_EXPLOSION, MOVE_EXTRASENSORY
-	.byte 75, 75, 65, 35, 70, 210 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 302 @ SPECIES_ID
-	.string "ASKINJA$", 11 @ POKE_NICKNAME
-	.string "ROLF$", 8 @ TRAINER_NAME
-	.byte 11 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x81000fff @ FLAGS
-	.2byte 114 @ RANK
-	.2byte MOVE_SCREECH, MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_BATON_PASS
-	.byte 30, 50, 95, 70, 70, 220 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 305 @ SPECIES_ID
-	.string "SCHWALLO$", 11 @ POKE_NICKNAME
-	.string "ELSE$", 8 @ TRAINER_NAME
-	.byte 18 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80800fff @ FLAGS
-	.2byte 14 @ RANK
-	.2byte MOVE_AGILITY, MOVE_AERIAL_ACE, MOVE_WING_ATTACK, MOVE_FLY
-	.byte 65, 85, 35, 75, 40, 230 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 287 @ SPECIES_ID
-	.string "JÄNAGI$", 11 @ POKE_NICKNAME
-	.string "FRANK$", 8 @ TRAINER_NAME
-	.byte 44 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80400fff @ FLAGS
-	.2byte 98 @ RANK
-	.2byte MOVE_TAUNT, MOVE_THIEF, MOVE_ODOR_SLEUTH, MOVE_TAKE_DOWN
-	.byte 40, 80, 35, 70, 70, 240 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 292 @ SPECIES_ID
-	.string "PAPINILLI$", 11 @ POKE_NICKNAME
-	.string "ANNA$", 8 @ TRAINER_NAME
-	.byte 26 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80200fff @ FLAGS
-	.2byte 42 @ RANK
-	.2byte MOVE_MORNING_SUN, MOVE_SILVER_WIND, MOVE_STUN_SPORE, MOVE_SECRET_POWER
-	.byte 40, 70, 25, 80, 100, 250 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 119 @ SPECIES_ID
-	.string "KINGOLA$", 11 @ POKE_NICKNAME
-	.string "KONRAD$", 8 @ TRAINER_NAME
-	.byte 31 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80100fff @ FLAGS
-	.2byte 118 @ RANK
-	.2byte MOVE_FLAIL, MOVE_SUPERSONIC, MOVE_HORN_ATTACK, MOVE_FURY_ATTACK
-	.byte 80, 60, 30, 70, 90, 200 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 340 @ SPECIES_ID
-	.string "ERUPTAM$", 11 @ POKE_NICKNAME
-	.string "LUISE$", 8 @ TRAINER_NAME
-	.byte 47 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80080fff @ FLAGS
-	.2byte 78 @ RANK
-	.2byte MOVE_EARTHQUAKE, MOVE_FISSURE, MOVE_OVERHEAT, MOVE_HYPER_BEAM
-	.byte 100, 80, 20, 50, 65, 210 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 66 @ SPECIES_ID
-	.string "OLLOMA$", 11 @ POKE_NICKNAME
-	.string "MICHAEL$", 8 @ TRAINER_NAME
-	.byte 38 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80040fff @ FLAGS
-	.2byte 66 @ RANK
-	.2byte MOVE_SEISMIC_TOSS, MOVE_FOCUS_ENERGY, MOVE_KARATE_CHOP, MOVE_SCARY_FACE
-	.byte 70, 85, 25, 60, 50, 220 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 296 @ SPECIES_ID
-	.string "OMBRE$", 11 @ POKE_NICKNAME
-	.string "ANIKA$", 8 @ TRAINER_NAME
-	.byte 10 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80020fff @ FLAGS
-	.2byte 58 @ RANK
-	.2byte MOVE_ATTRACT, MOVE_FLASH, MOVE_UPROAR, MOVE_GROWL
-	.byte 40, 60, 90, 45, 70, 230 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 379 @ SPECIES_ID
-	.string "PITISVI$", 11 @ POKE_NICKNAME
-	.string "DETLEF$", 8 @ TRAINER_NAME
-	.byte 33 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80010fff @ FLAGS
-	.2byte 98 @ RANK
-	.2byte MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP, MOVE_SCREECH
-	.byte 35, 50, 90, 40, 100, 240 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 313 @ SPECIES_ID
-	.string "WAILA$", 11 @ POKE_NICKNAME
-	.string "XENIA$", 8 @ TRAINER_NAME
-	.byte 22 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80008fff @ FLAGS
-	.2byte 26 @ RANK
-	.2byte MOVE_WATER_PULSE, MOVE_REST, MOVE_WATER_SPOUT, MOVE_SPLASH
-	.byte 30, 100, 100, 50, 30, 250 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 129 @ SPECIES_ID
-	.string "KARDORPA$", 11 @ POKE_NICKNAME
-	.string "FLORIAN$", 8 @ TRAINER_NAME
-	.byte 35 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80004fff @ FLAGS
-	.2byte 82 @ RANK
-	.2byte MOVE_TACKLE, MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE
-	.byte 30, 30, 160, 50, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 348 @ SPECIES_ID
-	.string "LUNA$", 11 @ POKE_NICKNAME
-	.string "DIANA$", 8 @ TRAINER_NAME
-	.byte 16 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80002fff @ FLAGS
-	.2byte 42 @ RANK
-	.2byte MOVE_EXPLOSION, MOVE_FUTURE_SIGHT, MOVE_PSYCHIC, MOVE_CONFUSION
-	.byte 50, 70, 60, 70, 50, 210 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 310 @ SPECIES_ID
-	.string "PEPE$", 11 @ POKE_NICKNAME
-	.string "LUTZ$", 8 @ TRAINER_NAME
-	.byte 39 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80001fff @ FLAGS
-	.2byte 14 @ RANK
-	.2byte MOVE_MIST, MOVE_HAIL, MOVE_HYPER_BEAM, MOVE_WING_ATTACK
-	.byte 95, 80, 85, 35, 35, 220 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 130 @ SPECIES_ID
-	.string "GARADI$", 11 @ POKE_NICKNAME
-	.string "JASMIN$", 8 @ TRAINER_NAME
-	.byte 32 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x84000fff @ FLAGS
-	.2byte 79 @ RANK
-	.2byte MOVE_HYPER_BEAM, MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_BITE
-	.byte 160, 200, 20, 40, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 371 @ SPECIES_ID
-	.string "KRAKEEL$", 11 @ POKE_NICKNAME
-	.string "GERT$", 8 @ TRAINER_NAME
-	.byte 21 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x82000fff @ FLAGS
-	.2byte 71 @ RANK
-	.2byte MOVE_HYPER_VOICE, MOVE_STOMP, MOVE_ROAR, MOVE_HOWL
-	.byte 170, 50, 55, 150, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 316 @ SPECIES_ID
-	.string "ENEKOTO$", 11 @ POKE_NICKNAME
-	.string "ROSA$", 8 @ TRAINER_NAME
-	.byte 8 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x81000fff @ FLAGS
-	.2byte 59 @ RANK
-	.2byte MOVE_ATTRACT, MOVE_ASSIST, MOVE_FAINT_ATTACK, MOVE_TAIL_WHIP
-	.byte 40, 200, 150, 185, 60, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 366 @ SPECIES_ID
-	.string "ASSIMAX$", 11 @ POKE_NICKNAME
-	.string "KURT$", 8 @ TRAINER_NAME
-	.byte 11 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80800fff @ FLAGS
-	.2byte 115 @ RANK
-	.2byte MOVE_COVET, MOVE_COUNTER, MOVE_ENCORE, MOVE_SLACK_OFF
-	.byte 85, 85, 170, 110, 150, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 359 @ SPECIES_ID
-	.string "RIA$", 11 @ POKE_NICKNAME
-	.string "SONJA$", 8 @ TRAINER_NAME
-	.byte 18 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80400fff @ FLAGS
-	.2byte 15 @ RANK
-	.2byte MOVE_DRAGON_DANCE, MOVE_HYPER_BEAM, MOVE_PERISH_SONG, MOVE_SAFEGUARD
-	.byte 170, 150, 30, 30, 90, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 393 @ SPECIES_ID
-	.string "EXUVINJA$", 11 @ POKE_NICKNAME
-	.string "SÖNKE$", 8 @ TRAINER_NAME
-	.byte 15 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80200fff @ FLAGS
-	.2byte 39 @ RANK
-	.2byte MOVE_SHOCK_WAVE, MOVE_SHADOW_BALL, MOVE_SKILL_SWAP, MOVE_RETURN
-	.byte 230, 60, 60, 230, 80, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 45 @ SPECIES_ID
-	.string "BLUMIEFT$", 11 @ POKE_NICKNAME
-	.string "MAGDA$", 8 @ TRAINER_NAME
-	.byte 26 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80100fff @ FLAGS
-	.2byte 59 @ RANK
-	.2byte MOVE_PETAL_DANCE, MOVE_SWEET_SCENT, MOVE_STUN_SPORE, MOVE_FLASH
-	.byte 35, 200, 150, 130, 40, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 361 @ SPECIES_ID
-	.string "WANDELBOLD$", 11 @ POKE_NICKNAME
-	.string "SASCHA$", 8 @ TRAINER_NAME
-	.byte 31 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80080fff @ FLAGS
-	.2byte 115 @ RANK
-	.2byte MOVE_DISABLE, MOVE_FUTURE_SIGHT, MOVE_NIGHT_SHADE, MOVE_PURSUIT
-	.byte 25, 35, 230, 150, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 178 @ SPECIES_ID
-	.string "TUMANI$", 11 @ POKE_NICKNAME
-	.string "MILA$", 8 @ TRAINER_NAME
-	.byte 47 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80040fff @ FLAGS
-	.2byte 115 @ RANK
-	.2byte MOVE_NIGHT_SHADE, MOVE_FUTURE_SIGHT, MOVE_CONFUSE_RAY, MOVE_PSYCHIC
-	.byte 35, 35, 150, 130, 170, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 331 @ SPECIES_ID
-	.string "HAITODO$", 11 @ POKE_NICKNAME
-	.string "KNUT$", 8 @ TRAINER_NAME
-	.byte 38 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80020fff @ FLAGS
-	.2byte 87 @ RANK
-	.2byte MOVE_AGILITY, MOVE_SWAGGER, MOVE_TAUNT, MOVE_TAKE_DOWN
-	.byte 140, 70, 140, 75, 100, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 325 @ SPECIES_ID
-	.string "KUSSLIEB$", 11 @ POKE_NICKNAME
-	.string "INCA$", 8 @ TRAINER_NAME
-	.byte 10 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80010fff @ FLAGS
-	.2byte 83 @ RANK
-	.2byte MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_TAKE_DOWN, MOVE_CHARM
-	.byte 50, 100, 220, 40, 190, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 214 @ SPECIES_ID
-	.string "SKARAB$", 11 @ POKE_NICKNAME
-	.string "FELIX$", 8 @ TRAINER_NAME
-	.byte 33 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80008fff @ FLAGS
-	.2byte 71 @ RANK
-	.2byte MOVE_STRENGTH, MOVE_ENDURE, MOVE_REVERSAL, MOVE_ROCK_TOMB
-	.byte 170, 70, 110, 240, 140, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 101 @ SPECIES_ID
-	.string "LEKBAL$", 11 @ POKE_NICKNAME
-	.string "DEBORA$", 8 @ TRAINER_NAME
-	.byte 6 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80004fff @ FLAGS
-	.2byte 15 @ RANK
-	.2byte MOVE_EXPLOSION, MOVE_LIGHT_SCREEN, MOVE_SWIFT, MOVE_FLASH
-	.byte 200, 200, 30, 35, 50, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 172 @ SPECIES_ID
-	.string "DEIBEL$", 11 @ POKE_NICKNAME
-	.string "BORIS$", 8 @ TRAINER_NAME
-	.byte 35 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80002fff @ FLAGS
-	.2byte 59 @ RANK
-	.2byte MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_REST, MOVE_TAIL_WHIP
-	.byte 25, 150, 180, 115, 120, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-	.2byte 202 @ SPECIES_ID
-	.string "WOHINGENAU$", 11 @ POKE_NICKNAME
-	.string "DELIA$", 8 @ TRAINER_NAME
-	.byte 16 @ TRAINER_SPRITE
-	.2byte 0x0000 @padding
-	.4byte 0x80001fff @ FLAGS
-	.2byte 111 @ RANK
-	.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND
-	.byte 60, 230, 50, 220, 210, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-	.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-@ credit to Valkyrie for helping me properly dump these structs
diff --git a/data-de/ingame_trades.inc b/data-de/ingame_trades.inc
deleted file mode 100644
index 76ce38c03..000000000
--- a/data-de/ingame_trades.inc
+++ /dev/null
@@ -1,108 +0,0 @@
-	.align 2
-gIngameTrades:: @ 8215AC4
-	.string "MAKIT$", 11 @ nickname
-	.space 1
-	.2byte SPECIES_MAKUHITA @ NPC mon species
-	.byte 5 @ HP IV
-	.byte 5 @ attack IV
-	.byte 4 @ defense IV
-	.byte 4 @ speed IV
-	.byte 4 @ sp. attack IV
-	.byte 4 @ sp. defense IV
-	.byte TRUE @ second ability
-	.space 3
-	.4byte 49562 @ OT ID
-	.byte 5 @ cool
-	.byte 5 @ beauty
-	.byte 5 @ cute
-	.byte 5 @ smart
-	.byte 30 @ tough
-	.space 3
-	.4byte 0x9C40 @ personality value
-	.2byte ITEM_X_ATTACK @ held item
-	.byte -1 @ mail num
-	.string "MAIK$", 11 @ OT name
-	.byte MALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_SLAKOTH @ player mon species
-	.space 2
-
-	.string "CONEC$", 11 @ nickname
-	.space 1
-	.2byte SPECIES_SKITTY @ NPC mon species
-	.byte 5 @ HP IV
-	.byte 4 @ attack IV
-	.byte 4 @ defense IV
-	.byte 5 @ speed IV
-	.byte 4 @ sp. attack IV
-	.byte 4 @ sp. defense IV
-	.byte FALSE @ second ability
-	.space 3
-	.4byte 2259 @ OT ID
-	.byte 5 @ cool
-	.byte 5 @ beauty
-	.byte 30 @ cute
-	.byte 5 @ smart
-	.byte 5 @ tough
-	.space 3
-	.4byte 0x498A2E17 @ personality value
-	.2byte ITEM_GLITTER_MAIL @ held item
-	.byte 0 @ mail num
-	.string "MADINA$", 11 @ OT name
-	.byte FEMALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_PIKACHU @ player mon species
-	.space 2
-
-	.string "CORASO$", 11 @ nickname
-	.space 1
-	.2byte SPECIES_CORSOLA @ NPC mon species
-	.byte 4 @ HP IV
-	.byte 4 @ attack IV
-	.byte 5 @ defense IV
-	.byte 4 @ speed IV
-	.byte 4 @ sp. attack IV
-	.byte 5 @ sp. defense IV
-	.byte TRUE @ second ability
-	.space 3
-	.4byte 50183 @ OT ID
-	.byte 5 @ cool
-	.byte 30 @ beauty
-	.byte 5 @ cute
-	.byte 5 @ smart
-	.byte 5 @ tough
-	.space 3
-	.4byte 0x4C970B7F @ personality value
-	.2byte ITEM_TROPIC_MAIL @ held item
-	.byte 1 @ mail num
-	.string "LIANA$", 11 @ OT name
-	.byte FEMALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_BELLOSSOM @ player mon species
-	.space 2
-
-	.align 1
-gIngameTradeMail:: @ 8215B78
-@ 0
-	ec_pokemon1 PIKACHU
-	ec_word THANK_YOU
-	ec_word EXCL
-	ec_word MY
-	ec_pokemon1 SKITTY
-	ec_word EATS
-	.2byte 0xFFFF
-	ec_word A_LOT
-	ec_word EXCL
-	.2byte 0
-
-@ 1
-	ec_word I
-	ec_word WANT
-	ec_word OF
-	ec_move2 PETAL_DANCE
-	ec_word WORKS
-	ec_word THE
-	ec_word IS
-	ec_word SO
-	ec_word PRETTY
-	.2byte 0
diff --git a/data-de/text/trainer_class_names.inc b/data-de/text/trainer_class_names.inc
deleted file mode 100644
index 94ab2078b..000000000
--- a/data-de/text/trainer_class_names.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-gTrainerClassNames:: @ 81F0208
-	.string "{PKMN}-TRAINER$", 13
-	.string "{PKMN}-TRAINER$", 13
-	.string "AQUA BOSS$", 13
-	.string "TEAM AQUA$", 13
-	.string "AQUA VORS.$", 13
-	.string "AROMALADY$", 13
-	.string "RUINENMANIAC$", 13
-	.string "INTERVIEWER$", 13
-	.string "PLANSCHER$", 13 @ うきわガール (Inner Tube Girl) in Japanese
-	.string "PLANSCHER$", 13 @ うきわボーイ (Inner Tube Boy) in Japanese
-	.string "ASS-TRAINER$", 13
-	.string "HEXE$", 13
-	.string "LADY$", 13
-	.string "SCHÖNHEIT$", 13
-	.string "SCHNÖSEL$", 13
-	.string "POKéMANIAC$", 13
-	.string "SCHWIMMER$", 13
-	.string "SCHWARZGURT$", 13
-	.string "GITARRIST$", 13
-	.string "HITZKOPF$", 13
-	.string "CAMPER$", 13
-	.string "KÄFERMANIAC$", 13
-	.string "PSYCHO$", 13
-	.string "GENTLEMAN$", 13
-	.string "TOP VIER$", 13
-	.string "LEITER$", 13
-	.string "SCHULKIND$", 13
-	.string "SEN. & JUN.$", 13
-	.string "SIHGERS,$", 13
-	.string "POKéFAN$", 13
-	.string "EXPERTE$", 13
-	.string "TEENAGER$", 13
-	.string "CHAMP$", 13
-	.string "ANGLER$", 13
-	.string "TRIATHLET$", 13
-	.string "DRACHENPROFI$", 13
-	.string "VOGELFÄNGER$", 13
-	.string "NINJAJUNGE$", 13
-	.string "KÄMPFERIN$", 13
-	.string "SCHIRMDAME$", 13
-	.string "SCHWIMMERIN$", 13
-	.string "PICKNICKER$", 13
-	.string "ZWIL.$", 13
-	.string "MATROSE$", 13
-	.string "SNOWBOARDER$", 13
-	.string "{PKMN}-SAMMLER$", 13
-	.string "{PKMN}-TRAINER$", 13
-	.string "{PKMN}-ZÜCHTER$", 13
-	.string "{PKMN}-RANGER$", 13
-	.string "MAGMA BOSS$", 13
-	.string "TEAM MAGMA$", 13
-	.string "MAGMA VORS.$", 13
-	.string "GÖRE$", 13
-	.string "KÄFERSAMMLER$", 13
-	.string "WANDERER$", 13
-	.string "JUNGES GLÜCK$", 13
-	.string "ALTES PAAR$", 13
-	.string "GESCHWISTER$", 13
diff --git a/de_after.sh b/de_after.sh
index 92f940d8d..49121e1a3 100755
--- a/de_after.sh
+++ b/de_after.sh
@@ -1,2 +1 @@
 git checkout override.mk data/ graphics
-rm data/ingame_trades.inc
diff --git a/include/contest_internal.h b/include/contest_internal.h
index ad984d599..1c9e875ea 100644
--- a/include/contest_internal.h
+++ b/include/contest_internal.h
@@ -76,7 +76,7 @@ s16 GetContestantRound2Points(u8 a);
 void DetermineFinalStandings(void);
 bool8 DidContestantPlaceHigher(s32 a, s32 b, struct ContestFinalStandings *c);
 void ContestPrintLinkStandby(void);
-void sub_80AF94C(u8);
+void Task_unused_80AF94C(u8 taskId);
 void FillContestantWindowBgs(void);
 u16 GetAppealHeartTileOffset(u8 a);
 s8 GetNumHeartsFromAppealPoints(s16 a);
diff --git a/src/contest.c b/src/contest.c
index e4b687233..150c6dbbd 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -649,7 +649,7 @@ void debug_sub_80B9EBC(u8 taskId)
 	  796,
 	  gUnknown_083CA340[1][0],
 	  gUnknown_083CA340[1][1]);
-	sub_80AED58();
+        Contest_ClearMoveDescriptionBox();
 	PrintContestMoveDescription(gTasks[taskId].data[1]);
 	gTasks[taskId].data[0]++;
 	break;
@@ -696,7 +696,7 @@ void debug_sub_80B9EBC(u8 taskId)
 	    gTasks[taskId].data[1] = 0;
 	    gTasks[taskId].data[2] = 0;
 	    gTasks[taskId].data[3] = 0;
-	    gTasks[taskId].func = sub_80ABCDC;
+	    gTasks[taskId].func = Task_ShowMoveSelectScreen;
 	    break;
 	}
 	break;
@@ -714,13 +714,13 @@ void debug_sub_80BA054(u8 taskId)
 	for (i = 0; i < 4; i++)
 	    gBattleMonForms[i] = 0;
 	memset(&gContestResources__moveAnim, 0, sizeof(gContestResources__moveAnim));
-	sub_80B28F0(gContestPlayerMonIndex);
+	SetMoveAnimAttackerData(gContestPlayerMonIndex);
 	r6 = CreateContestantSprite(
 	  gContestMons[gContestPlayerMonIndex].species, 
 	  gContestMons[gContestPlayerMonIndex].otId, 
 	  gContestMons[gContestPlayerMonIndex].personality);
 	gSprites[r6].pos2.x = 120;
-	gSprites[r6].callback = sub_80AD8FC;
+	gSprites[r6].callback = SpriteCB_MonSlideIn;
 	gTasks[taskId].data[2] = r6;
 	gBattlerSpriteIds[gBattlerAttacker] = r6;
 	gTasks[taskId].data[3] = 0;
@@ -732,8 +732,8 @@ void debug_sub_80BA054(u8 taskId)
 	if (gSprites[r6].callback == SpriteCallbackDummy)
 	{
 	    sContestantStatus[gContestPlayerMonIndex].currMove = gTasks[taskId].data[1];
-	    sub_80B2790(gContestPlayerMonIndex);
-	    sub_80B28F0(gContestPlayerMonIndex);
+	    SetMoveSpecificAnimData(gContestPlayerMonIndex);
+	    SetMoveAnimAttackerData(gContestPlayerMonIndex);
 	    SelectContestMoveBankTarget(gTasks[taskId].data[1]);
 	    DoMoveAnim(gTasks[taskId].data[1]);
 	    gTasks[taskId].data[3] = 0;
@@ -744,7 +744,7 @@ void debug_sub_80BA054(u8 taskId)
 	gAnimScriptCallback();
 	if (!gAnimScriptActive)
 	{
-	    sub_80B28CC(gContestPlayerMonIndex);
+	    ClearMoveAnimData(gContestPlayerMonIndex);
 	    if (sContest.moveAnimTurnCount != 0)
 	    {
 		gTasks[taskId].data[10] = 0;
@@ -761,7 +761,7 @@ void debug_sub_80BA054(u8 taskId)
 	if (gTasks[taskId].data[3] == 21)
 	{
 	    r6 = gTasks[taskId].data[2];
-	    gSprites[r6].callback = sub_80AD92C;
+	    gSprites[r6].callback = SpriteCB_MonSlideOut;
 	    SlideApplauseMeterIn();
 	    gTasks[taskId].data[3] = 0;
 	    gTasks[taskId].data[0]++;
diff --git a/src/contest_2.c b/src/contest_2.c
index 595581507..d5968b1b5 100644
--- a/src/contest_2.c
+++ b/src/contest_2.c
@@ -284,6 +284,7 @@ const struct SpriteTemplate sSpriteTemplate_JudgeSpeechBubble = {
 #include "data/text/contest_de.h"
 #endif //ENGLISH
 
+UNUSED
 const u8 ALIGNED(2) _unk_83CC3BE[] = __("ピラ");
 const u8 gUnknownText_UnknownFormatting2[] = _("{COLOR GREEN}{SHADOW RED}");
 const u8 gUnknownText_UnknownFormatting3[] = _("{COLOR LIGHT_GREY}");
@@ -1009,6 +1010,7 @@ u8 CreateJudgeSpeechBubbleSprite(void)
     return spriteId;
 }
 
+UNUSED
 u8 unref_sub_80AE908(void)
 {
     u16 species = gContestMons[gContestPlayerMonIndex].species;
@@ -1176,7 +1178,7 @@ void Contest_ClearMoveDescriptionBox(void)
     Text_FillWindowRectDefPalette(&gWindowTemplate_Contest_MoveDescription, 0, 11, 35, 28, 40);
 }
 
-// unused
+UNUSED
 void DrawMoveEffectSymbol(u16 move, u8 b)
 {
     u8 r5 = gContestantTurnOrder[b] * 5 + 2;
@@ -1202,6 +1204,7 @@ void DrawMoveEffectSymbol(u16 move, u8 b)
     }
 }
 
+UNUSED
 void DrawMoveEffectSymbols(void)
 {
     u8 i;
@@ -1378,6 +1381,7 @@ void GetAllChosenMoves(void)
         sContestantStatus[i].currMove = GetChosenMove(i);
 }
 
+UNUSED
 void sub_80AF1E4(u8 a, u8 b)
 {
     u8 r3;
@@ -1400,6 +1404,7 @@ void sub_80AF1E4(u8 a, u8 b)
         gUnknown_083CA318[a][1]);
 }
 
+UNUSED
 void unref_sub_80AF280(u8 a)
 {
     u8 i;
@@ -1408,6 +1413,7 @@ void unref_sub_80AF280(u8 a)
         sub_80AF1E4(i, a);
 }
 
+UNUSED
 void sub_80AF2A0(u8 a)
 {
     Text_FillWindowRectDefPalette(
@@ -1419,6 +1425,7 @@ void sub_80AF2A0(u8 a)
         gUnknown_083CA318[a][1] + 1);
 }
 
+UNUSED
 void unref_sub_80AF2E0(void)
 {
     u8 i;
@@ -1567,6 +1574,7 @@ bool8 Contest_IsMonsTurnDisabled(u8 a)
         return FALSE;
 }
 
+UNUSED
 bool8 unref_sub_80AF5D0(u8 a, u8 b)
 {
     u8 i;
@@ -1706,51 +1714,53 @@ void ContestPrintLinkStandby(void)
     Text_InitWindowAndPrintText(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15);
 }
 
-u8 unref_sub_80AF89C(s16 a, s16 b, u8 c, u8 d)
+UNUSED
+u8 unref_sub_80AF89C(s16 appealStart, s16 appealDelta, u8 tileOffs, u8 contestant)
 {
     u8 taskId;
-    u8 r5;
-    s8 r4;
-    u16 r0;
-
-    eContestGfxState[d].updatingAppealHearts = 1;
-    taskId = CreateTask(sub_80AF94C, 20);
-    r5 = GetNumHeartsFromAppealPoints(a);
-    r4 = GetNumHeartsFromAppealPoints(a + b) - r5;
-    r0 = GetAppealHeartTileOffset(d);
-    gTasks[taskId].data[0] = r5;
-    gTasks[taskId].data[1] = r4;
-    gTasks[taskId].data[2] = r0 + c;
-    gTasks[taskId].data[3] = d;
-    if (b < 0)
-        nullsub_19(d);
+    u8 heartsStart;
+    s8 heartsDelta;
+    u16 baseBlock;
+
+    eContestGfxState[contestant].updatingAppealHearts = 1;
+    taskId = CreateTask(Task_unused_80AF94C, 20);
+    heartsStart = GetNumHeartsFromAppealPoints(appealStart);
+    heartsDelta = GetNumHeartsFromAppealPoints(appealStart + appealDelta) - heartsStart;
+    baseBlock = GetAppealHeartTileOffset(contestant);
+    gTasks[taskId].data[0] = heartsStart;
+    gTasks[taskId].data[1] = heartsDelta;
+    gTasks[taskId].data[2] = baseBlock + tileOffs;
+    gTasks[taskId].data[3] = contestant;
+    if (appealDelta < 0)
+        nullsub_19(contestant);
     return taskId;
 }
 
-void sub_80AF94C(u8 taskId)
+UNUSED
+void Task_unused_80AF94C(u8 taskId)
 {
-    u8 r5 = gTasks[taskId].data[3];
+    u8 contestant = gTasks[taskId].data[3];
 
     if (gTasks[taskId].data[1] == 0)
     {
-        nullsub_19(r5);
+        nullsub_19(contestant);
         DestroyTask(taskId);
-        eContestGfxState[r5].updatingAppealHearts = 0;
+        eContestGfxState[contestant].updatingAppealHearts = 0;
     }
     else if (++gTasks[taskId].data[10] > 29)
     {
-        u8 r6;
+        u8 numHearts;
 
         gTasks[taskId].data[10] = 0;
         if (gTasks[taskId].data[1] < 0)
         {
-            r6 = gTasks[taskId].data[0]--;
+            numHearts = gTasks[taskId].data[0]--;
             gTasks[taskId].data[1]++;
             PlaySE(SE_BOO);
         }
         else
         {
-            r6 = ++gTasks[taskId].data[0];
+            numHearts = ++gTasks[taskId].data[0];
             gTasks[taskId].data[1]--;
             PlaySE(SE_PIN);
         }
@@ -1758,7 +1768,7 @@ void sub_80AF94C(u8 taskId)
         {
             RequestSpriteCopy(
                 &gTasks[taskId].data[2],
-                (void *)(VRAM + 0xC000 + (147 + r6 + r5 * 160) * 2),
+                (void *)(VRAM + 0xC000 + (147 + numHearts + contestant * 160) * 2),
                 2);
         }
         else
@@ -1771,7 +1781,7 @@ void sub_80AF94C(u8 taskId)
                 {
                     RequestSpriteCopy(
                         &gTasks[taskId].data[i + 7],
-                        (void *)(VRAM + 0xC000 + (147 + r6 + r5 * 160) * 2),
+                        (void *)(VRAM + 0xC000 + (147 + numHearts + contestant * 160) * 2),
                         2);
                     gTasks[taskId].data[i + 4]++;
                     break;
@@ -1792,6 +1802,7 @@ void FillContestantWindowBgs(void)
     }
 }
 
+UNUSED
 void unref_sub_80AFAB8(s16 a, u8 b)
 {
     u8 r5 = GetNumHeartsFromAppealPoints(a);
@@ -3053,18 +3064,18 @@ void SortContestants(u8 a)
         memset(sp0, 0xFF, sizeof(sp0));
         for (i = 0; i < 4; i++)
         {
-            u8 r2 = sContestantStatus[i].ranking;
+            u8 r2_2 = sContestantStatus[i].ranking;
 
             while (1)
             {
-                u8 *ptr = &sp0[r2];
+                u8 *ptr = &sp0[r2_2];
                 if (*ptr == 0xFF)
                 {
                     *ptr = i;
-                    gContestantTurnOrder[i] = r2;
+                    gContestantTurnOrder[i] = r2_2;
                     break;
                 }
-                r2++;
+                r2_2++;
             }
         }
 
diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h
index 0385c0b64..a1584cf0d 100644
--- a/src/data/contest_opponents.h
+++ b/src/data/contest_opponents.h
@@ -100,11 +100,255 @@
 #define CONTEST_AI_SET_20 (CONTEST_AI_COMMON | CONTEST_AI_DUMMY_12 | CONTEST_AI_DUMMY_25)
 #define CONTEST_AI_SET_21 (CONTEST_AI_COMMON | CONTEST_AI_DUMMY_7  | CONTEST_AI_DUMMY_25)
 
+#if defined(ENGLISH)
+#define CONTEST_OPPONENT_NICKNAME_JIMMY          "POOCHY"
+#define CONTEST_OPPONENT_OTNAME_JIMMY            "JIMMY"
+#define CONTEST_OPPONENT_NICKNAME_EDITH          "ZIGOON"
+#define CONTEST_OPPONENT_OTNAME_EDITH            "EDITH"
+#define CONTEST_OPPONENT_NICKNAME_EVAN           "DUSTER"
+#define CONTEST_OPPONENT_OTNAME_EVAN             "EVAN"
+#define CONTEST_OPPONENT_NICKNAME_KELSEY         "DOTS"
+#define CONTEST_OPPONENT_OTNAME_KELSEY           "KELSEY"
+#define CONTEST_OPPONENT_NICKNAME_MADISON        "TATAY"
+#define CONTEST_OPPONENT_OTNAME_MADISON          "MADISON"
+#define CONTEST_OPPONENT_NICKNAME_RAYMOND        "NINDA"
+#define CONTEST_OPPONENT_OTNAME_RAYMOND          "RAYMOND"
+#define CONTEST_OPPONENT_NICKNAME_GRANT          "SMISH"
+#define CONTEST_OPPONENT_OTNAME_GRANT            "GRANT"
+#define CONTEST_OPPONENT_NICKNAME_PAIGE          "GULWEE"
+#define CONTEST_OPPONENT_OTNAME_PAIGE            "PAIGE"
+#define CONTEST_OPPONENT_NICKNAME_ALEC           "SLOKTH"
+#define CONTEST_OPPONENT_OTNAME_ALEC             "ALEC"
+#define CONTEST_OPPONENT_NICKNAME_SYDNEY         "WHIRIS"
+#define CONTEST_OPPONENT_OTNAME_SYDNEY           "SYDNEY"
+#define CONTEST_OPPONENT_NICKNAME_MORRIS         "MAHITA"
+#define CONTEST_OPPONENT_OTNAME_MORRIS           "MORRIS"
+#define CONTEST_OPPONENT_NICKNAME_MARIAH         "RONAR"
+#define CONTEST_OPPONENT_OTNAME_MARIAH           "MARIAH"
+#define CONTEST_OPPONENT_NICKNAME_RUSSELL        "ZUTZU"
+#define CONTEST_OPPONENT_OTNAME_RUSSELL          "RUSSELL"
+#define CONTEST_OPPONENT_NICKNAME_MELANIE        "GULIN"
+#define CONTEST_OPPONENT_OTNAME_MELANIE          "MELANIE"
+#define CONTEST_OPPONENT_NICKNAME_CHANCE         "RIKELEC"
+#define CONTEST_OPPONENT_OTNAME_CHANCE           "CHANCE"
+#define CONTEST_OPPONENT_NICKNAME_KARINA         "RELIA"
+#define CONTEST_OPPONENT_OTNAME_KARINA           "KARINA"
+#define CONTEST_OPPONENT_NICKNAME_BOBBY          "DUODO"
+#define CONTEST_OPPONENT_OTNAME_BOBBY            "BOBBY"
+#define CONTEST_OPPONENT_NICKNAME_CLAIRE         "PINCHIN"
+#define CONTEST_OPPONENT_OTNAME_CLAIRE           "CLAIRE"
+#define CONTEST_OPPONENT_NICKNAME_WILLIE         "NACAC"
+#define CONTEST_OPPONENT_OTNAME_WILLIE           "WILLIE"
+#define CONTEST_OPPONENT_NICKNAME_CASSIDY        "SHRAND"
+#define CONTEST_OPPONENT_OTNAME_CASSIDY          "CASSIDY"
+#define CONTEST_OPPONENT_NICKNAME_MORGAN         "TOYBAL"
+#define CONTEST_OPPONENT_OTNAME_MORGAN           "MORGAN"
+#define CONTEST_OPPONENT_NICKNAME_SUMMER         "LENUM"
+#define CONTEST_OPPONENT_OTNAME_SUMMER           "SUMMER"
+#define CONTEST_OPPONENT_NICKNAME_MILES          "SPININ"
+#define CONTEST_OPPONENT_OTNAME_MILES            "MILES"
+#define CONTEST_OPPONENT_NICKNAME_AUDREY         "SWABY"
+#define CONTEST_OPPONENT_OTNAME_AUDREY           "AUDREY"
+#define CONTEST_OPPONENT_NICKNAME_AVERY          "NOONE"
+#define CONTEST_OPPONENT_OTNAME_AVERY            "AVERY"
+#define CONTEST_OPPONENT_NICKNAME_ARIANA         "KECON"
+#define CONTEST_OPPONENT_OTNAME_ARIANA           "ARIANA"
+#define CONTEST_OPPONENT_NICKNAME_ASHTON         "GOLDEN"
+#define CONTEST_OPPONENT_OTNAME_ASHTON           "ASHTON"
+#define CONTEST_OPPONENT_NICKNAME_SANDRA         "BOBOACH"
+#define CONTEST_OPPONENT_OTNAME_SANDRA           "SANDRA"
+#define CONTEST_OPPONENT_NICKNAME_CARSON         "CORPY"
+#define CONTEST_OPPONENT_OTNAME_CARSON           "CARSON"
+#define CONTEST_OPPONENT_NICKNAME_KATRINA        "TADO"
+#define CONTEST_OPPONENT_OTNAME_KATRINA          "KATRINA"
+#define CONTEST_OPPONENT_NICKNAME_RONNIE         "LAIRN"
+#define CONTEST_OPPONENT_OTNAME_RONNIE           "RONNIE"
+#define CONTEST_OPPONENT_NICKNAME_CLAUDIA        "NUZLE"
+#define CONTEST_OPPONENT_OTNAME_CLAUDIA          "CLAUDIA"
+#define CONTEST_OPPONENT_NICKNAME_ELIAS          "NINAS"
+#define CONTEST_OPPONENT_OTNAME_ELIAS            "ELIAS"
+#define CONTEST_OPPONENT_NICKNAME_JADE           "WELOW"
+#define CONTEST_OPPONENT_OTNAME_JADE             "JADE"
+#define CONTEST_OPPONENT_NICKNAME_FRANCIS        "YENA"
+#define CONTEST_OPPONENT_OTNAME_FRANCIS          "FRANCIS"
+#define CONTEST_OPPONENT_NICKNAME_ALISHA         "TIFLY"
+#define CONTEST_OPPONENT_OTNAME_ALISHA           "ALISHA"
+#define CONTEST_OPPONENT_NICKNAME_SAUL           "KINGSEA"
+#define CONTEST_OPPONENT_OTNAME_SAUL             "SAUL"
+#define CONTEST_OPPONENT_NICKNAME_FELICIA        "ERUPAM"
+#define CONTEST_OPPONENT_OTNAME_FELICIA          "FELICIA"
+#define CONTEST_OPPONENT_NICKNAME_EMILIO         "CHOPAM"
+#define CONTEST_OPPONENT_OTNAME_EMILIO           "EMILIO"
+#define CONTEST_OPPONENT_NICKNAME_KARLA          "LOMBE"
+#define CONTEST_OPPONENT_OTNAME_KARLA            "KARLA"
+#define CONTEST_OPPONENT_NICKNAME_DARRYL         "VIPES"
+#define CONTEST_OPPONENT_OTNAME_DARRYL           "DARRYL"
+#define CONTEST_OPPONENT_NICKNAME_SELENA         "MERAIL"
+#define CONTEST_OPPONENT_OTNAME_SELENA           "SELENA"
+#define CONTEST_OPPONENT_NICKNAME_NOEL           "KARPAG"
+#define CONTEST_OPPONENT_OTNAME_NOEL             "NOEL"
+#define CONTEST_OPPONENT_NICKNAME_LACEY          "LUNONE"
+#define CONTEST_OPPONENT_OTNAME_LACEY            "LACEY"
+#define CONTEST_OPPONENT_NICKNAME_CORBIN         "PELIPE"
+#define CONTEST_OPPONENT_OTNAME_CORBIN           "CORBIN"
+#define CONTEST_OPPONENT_NICKNAME_JUSTINA        "RADOS"
+#define CONTEST_OPPONENT_OTNAME_JUSTINA          "JUSTINA"
+#define CONTEST_OPPONENT_NICKNAME_RALPH          "LOUDERD"
+#define CONTEST_OPPONENT_OTNAME_RALPH            "RALPH"
+#define CONTEST_OPPONENT_NICKNAME_ROSA           "CATTED"
+#define CONTEST_OPPONENT_OTNAME_ROSA             "ROSA"
+#define CONTEST_OPPONENT_NICKNAME_KEATON         "SLING"
+#define CONTEST_OPPONENT_OTNAME_KEATON           "KEATON"
+#define CONTEST_OPPONENT_NICKNAME_MAYRA          "TARIA"
+#define CONTEST_OPPONENT_OTNAME_MAYRA            "MAYRA"
+#define CONTEST_OPPONENT_NICKNAME_LAMAR          "SHEDJA"
+#define CONTEST_OPPONENT_OTNAME_LAMAR            "LAMAR"
+#define CONTEST_OPPONENT_NICKNAME_AUBREY         "PLUMILE"
+#define CONTEST_OPPONENT_OTNAME_AUBREY           "AUBREY"
+#define CONTEST_OPPONENT_NICKNAME_NIGEL          "KULLUSK"
+#define CONTEST_OPPONENT_OTNAME_NIGEL            "NIGEL"
+#define CONTEST_OPPONENT_NICKNAME_CAMILLE        "UTAN"
+#define CONTEST_OPPONENT_OTNAME_CAMILLE          "CAMILLE"
+#define CONTEST_OPPONENT_NICKNAME_DEON           "PEDOS"
+#define CONTEST_OPPONENT_OTNAME_DEON             "DEON"
+#define CONTEST_OPPONENT_NICKNAME_JANELLE        "LUVIS"
+#define CONTEST_OPPONENT_OTNAME_JANELLE          "JANELLE"
+#define CONTEST_OPPONENT_NICKNAME_HEATH          "HEROSS"
+#define CONTEST_OPPONENT_OTNAME_HEATH            "HEATH"
+#define CONTEST_OPPONENT_NICKNAME_SASHA          "RODLECT"
+#define CONTEST_OPPONENT_OTNAME_SASHA            "SASHA"
+#define CONTEST_OPPONENT_NICKNAME_FRANKIE        "CHUPY"
+#define CONTEST_OPPONENT_OTNAME_FRANKIE          "FRANKIE"
+#define CONTEST_OPPONENT_NICKNAME_HELEN          "WOBET"
+#define CONTEST_OPPONENT_OTNAME_HELEN            "HELEN"
+#elif defined(GERMAN)
+#define CONTEST_OPPONENT_NICKNAME_JIMMY        "FIFFI"
+#define CONTEST_OPPONENT_OTNAME_JIMMY          "JIMMY"
+#define CONTEST_OPPONENT_NICKNAME_EDITH        "ZIGGY"
+#define CONTEST_OPPONENT_OTNAME_EDITH          "KLARA"
+#define CONTEST_OPPONENT_NICKNAME_EVAN         "DOXU"
+#define CONTEST_OPPONENT_OTNAME_EVAN           "KARLO"
+#define CONTEST_OPPONENT_NICKNAME_KELSEY       "SAMINI"
+#define CONTEST_OPPONENT_OTNAME_KELSEY         "TRUDI"
+#define CONTEST_OPPONENT_NICKNAME_MADISON      "SCHWALBI"
+#define CONTEST_OPPONENT_OTNAME_MADISON        "HELENA"
+#define CONTEST_OPPONENT_NICKNAME_RAYMOND      "CADINJA"
+#define CONTEST_OPPONENT_OTNAME_RAYMOND        "WILLI"
+#define CONTEST_OPPONENT_NICKNAME_GRANT        "KNILZLI"
+#define CONTEST_OPPONENT_OTNAME_GRANT          "HARTMUT"
+#define CONTEST_OPPONENT_NICKNAME_PAIGE        "WINGI"
+#define CONTEST_OPPONENT_OTNAME_PAIGE          "CLAUDIA"
+#define CONTEST_OPPONENT_NICKNAME_ALEC         "BLUMPI"
+#define CONTEST_OPPONENT_OTNAME_ALEC           "ALEC"
+#define CONTEST_OPPONENT_NICKNAME_SYDNEY       "FLURMI"
+#define CONTEST_OPPONENT_OTNAME_SYDNEY         "SILKE"
+#define CONTEST_OPPONENT_NICKNAME_MORRIS       "MAHITA"
+#define CONTEST_OPPONENT_OTNAME_MORRIS         "PEER"
+#define CONTEST_OPPONENT_NICKNAME_MARIAH       "STOLLI"
+#define CONTEST_OPPONENT_OTNAME_MARIAH         "MARIA"
+#define CONTEST_OPPONENT_NICKNAME_RUSSELL      "BLUTBAT"
+#define CONTEST_OPPONENT_OTNAME_RUSSELL        "RUDOLF"
+#define CONTEST_OPPONENT_NICKNAME_MELANIE      "SCHLUPPI"
+#define CONTEST_OPPONENT_OTNAME_MELANIE        "MELANIE"
+#define CONTEST_OPPONENT_NICKNAME_CHANCE       "FRIZZZEL"
+#define CONTEST_OPPONENT_OTNAME_CHANCE         "BERTRAM"
+#define CONTEST_OPPONENT_NICKNAME_KARINA       "ROSALI"
+#define CONTEST_OPPONENT_OTNAME_KARINA         "KARINA"
+#define CONTEST_OPPONENT_NICKNAME_BOBBY        "DOLDI"
+#define CONTEST_OPPONENT_OTNAME_BOBBY          "BOBBY"
+#define CONTEST_OPPONENT_NICKNAME_CLAIRE       "KNACKI"
+#define CONTEST_OPPONENT_OTNAME_CLAIRE         "JUDITH"
+#define CONTEST_OPPONENT_NICKNAME_WILLIE       "KOTUS"
+#define CONTEST_OPPONENT_OTNAME_WILLIE         "HELMUT"
+#define CONTEST_OPPONENT_NICKNAME_CASSIDY      "SADAN"
+#define CONTEST_OPPONENT_OTNAME_CASSIDY        "BRITTA"
+#define CONTEST_OPPONENT_NICKNAME_MORGAN       "PUPPIBAL"
+#define CONTEST_OPPONENT_OTNAME_MORGAN         "TORBEN"
+#define CONTEST_OPPONENT_NICKNAME_SUMMER       "CLAMAUK"
+#define CONTEST_OPPONENT_OTNAME_SUMMER         "BIANKA"
+#define CONTEST_OPPONENT_NICKNAME_MILES        "SPIRRWIRR"
+#define CONTEST_OPPONENT_OTNAME_MILES          "ALEX"
+#define CONTEST_OPPONENT_NICKNAME_AUDREY       "BLUPPF"
+#define CONTEST_OPPONENT_OTNAME_AUDREY         "SABINE"
+#define CONTEST_OPPONENT_NICKNAME_AVERY        "DAKSIRAD"
+#define CONTEST_OPPONENT_OTNAME_AVERY          "AUGUST"
+#define CONTEST_OPPONENT_NICKNAME_ARIANA       "KECLI"
+#define CONTEST_OPPONENT_OTNAME_ARIANA         "ARIANA"
+#define CONTEST_OPPONENT_NICKNAME_ASHTON       "GOLDINCHEN"
+#define CONTEST_OPPONENT_OTNAME_ASHTON         "TONI"
+#define CONTEST_OPPONENT_NICKNAME_SANDRA       "SCHMERBSE"
+#define CONTEST_OPPONENT_OTNAME_SANDRA         "SUSI"
+#define CONTEST_OPPONENT_NICKNAME_CARSON       "KREBSILI"
+#define CONTEST_OPPONENT_OTNAME_CARSON         "CLEMENS"
+#define CONTEST_OPPONENT_NICKNAME_KATRINA      "URLOTZO"
+#define CONTEST_OPPONENT_OTNAME_KATRINA        "KATRIN"
+#define CONTEST_OPPONENT_NICKNAME_RONNIE       "STROLLAK"
+#define CONTEST_OPPONENT_OTNAME_RONNIE         "ACHIM"
+#define CONTEST_OPPONENT_NICKNAME_CLAUDIA      "BLASNI"
+#define CONTEST_OPPONENT_OTNAME_CLAUDIA        "GABI"
+#define CONTEST_OPPONENT_NICKNAME_ELIAS        "ASKINJA"
+#define CONTEST_OPPONENT_OTNAME_ELIAS          "ROLF"
+#define CONTEST_OPPONENT_NICKNAME_JADE         "SCHWALLO"
+#define CONTEST_OPPONENT_OTNAME_JADE           "ELSE"
+#define CONTEST_OPPONENT_NICKNAME_FRANCIS      "JÄNAGI"
+#define CONTEST_OPPONENT_OTNAME_FRANCIS        "FRANK"
+#define CONTEST_OPPONENT_NICKNAME_ALISHA       "PAPINILLI"
+#define CONTEST_OPPONENT_OTNAME_ALISHA         "ANNA"
+#define CONTEST_OPPONENT_NICKNAME_SAUL         "KINGOLA"
+#define CONTEST_OPPONENT_OTNAME_SAUL           "KONRAD"
+#define CONTEST_OPPONENT_NICKNAME_FELICIA      "ERUPTAM"
+#define CONTEST_OPPONENT_OTNAME_FELICIA        "LUISE"
+#define CONTEST_OPPONENT_NICKNAME_EMILIO       "OLLOMA"
+#define CONTEST_OPPONENT_OTNAME_EMILIO         "MICHAEL"
+#define CONTEST_OPPONENT_NICKNAME_KARLA        "OMBRE"
+#define CONTEST_OPPONENT_OTNAME_KARLA          "ANIKA"
+#define CONTEST_OPPONENT_NICKNAME_DARRYL       "PITISVI"
+#define CONTEST_OPPONENT_OTNAME_DARRYL         "DETLEF"
+#define CONTEST_OPPONENT_NICKNAME_SELENA       "WAILA"
+#define CONTEST_OPPONENT_OTNAME_SELENA         "XENIA"
+#define CONTEST_OPPONENT_NICKNAME_NOEL         "KARDORPA"
+#define CONTEST_OPPONENT_OTNAME_NOEL           "FLORIAN"
+#define CONTEST_OPPONENT_NICKNAME_LACEY        "LUNA"
+#define CONTEST_OPPONENT_OTNAME_LACEY          "DIANA"
+#define CONTEST_OPPONENT_NICKNAME_CORBIN       "PEPE"
+#define CONTEST_OPPONENT_OTNAME_CORBIN         "LUTZ"
+#define CONTEST_OPPONENT_NICKNAME_JUSTINA      "GARADI"
+#define CONTEST_OPPONENT_OTNAME_JUSTINA        "JASMIN"
+#define CONTEST_OPPONENT_NICKNAME_RALPH        "KRAKEEL"
+#define CONTEST_OPPONENT_OTNAME_RALPH          "GERT"
+#define CONTEST_OPPONENT_NICKNAME_ROSA         "ENEKOTO"
+#define CONTEST_OPPONENT_OTNAME_ROSA           "ROSA"
+#define CONTEST_OPPONENT_NICKNAME_KEATON       "ASSIMAX"
+#define CONTEST_OPPONENT_OTNAME_KEATON         "KURT"
+#define CONTEST_OPPONENT_NICKNAME_MAYRA        "RIA"
+#define CONTEST_OPPONENT_OTNAME_MAYRA          "SONJA"
+#define CONTEST_OPPONENT_NICKNAME_LAMAR        "EXUVINJA"
+#define CONTEST_OPPONENT_OTNAME_LAMAR          "SÖNKE"
+#define CONTEST_OPPONENT_NICKNAME_AUBREY       "BLUMIEFT"
+#define CONTEST_OPPONENT_OTNAME_AUBREY         "MAGDA"
+#define CONTEST_OPPONENT_NICKNAME_NIGEL        "WANDELBOLD"
+#define CONTEST_OPPONENT_OTNAME_NIGEL          "SASCHA"
+#define CONTEST_OPPONENT_NICKNAME_CAMILLE      "TUMANI"
+#define CONTEST_OPPONENT_OTNAME_CAMILLE        "MILA"
+#define CONTEST_OPPONENT_NICKNAME_DEON         "HAITODO"
+#define CONTEST_OPPONENT_OTNAME_DEON           "KNUT"
+#define CONTEST_OPPONENT_NICKNAME_JANELLE      "KUSSLIEB"
+#define CONTEST_OPPONENT_OTNAME_JANELLE        "INCA"
+#define CONTEST_OPPONENT_NICKNAME_HEATH        "SKARAB"
+#define CONTEST_OPPONENT_OTNAME_HEATH          "FELIX"
+#define CONTEST_OPPONENT_NICKNAME_SASHA        "LEKBAL"
+#define CONTEST_OPPONENT_OTNAME_SASHA          "DEBORA"
+#define CONTEST_OPPONENT_NICKNAME_FRANKIE      "DEIBEL"
+#define CONTEST_OPPONENT_OTNAME_FRANKIE        "BORIS"
+#define CONTEST_OPPONENT_NICKNAME_HELEN        "WOHINGENAU"
+#define CONTEST_OPPONENT_OTNAME_HELEN          "DELIA"
+#endif //ENGLISH
+
 const struct ContestPokemon gContestOpponents[] = {
     [CONTEST_OPPONENT_JIMMY] = {
         .species = SPECIES_POOCHYENA,
-        .nickname = _("POOCHY"),
-        .trainerName = _("JIMMY"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_JIMMY),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_JIMMY),
         .trainerGfxId = OBJ_EVENT_GFX_BOY_1,
         .flags = CONTEST_AI_SET_1,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -125,8 +369,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_EDITH] = {
         .species = SPECIES_ZIGZAGOON,
-        .nickname = _("ZIGOON"),
-        .trainerName = _("EDITH"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_EDITH),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_EDITH),
         .trainerGfxId = OBJ_EVENT_GFX_GIRL_1,
         .flags = CONTEST_AI_SET_2,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -147,8 +391,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_EVAN] = {
         .species = SPECIES_DUSTOX,
-        .nickname = _("DUSTER"),
-        .trainerName = _("EVAN"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_EVAN),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_EVAN),
         .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY_2,
         .flags = CONTEST_AI_SET_3,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -169,8 +413,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_KELSEY] = {
         .species = SPECIES_SEEDOT,
-        .nickname = _("DOTS"),
-        .trainerName = _("KELSEY"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_KELSEY),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_KELSEY),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1,
         .flags = CONTEST_AI_SET_4,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -191,8 +435,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_MADISON] = {
         .species = SPECIES_TAILLOW,
-        .nickname = _("TATAY"),
-        .trainerName = _("MADISON"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_MADISON),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_MADISON),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2,
         .flags = CONTEST_AI_SET_5,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -213,8 +457,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_RAYMOND] = {
         .species = SPECIES_NINCADA,
-        .nickname = _("NINDA"),
-        .trainerName = _("RAYMOND"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_RAYMOND),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_RAYMOND),
         .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT,
         .flags = CONTEST_AI_SET_6,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -235,8 +479,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_GRANT] = {
         .species = SPECIES_SHROOMISH,
-        .nickname = _("SMISH"),
-        .trainerName = _("GRANT"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_GRANT),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_GRANT),
         .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER,
         .flags = CONTEST_AI_SET_7,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -257,8 +501,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_PAIGE] = {
         .species = SPECIES_WINGULL,
-        .nickname = _("GULWEE"),
-        .trainerName = _("PAIGE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_PAIGE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_PAIGE),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5,
         .flags = CONTEST_AI_SET_8,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -279,8 +523,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_ALEC] = {
         .species = SPECIES_SLAKOTH,
-        .nickname = _("SLOKTH"),
-        .trainerName = _("ALEC"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_ALEC),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_ALEC),
         .trainerGfxId = OBJ_EVENT_GFX_CAMPER,
         .flags = CONTEST_AI_SET_9,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -301,8 +545,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_SYDNEY] = {
         .species = SPECIES_WHISMUR,
-        .nickname = _("WHIRIS"),
-        .trainerName = _("SYDNEY"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_SYDNEY),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_SYDNEY),
         .trainerGfxId = OBJ_EVENT_GFX_LASS,
         .flags = CONTEST_AI_SET_A,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -323,8 +567,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_MORRIS] = {
         .species = SPECIES_MAKUHITA,
-        .nickname = _("MAHITA"),
-        .trainerName = _("MORRIS"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_MORRIS),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_MORRIS),
         .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M,
         .flags = CONTEST_AI_SET_B,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -345,8 +589,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_MARIAH] = {
         .species = SPECIES_ARON,
-        .nickname = _("RONAR"),
-        .trainerName = _("MARIAH"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_MARIAH),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_MARIAH),
         .trainerGfxId = OBJ_EVENT_GFX_GIRL_2,
         .flags = CONTEST_AI_SET_C,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -367,8 +611,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_RUSSELL] = {
         .species = SPECIES_ZUBAT,
-        .nickname = _("ZUTZU"),
-        .trainerName = _("RUSSELL"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_RUSSELL),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_RUSSELL),
         .trainerGfxId = OBJ_EVENT_GFX_MAN_4,
         .flags = CONTEST_AI_SET_D,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -389,8 +633,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_MELANIE] = {
         .species = SPECIES_GULPIN,
-        .nickname = _("GULIN"),
-        .trainerName = _("MELANIE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_MELANIE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_MELANIE),
         .trainerGfxId = OBJ_EVENT_GFX_LITTLE_GIRL_1,
         .flags = CONTEST_AI_SET_E,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -411,8 +655,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_CHANCE] = {
         .species = SPECIES_ELECTRIKE,
-        .nickname = _("RIKELEC"),
-        .trainerName = _("CHANCE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_CHANCE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_CHANCE),
         .trainerGfxId = OBJ_EVENT_GFX_BOY_4,
         .flags = CONTEST_AI_SET_F,
         .whichRank = CONTEST_RANK_NORMAL,
@@ -433,8 +677,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_KARINA] = {
         .species = SPECIES_ROSELIA,
-        .nickname = _("RELIA"),
-        .trainerName = _("KARINA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_KARINA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_KARINA),
         .trainerGfxId = OBJ_EVENT_GFX_PICNICKER,
         .flags = CONTEST_AI_SET_10,
         .whichRank = CONTEST_RANK_SUPER,
@@ -455,8 +699,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_BOBBY] = {
         .species = SPECIES_DODUO,
-        .nickname = _("DUODO"),
-        .trainerName = _("BOBBY"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_BOBBY),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_BOBBY),
         .trainerGfxId = OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M,
         .flags = CONTEST_AI_SET_2,
         .whichRank = CONTEST_RANK_SUPER,
@@ -477,8 +721,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_CLAIRE] = {
         .species = SPECIES_TRAPINCH,
-        .nickname = _("PINCHIN"),
-        .trainerName = _("CLAIRE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_CLAIRE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_CLAIRE),
         .trainerGfxId = OBJ_EVENT_GFX_GIRL_1,
         .flags = CONTEST_AI_SET_11,
         .whichRank = CONTEST_RANK_SUPER,
@@ -499,8 +743,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_WILLIE] = {
         .species = SPECIES_CACNEA,
-        .nickname = _("NACAC"),
-        .trainerName = _("WILLIE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_WILLIE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_WILLIE),
         .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY_2,
         .flags = CONTEST_AI_SET_12,
         .whichRank = CONTEST_RANK_SUPER,
@@ -521,8 +765,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_CASSIDY] = {
         .species = SPECIES_SANDSHREW,
-        .nickname = _("SHRAND"),
-        .trainerName = _("CASSIDY"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_CASSIDY),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_CASSIDY),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2,
         .flags = CONTEST_AI_SET_13,
         .whichRank = CONTEST_RANK_SUPER,
@@ -543,8 +787,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_MORGAN] = {
         .species = SPECIES_BALTOY,
-        .nickname = _("TOYBAL"),
-        .trainerName = _("MORGAN"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_MORGAN),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_MORGAN),
         .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT,
         .flags = CONTEST_AI_SET_14,
         .whichRank = CONTEST_RANK_SUPER,
@@ -565,8 +809,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_SUMMER] = {
         .species = SPECIES_NUMEL,
-        .nickname = _("LENUM"),
-        .trainerName = _("SUMMER"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_SUMMER),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_SUMMER),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5,
         .flags = CONTEST_AI_SET_15,
         .whichRank = CONTEST_RANK_SUPER,
@@ -587,8 +831,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_MILES] = {
         .species = SPECIES_SPINDA,
-        .nickname = _("SPININ"),
-        .trainerName = _("MILES"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_MILES),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_MILES),
         .trainerGfxId = OBJ_EVENT_GFX_CAMPER,
         .flags = CONTEST_AI_SET_16,
         .whichRank = CONTEST_RANK_SUPER,
@@ -609,8 +853,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_AUDREY] = {
         .species = SPECIES_SWABLU,
-        .nickname = _("SWABY"),
-        .trainerName = _("AUDREY"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_AUDREY),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_AUDREY),
         .trainerGfxId = OBJ_EVENT_GFX_LASS,
         .flags = CONTEST_AI_SET_17,
         .whichRank = CONTEST_RANK_SUPER,
@@ -631,8 +875,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_AVERY] = {
         .species = SPECIES_LINOONE,
-        .nickname = _("NOONE"),
-        .trainerName = _("AVERY"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_AVERY),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_AVERY),
         .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M,
         .flags = CONTEST_AI_SET_A,
         .whichRank = CONTEST_RANK_SUPER,
@@ -653,8 +897,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_ARIANA] = {
         .species = SPECIES_KECLEON,
-        .nickname = _("KECON"),
-        .trainerName = _("ARIANA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_ARIANA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_ARIANA),
         .trainerGfxId = OBJ_EVENT_GFX_GIRL_2,
         .flags = CONTEST_AI_SET_18,
         .whichRank = CONTEST_RANK_SUPER,
@@ -675,8 +919,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_ASHTON] = {
         .species = SPECIES_GOLDEEN,
-        .nickname = _("GOLDEN"),
-        .trainerName = _("ASHTON"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_ASHTON),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_ASHTON),
         .trainerGfxId = OBJ_EVENT_GFX_MAN_4,
         .flags = CONTEST_AI_SET_19,
         .whichRank = CONTEST_RANK_SUPER,
@@ -697,8 +941,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_SANDRA] = {
         .species = SPECIES_BARBOACH,
-        .nickname = _("BOBOACH"),
-        .trainerName = _("SANDRA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_SANDRA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_SANDRA),
         .trainerGfxId = OBJ_EVENT_GFX_LITTLE_GIRL_1,
         .flags = CONTEST_AI_SET_1A,
         .whichRank = CONTEST_RANK_SUPER,
@@ -719,8 +963,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_CARSON] = {
         .species = SPECIES_SKARMORY,
-        .nickname = _("CORPY"),
-        .trainerName = _("CARSON"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_CARSON),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_CARSON),
         .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER,
         .flags = CONTEST_AI_SET_1B,
         .whichRank = CONTEST_RANK_SUPER,
@@ -741,8 +985,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_KATRINA] = {
         .species = SPECIES_LOTAD,
-        .nickname = _("TADO"),
-        .trainerName = _("KATRINA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_KATRINA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_KATRINA),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1,
         .flags = CONTEST_AI_SET_1C,
         .whichRank = CONTEST_RANK_SUPER,
@@ -763,8 +1007,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_RONNIE] = {
         .species = SPECIES_LAIRON,
-        .nickname = _("LAIRN"),
-        .trainerName = _("RONNIE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_RONNIE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_RONNIE),
         .trainerGfxId = OBJ_EVENT_GFX_HIKER,
         .flags = CONTEST_AI_SET_1D,
         .whichRank = CONTEST_RANK_HYPER,
@@ -785,8 +1029,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_CLAUDIA] = {
         .species = SPECIES_NUZLEAF,
-        .nickname = _("NUZLE"),
-        .trainerName = _("CLAUDIA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_CLAUDIA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_CLAUDIA),
         .trainerGfxId = OBJ_EVENT_GFX_GIRL_1,
         .flags = CONTEST_AI_SET_2,
         .whichRank = CONTEST_RANK_HYPER,
@@ -807,8 +1051,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_ELIAS] = {
         .species = SPECIES_NINJASK,
-        .nickname = _("NINAS"),
-        .trainerName = _("ELIAS"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_ELIAS),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_ELIAS),
         .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY_2,
         .flags = CONTEST_AI_SET_11,
         .whichRank = CONTEST_RANK_HYPER,
@@ -829,8 +1073,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_JADE] = {
         .species = SPECIES_SWELLOW,
-        .nickname = _("WELOW"),
-        .trainerName = _("JADE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_JADE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_JADE),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2,
         .flags = CONTEST_AI_SET_12,
         .whichRank = CONTEST_RANK_HYPER,
@@ -851,8 +1095,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_FRANCIS] = {
         .species = SPECIES_MIGHTYENA,
-        .nickname = _("YENA"),
-        .trainerName = _("FRANCIS"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_FRANCIS),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_FRANCIS),
         .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT,
         .flags = CONTEST_AI_SET_5,
         .whichRank = CONTEST_RANK_HYPER,
@@ -873,8 +1117,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_ALISHA] = {
         .species = SPECIES_BEAUTIFLY,
-        .nickname = _("TIFLY"),
-        .trainerName = _("ALISHA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_ALISHA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_ALISHA),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5,
         .flags = CONTEST_AI_SET_1E,
         .whichRank = CONTEST_RANK_HYPER,
@@ -895,8 +1139,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_SAUL] = {
         .species = SPECIES_SEAKING,
-        .nickname = _("KINGSEA"),
-        .trainerName = _("SAUL"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_SAUL),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_SAUL),
         .trainerGfxId = OBJ_EVENT_GFX_CAMPER,
         .flags = CONTEST_AI_SET_1F,
         .whichRank = CONTEST_RANK_HYPER,
@@ -917,8 +1161,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_FELICIA] = {
         .species = SPECIES_CAMERUPT,
-        .nickname = _("ERUPAM"),
-        .trainerName = _("FELICIA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_FELICIA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_FELICIA),
         .trainerGfxId = OBJ_EVENT_GFX_LASS,
         .flags = CONTEST_AI_SET_16,
         .whichRank = CONTEST_RANK_HYPER,
@@ -939,8 +1183,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_EMILIO] = {
         .species = SPECIES_MACHOP,
-        .nickname = _("CHOPAM"),
-        .trainerName = _("EMILIO"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_EMILIO),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_EMILIO),
         .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M,
         .flags = CONTEST_AI_SET_20,
         .whichRank = CONTEST_RANK_HYPER,
@@ -961,8 +1205,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_KARLA] = {
         .species = SPECIES_LOMBRE,
-        .nickname = _("LOMBE"),
-        .trainerName = _("KARLA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_KARLA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_KARLA),
         .trainerGfxId = OBJ_EVENT_GFX_GIRL_2,
         .flags = CONTEST_AI_SET_A,
         .whichRank = CONTEST_RANK_HYPER,
@@ -983,8 +1227,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_DARRYL] = {
         .species = SPECIES_SEVIPER,
-        .nickname = _("VIPES"),
-        .trainerName = _("DARRYL"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_DARRYL),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_DARRYL),
         .trainerGfxId = OBJ_EVENT_GFX_MAN_4,
         .flags = CONTEST_AI_SET_18,
         .whichRank = CONTEST_RANK_HYPER,
@@ -1005,8 +1249,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_SELENA] = {
         .species = SPECIES_WAILMER,
-        .nickname = _("MERAIL"),
-        .trainerName = _("SELENA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_SELENA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_SELENA),
         .trainerGfxId = OBJ_EVENT_GFX_OLD_WOMAN_1,
         .flags = CONTEST_AI_SET_19,
         .whichRank = CONTEST_RANK_HYPER,
@@ -1027,8 +1271,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_NOEL] = {
         .species = SPECIES_MAGIKARP,
-        .nickname = _("KARPAG"),
-        .trainerName = _("NOEL"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_NOEL),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_NOEL),
         .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER,
         .flags = CONTEST_AI_SET_1A,
         .whichRank = CONTEST_RANK_HYPER,
@@ -1049,8 +1293,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_LACEY] = {
         .species = SPECIES_LUNATONE,
-        .nickname = _("LUNONE"),
-        .trainerName = _("LACEY"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_LACEY),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_LACEY),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1,
         .flags = CONTEST_AI_SET_21,
         .whichRank = CONTEST_RANK_HYPER,
@@ -1071,8 +1315,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_CORBIN] = {
         .species = SPECIES_PELIPPER,
-        .nickname = _("PELIPE"),
-        .trainerName = _("CORBIN"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_CORBIN),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_CORBIN),
         .trainerGfxId = OBJ_EVENT_GFX_MANIAC,
         .flags = CONTEST_AI_SET_F,
         .whichRank = CONTEST_RANK_HYPER,
@@ -1093,8 +1337,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_JUSTINA] = {
         .species = SPECIES_GYARADOS,
-        .nickname = _("RADOS"),
-        .trainerName = _("JUSTINA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_JUSTINA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_JUSTINA),
         .trainerGfxId = OBJ_EVENT_GFX_PICNICKER,
         .flags = CONTEST_AI_SET_1D,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1115,8 +1359,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_RALPH] = {
         .species = SPECIES_LOUDRED,
-        .nickname = _("LOUDERD"),
-        .trainerName = _("RALPH"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_RALPH),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_RALPH),
         .trainerGfxId = OBJ_EVENT_GFX_OLD_MAN_1,
         .flags = CONTEST_AI_SET_2,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1137,8 +1381,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_ROSA] = {
         .species = SPECIES_DELCATTY,
-        .nickname = _("CATTED"),
-        .trainerName = _("ROSA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_ROSA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_ROSA),
         .trainerGfxId = OBJ_EVENT_GFX_GIRL_1,
         .flags = CONTEST_AI_SET_11,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1159,8 +1403,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_KEATON] = {
         .species = SPECIES_SLAKING,
-        .nickname = _("SLING"),
-        .trainerName = _("KEATON"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_KEATON),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_KEATON),
         .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY_2,
         .flags = CONTEST_AI_SET_12,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1181,8 +1425,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_MAYRA] = {
         .species = SPECIES_ALTARIA,
-        .nickname = _("TARIA"),
-        .trainerName = _("MAYRA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_MAYRA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_MAYRA),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2,
         .flags = CONTEST_AI_SET_5,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1203,8 +1447,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_LAMAR] = {
         .species = SPECIES_KIRLIA,
-        .nickname = _("SHEDJA"),
-        .trainerName = _("LAMAR"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_LAMAR),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_LAMAR),
         .trainerGfxId = OBJ_EVENT_GFX_BOY_4,
         .flags = CONTEST_AI_SET_1E,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1225,8 +1469,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_AUBREY] = {
         .species = SPECIES_VILEPLUME,
-        .nickname = _("PLUMILE"),
-        .trainerName = _("AUBREY"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_AUBREY),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_AUBREY),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5,
         .flags = CONTEST_AI_SET_1F,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1247,8 +1491,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_NIGEL] = {
         .species = SPECIES_DUSKULL,
-        .nickname = _("KULLUSK"),
-        .trainerName = _("NIGEL"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_NIGEL),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_NIGEL),
         .trainerGfxId = OBJ_EVENT_GFX_CAMPER,
         .flags = CONTEST_AI_SET_16,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1269,8 +1513,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_CAMILLE] = {
         .species = SPECIES_XATU,
-        .nickname = _("UTAN"),
-        .trainerName = _("CAMILLE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_CAMILLE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_CAMILLE),
         .trainerGfxId = OBJ_EVENT_GFX_LASS,
         .flags = CONTEST_AI_SET_20,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1291,8 +1535,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_DEON] = {
         .species = SPECIES_SHARPEDO,
-        .nickname = _("PEDOS"),
-        .trainerName = _("DEON"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_DEON),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_DEON),
         .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M,
         .flags = CONTEST_AI_SET_A,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1313,8 +1557,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_JANELLE] = {
         .species = SPECIES_LUVDISC,
-        .nickname = _("LUVIS"),
-        .trainerName = _("JANELLE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_JANELLE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_JANELLE),
         .trainerGfxId = OBJ_EVENT_GFX_GIRL_2,
         .flags = CONTEST_AI_SET_18,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1335,8 +1579,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_HEATH] = {
         .species = SPECIES_HERACROSS,
-        .nickname = _("HEROSS"),
-        .trainerName = _("HEATH"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_HEATH),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_HEATH),
         .trainerGfxId = OBJ_EVENT_GFX_MAN_4,
         .flags = CONTEST_AI_SET_19,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1357,8 +1601,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_SASHA] = {
         .species = SPECIES_ELECTRODE,
-        .nickname = _("RODLECT"),
-        .trainerName = _("SASHA"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_SASHA),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_SASHA),
         .trainerGfxId = OBJ_EVENT_GFX_LITTLE_GIRL_1,
         .flags = CONTEST_AI_SET_1A,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1379,8 +1623,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_FRANKIE] = {
         .species = SPECIES_PICHU,
-        .nickname = _("CHUPY"),
-        .trainerName = _("FRANKIE"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_FRANKIE),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_FRANKIE),
         .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER,
         .flags = CONTEST_AI_SET_21,
         .whichRank = CONTEST_RANK_MASTER,
@@ -1401,8 +1645,8 @@ const struct ContestPokemon gContestOpponents[] = {
     },
     [CONTEST_OPPONENT_HELEN] = {
         .species = SPECIES_WOBBUFFET,
-        .nickname = _("WOBET"),
-        .trainerName = _("HELEN"),
+        .nickname = _(CONTEST_OPPONENT_NICKNAME_HELEN),
+        .trainerName = _(CONTEST_OPPONENT_OTNAME_HELEN),
         .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1,
         .flags = CONTEST_AI_SET_F,
         .whichRank = CONTEST_RANK_MASTER,
diff --git a/src/data/text/contest_de.h b/src/data/text/contest_de.h
index 07322d245..11940d943 100644
--- a/src/data/text/contest_de.h
+++ b/src/data/text/contest_de.h
@@ -467,4 +467,4 @@ const u8 gUnknownText_MissedTurn[] = _("Verpasste Chance");
 
 const u8 gUnknownText_LinkStandbyAndWinner[] = _("Verbindung...");
 const u8 gUnknownText_ColorWhite2[] = _("{COLOR WHITE2}");
-const u8 gUnknownText_LinkWinner[] = _("Der Sieger ist {STR_VAR_2} von\n{STR_VAR_1}! Herzlichen Glückwunsch!!");
\ No newline at end of file
+const u8 gUnknownText_LinkWinner[] = _("Der Sieger ist {STR_VAR_2} von\n{STR_VAR_1}! Herzlichen Glückwunsch!");
\ No newline at end of file
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index addedb088..e8f40f08e 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -851,7 +851,7 @@ static bool8 FishingPoints(void)
     ConvertIntToDecimalStringN(gStringVar1, FeebasDebug_GetTrueNumberOfWaterTilesInMapThird(2), STR_CONV_MODE_RIGHT_ALIGN, 5);
     Menu_PrintText(gStringVar1, 11, 7);
 
-    FeebasSeedRng(gSaveBlock1.easyChatPairs[0].excitementAppealBonus);
+    FeebasSeedRng(gSaveBlock1.easyChatPairs[0].unk2);
     nWaterTiles = FishingPoints_CountFishingTilesInMapThird(0) + FishingPoints_CountFishingTilesInMapThird(1) + FishingPoints_CountFishingTilesInMapThird(2);
     nFeebas = 0;
 
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index 1305bd819..9a997a566 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -221,7 +221,7 @@ bool8 TayaDebugMenu_Trend(void)
         *r4++ = CHAR_SPACE;
         r4 = ConvertIntToDecimalStringN(r4, pair->unk0_7, STR_CONV_MODE_RIGHT_ALIGN, 3);
         *r4++ = CHAR_SPACE;
-        ConvertIntToDecimalStringN(r4, pair->excitementAppealBonus, STR_CONV_MODE_RIGHT_ALIGN, 5);
+        ConvertIntToDecimalStringN(r4, pair->unk2, STR_CONV_MODE_RIGHT_ALIGN, 5);
         Menu_PrintText(sp00, 1, 2 * i + 1);
         pair++;
     }
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 81435c366..94b697954 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -4477,40 +4477,40 @@ static void PrepareDebugOverlayBeforeShowingContestPainting(u8 a0)
     switch (a0)
     {
         case 0:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 0;
-            contestEntry->contestType = sPicTest_ContestType - 1;
-            StringCopy(contestEntry->trainer_name, sDummyTrainerName);
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 0;
+            contestEntry->contestCategory = sPicTest_ContestType - 1;
+            StringCopy(contestEntry->trainerName, sDummyTrainerName);
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
         case 1:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = sPicTest_MuseumArtTitleType - 1;
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = sPicTest_MuseumArtTitleType - 1;
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
         case 2:
-            gBattleStruct->contestWinnerIsForArtist = 1;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = sPicTest_PreviewType - 1;
+            eCurContestWinnerIsForArtist = TRUE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = sPicTest_PreviewType - 1;
             break;
         case 3:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = 0;
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = 0;
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
         case 4:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = 3;
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = 3;
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
         case 5:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = 9;
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = 9;
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
     }
 }
diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c
index dd23ccaea..47ba64c67 100644
--- a/src/debug/watanabe_debug_menu.c
+++ b/src/debug/watanabe_debug_menu.c
@@ -84,7 +84,7 @@ struct WatanabeEwram18000_2 {
     u8 random;
     u8 unk9;
     u8 unkA;
-    struct PlttData contestant;
+    struct PlttData unkC;
     u16 unk10[16];
 };
 
@@ -2712,10 +2712,10 @@ void debug_80C6EE8(u8 taskId)
     u16 hue;
     CpuCopy16(gPlttBufferUnfaded + 0x80, gUnknown_Debug_2038A20->unk10, 32);
     hue = gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81];
-    gUnknown_Debug_2038A20->contestant.r = hue & 0x1f;
-    gUnknown_Debug_2038A20->contestant.g = (hue & 0x3e0) >> 5;
-    gUnknown_Debug_2038A20->contestant.b = (hue & 0x7c00) >> 10;
-    gUnknown_Debug_2038A20->contestant.unused_15 = 0;
+    gUnknown_Debug_2038A20->unkC.r = hue & 0x1f;
+    gUnknown_Debug_2038A20->unkC.g = (hue & 0x3e0) >> 5;
+    gUnknown_Debug_2038A20->unkC.b = (hue & 0x7c00) >> 10;
+    gUnknown_Debug_2038A20->unkC.unused_15 = 0;
     debug_80C68CC(gUnknown_Debug_2038A20->unk7 + 1, 11, 10, 2);
     Menu_PrintText(gUnknown_Debug_083F8813, 13, 10);
     debug_80C68CC(hue, 14, 10, 4);
@@ -3129,18 +3129,18 @@ void debug_80C7294(u8 taskId)
         switch (gUnknown_Debug_2038A20->unkA)
         {
             case 0:
-                if (gUnknown_Debug_2038A20->contestant.r < 31)
-                    gUnknown_Debug_2038A20->contestant.r++;
+                if (gUnknown_Debug_2038A20->unkC.r < 31)
+                    gUnknown_Debug_2038A20->unkC.r++;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
             case 1:
-                if (gUnknown_Debug_2038A20->contestant.g < 31)
-                    gUnknown_Debug_2038A20->contestant.g++;
+                if (gUnknown_Debug_2038A20->unkC.g < 31)
+                    gUnknown_Debug_2038A20->unkC.g++;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
             case 2:
-                if (gUnknown_Debug_2038A20->contestant.b < 31)
-                    gUnknown_Debug_2038A20->contestant.b++;
+                if (gUnknown_Debug_2038A20->unkC.b < 31)
+                    gUnknown_Debug_2038A20->unkC.b++;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
         }
@@ -3150,18 +3150,18 @@ void debug_80C7294(u8 taskId)
         switch (gUnknown_Debug_2038A20->unkA)
         {
             case 0:
-                if (gUnknown_Debug_2038A20->contestant.r > 0)
-                    gUnknown_Debug_2038A20->contestant.r--;
+                if (gUnknown_Debug_2038A20->unkC.r > 0)
+                    gUnknown_Debug_2038A20->unkC.r--;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
             case 1:
-                if (gUnknown_Debug_2038A20->contestant.g > 0)
-                    gUnknown_Debug_2038A20->contestant.g--;
+                if (gUnknown_Debug_2038A20->unkC.g > 0)
+                    gUnknown_Debug_2038A20->unkC.g--;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
             case 2:
-                if (gUnknown_Debug_2038A20->contestant.b > 0)
-                    gUnknown_Debug_2038A20->contestant.b--;
+                if (gUnknown_Debug_2038A20->unkC.b > 0)
+                    gUnknown_Debug_2038A20->unkC.b--;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
         }
@@ -3170,7 +3170,7 @@ void debug_80C7294(u8 taskId)
 
 void debug_80C74E4(u8 taskId)
 {
-    u16 pal = (gUnknown_Debug_2038A20->contestant.r & 0x001f) + ((gUnknown_Debug_2038A20->contestant.g << 5) & 0x03e0) + ((gUnknown_Debug_2038A20->contestant.b << 10) & 0x7c00);
+    u16 pal = (gUnknown_Debug_2038A20->unkC.r & 0x001f) + ((gUnknown_Debug_2038A20->unkC.g << 5) & 0x03e0) + ((gUnknown_Debug_2038A20->unkC.b << 10) & 0x7c00);
     gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81] = pal;
     gPlttBufferFaded[gUnknown_Debug_2038A20->unk7 + 0x81] = pal;
     gPlttBufferUnfaded[0x101 + gUnknown_Debug_2038A20->unk6 * 16 + gUnknown_Debug_2038A20->unk7] = pal;
@@ -3190,13 +3190,13 @@ void debug_80C7584(struct Sprite *sprite)
         {
             default:
             case 0:
-                shade = gUnknown_Debug_2038A20->contestant.r;
+                shade = gUnknown_Debug_2038A20->unkC.r;
                 break;
             case 1:
-                shade = gUnknown_Debug_2038A20->contestant.g;
+                shade = gUnknown_Debug_2038A20->unkC.g;
                 break;
             case 2:
-                shade = gUnknown_Debug_2038A20->contestant.b;
+                shade = gUnknown_Debug_2038A20->unkC.b;
                 break;
         }
         sprite->pos2.x = 4 * shade;
@@ -3320,10 +3320,10 @@ void debug_80C7A54(u8 taskId)
     u16 hue;
     CpuCopy16(gPlttBufferUnfaded + 0x80, gUnknown_Debug_2038A20->unk10, 32);
     hue = gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81];
-    gUnknown_Debug_2038A20->contestant.r = hue & 0x1f;
-    gUnknown_Debug_2038A20->contestant.g = (hue & 0x3e0) >> 5;
-    gUnknown_Debug_2038A20->contestant.b = (hue & 0x7c00) >> 10;
-    gUnknown_Debug_2038A20->contestant.unused_15 = 0;
+    gUnknown_Debug_2038A20->unkC.r = hue & 0x1f;
+    gUnknown_Debug_2038A20->unkC.g = (hue & 0x3e0) >> 5;
+    gUnknown_Debug_2038A20->unkC.b = (hue & 0x7c00) >> 10;
+    gUnknown_Debug_2038A20->unkC.unused_15 = 0;
     debug_80C68CC(gUnknown_Debug_2038A20->unk7 + 1, 11, 10, 2);
     Menu_PrintText(gUnknown_Debug_083F8813, 13, 10);
     debug_80C68CC(hue, 14, 10, 4);
@@ -3720,18 +3720,18 @@ void debug_80C7DDC(u8 taskId)
         switch (gUnknown_Debug_2038A20->unkA)
         {
             case 0:
-                if (gUnknown_Debug_2038A20->contestant.r < 31)
-                    gUnknown_Debug_2038A20->contestant.r++;
+                if (gUnknown_Debug_2038A20->unkC.r < 31)
+                    gUnknown_Debug_2038A20->unkC.r++;
                 gTasks[taskId].func = debug_80C802C;
                 break;
             case 1:
-                if (gUnknown_Debug_2038A20->contestant.g < 31)
-                    gUnknown_Debug_2038A20->contestant.g++;
+                if (gUnknown_Debug_2038A20->unkC.g < 31)
+                    gUnknown_Debug_2038A20->unkC.g++;
                 gTasks[taskId].func = debug_80C802C;
                 break;
             case 2:
-                if (gUnknown_Debug_2038A20->contestant.b < 31)
-                    gUnknown_Debug_2038A20->contestant.b++;
+                if (gUnknown_Debug_2038A20->unkC.b < 31)
+                    gUnknown_Debug_2038A20->unkC.b++;
                 gTasks[taskId].func = debug_80C802C;
                 break;
         }
@@ -3741,18 +3741,18 @@ void debug_80C7DDC(u8 taskId)
         switch (gUnknown_Debug_2038A20->unkA)
         {
             case 0:
-                if (gUnknown_Debug_2038A20->contestant.r > 0)
-                    gUnknown_Debug_2038A20->contestant.r--;
+                if (gUnknown_Debug_2038A20->unkC.r > 0)
+                    gUnknown_Debug_2038A20->unkC.r--;
                 gTasks[taskId].func = debug_80C802C;
                 break;
             case 1:
-                if (gUnknown_Debug_2038A20->contestant.g > 0)
-                    gUnknown_Debug_2038A20->contestant.g--;
+                if (gUnknown_Debug_2038A20->unkC.g > 0)
+                    gUnknown_Debug_2038A20->unkC.g--;
                 gTasks[taskId].func = debug_80C802C;
                 break;
             case 2:
-                if (gUnknown_Debug_2038A20->contestant.b > 0)
-                    gUnknown_Debug_2038A20->contestant.b--;
+                if (gUnknown_Debug_2038A20->unkC.b > 0)
+                    gUnknown_Debug_2038A20->unkC.b--;
                 gTasks[taskId].func = debug_80C802C;
                 break;
         }
@@ -3761,7 +3761,7 @@ void debug_80C7DDC(u8 taskId)
 
 void debug_80C802C(u8 taskId)
 {
-    u16 pal = (gUnknown_Debug_2038A20->contestant.r & 0x001f) + ((gUnknown_Debug_2038A20->contestant.g << 5) & 0x03e0) + ((gUnknown_Debug_2038A20->contestant.b << 10) & 0x7c00);
+    u16 pal = (gUnknown_Debug_2038A20->unkC.r & 0x001f) + ((gUnknown_Debug_2038A20->unkC.g << 5) & 0x03e0) + ((gUnknown_Debug_2038A20->unkC.b << 10) & 0x7c00);
     gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81] = pal;
     gPlttBufferFaded[gUnknown_Debug_2038A20->unk7 + 0x81] = pal;
     gPlttBufferUnfaded[0x101 + gUnknown_Debug_2038A20->unk6 * 16 + gUnknown_Debug_2038A20->unk7] = pal;
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 206ca7b4c..987249f50 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -461,7 +461,7 @@ void debug_sub_815D1D8(void)
             gMain.state++;
         break;
     case 8:
-        sub_800832C();
+        SetCloseLinkCallback();
         gMain.state++;
         break;
     case 9:
diff --git a/src/region_map.c b/src/region_map.c
index 36895b056..8c4e694bc 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1690,15 +1690,15 @@ void debug_sub_8110CCC(void)
 
 void debug_sub_8110D84(void)
 {
-    switch (sFlyDataPtr->round1Points)
+    switch (sFlyDataPtr->unk4)
     {
     case 0:
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
-        sFlyDataPtr->round1Points++;
+        sFlyDataPtr->unk4++;
         break;
     case 1:
         if (!UpdatePaletteFade())
-            sFlyDataPtr->round1Points++;
+            sFlyDataPtr->unk4++;
         break;
     case 2:
         switch (sub_80FAB60())
@@ -1709,7 +1709,7 @@ void debug_sub_8110D84(void)
             debug_sub_8110CCC();
             break;
         case 4:
-            if (sFlyDataPtr->regionMap.completedCombo != 0)
+            if (sFlyDataPtr->regionMap.unk16 != 0)
             {
                 m4aSongNumStart(SE_SELECT);
                 gSharedMem[0xA6E] = 1;  // TODO: what is this?
@@ -1719,7 +1719,7 @@ void debug_sub_8110D84(void)
         case 5:
             m4aSongNumStart(SE_SELECT);
             BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
-            sFlyDataPtr->round1Points++;
+            sFlyDataPtr->unk4++;
             break;
         }
         break;
@@ -1736,14 +1736,14 @@ void debug_sub_8110D84(void)
         {
             sub_80FBCA0();
             sub_80FAEC4();
-            sFlyDataPtr->round1Points++;
+            sFlyDataPtr->unk4++;
         }
         break;
     case 5:
         if (sub_80FAFC0() == 0)
         {
             CreateRegionMapCursor(0, 0);
-            sFlyDataPtr->round1Points++;
+            sFlyDataPtr->unk4++;
         }
         break;
     case 6:
@@ -1755,14 +1755,14 @@ void debug_sub_8110D84(void)
         {
             sub_80FBCA0();
             sub_80FAEC4();
-            sFlyDataPtr->round1Points++;
+            sFlyDataPtr->unk4++;
         }
         break;
     case 7:
         if (sub_80FAFC0() == 0)
         {
             CreateRegionMapCursor(0, 0);
-            sFlyDataPtr->round1Points = 3;
+            sFlyDataPtr->unk4 = 3;
         }
         break;
     }
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 30aa0856e..a1245cfb0 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -822,9 +822,9 @@ static bool8 sub_8102058(struct Task *task)
         unk_debug_bss_1_8--;
         if (unk_debug_bss_1_8 == 0)
         {
-            PlaySE(0x18);
-            sub_8102E1C(eSlotMachine->repeatJam);
-            sub_8103C14(eSlotMachine->repeatJam);
+            PlaySE(SE_CONTEST_PLACE);
+            sub_8102E1C(eSlotMachine->unk18);
+            sub_8103C14(eSlotMachine->unk18);
             unk_debug_bss_1_8 = (Random() & 0x1F) + 1;
             eSlotMachine->state = 13;
         }
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 18f3db9bb..fcae77e85 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -70,7 +70,7 @@ const struct TrainerCard sTestTrainerCard =
     .stars = 4,
     .hasPokedex = TRUE,
     .var_3 = TRUE,
-    .canvasPixels = TRUE,
+    .var_4 = TRUE,
     .firstHallOfFameA = 999,
     .firstHallOfFameB = 99,
     .firstHallOfFameC = 99,